From jmatthews at fedoraproject.org Thu Aug 20 11:57:16 2015 Content-Type: multipart/mixed; boundary="===============2713003071483828147==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Mon, 01 Jun 2009 14:23:45 +0000 Message-ID: <20090601142345.DA27C1201E2@lists.fedorahosted.org> --===============2713003071483828147== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/search/PackagesSearc= hHandler.java | 32 +++++----- 1 file changed, 18 insertions(+), 14 deletions(-) New commits: commit d96785bb47c3a973be7833bf259c32754e95f8f3 Author: John Matthews Date: Mon Jun 1 10:18:07 2009 -0400 PackageSearchHandler apidoc cleanup diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/search/P= ackagesSearchHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/pa= ckages/search/PackagesSearchHandler.java index 2f04f84..5ff9fb1 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/search/Packages= SearchHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/search/Packages= SearchHandler.java @@ -49,7 +49,7 @@ import java.util.Set; /** * PackagesSearchHandler * @version $Rev$ - * @xmlrpc.namespace packages + * @xmlrpc.namespace packages.search * @xmlrpc.doc Methods to interface to package search capabilities in sear= ch server.. */ public class PackagesSearchHandler extends BaseHandler { @@ -88,7 +88,7 @@ public class PackagesSearchHandler extends BaseHandler { * @throws FaultException A FaultException is thrown on error. * * @xmlrpc.doc Search the lucene package indexes for all packages which - * match the given query in name and description + * match the given query in name or description * @xmlrpc.param #session_key() * @xmlrpc.param #param_desc("string", "query", * "text to match in package name or description") @@ -114,7 +114,7 @@ public class PackagesSearchHandler extends BaseHandler { * match the given query in name or summary. * @xmlrpc.param #session_key() * @xmlrpc.param #param_desc("string", "query", - * "text to match in package name and description") + * "text to match in package name or summary") * @xmlrpc.returntype * #array() * $PackageOverviewSerializer @@ -139,10 +139,11 @@ public class PackagesSearchHandler extends BaseHandle= r { * @throws FaultException A FaultException is thrown on error. * * @xmlrpc.doc Advanced method to search lucene indexes with a passed = in query written - * in Lucene Query Parser syntax. Lucene Query Parser syntax is define= d here: - * http://lucene.apache.org/java/2_3_2/queryparsersyntax.html + * in Lucene Query Parser syntax.
+ * Lucene Query Parser syntax is defined + * here.
* Fields searchable for Packages: - * name, epoch, version, release, arch, description, summary + * name, epoch, version, release, arch, description, summary
* Lucene Query Example: "name:kernel AND version:2.6.18 AND -descript= ion:devel" * @xmlrpc.param #session_key() * @xmlrpc.param #param_desc("string", "luceneQuery", @@ -163,10 +164,11 @@ public class PackagesSearchHandler extends BaseHandle= r { /** * Advanced method to search lucene indexes with a passed in query wri= tten in Lucene * Query Parser syntax, additionally this method will limit results to= those which are - * in the passed in channel label. Lucene Query Parser syntax is defin= ed here: + * in the passed in channel label.
+ * Lucene Query Parser syntax is defined here: * http://lucene.apache.org/java/2_3_2/queryparsersyntax.html * Fields searchable for Packages: - * name, epoch, version, release, arch, description, summary + * name, epoch, version, release, arch, description, summary
* Lucene Query Example: "name:kernel AND version:2.6.18 AND -descript= ion:devel" * * @param sessionKey The sessionKey for the logged in used @@ -177,10 +179,11 @@ public class PackagesSearchHandler extends BaseHandle= r { * * @xmlrpc.doc Advanced method to search lucene indexes with a passed = in query written * in Lucene Query Parser syntax, additionally this method will limit = results to those - * which are in the passed in channel label. Lucene Query Parser synt= ax is defined - * here: http://lucene.apache.org/java/2_3_2/queryparsersyntax.html + * which are in the passed in channel label.
+ * Lucene Query Parser syntax is defined + * here.
* Fields searchable for Packages: - * name, epoch, version, release, arch, description, summary + * name, epoch, version, release, arch, description, summary
* Lucene Query Example: "name:kernel AND version:2.6.18 AND -descript= ion:devel" * @xmlrpc.param #session_key() * @xmlrpc.param #param_desc("string", "luceneQuery", @@ -238,10 +241,11 @@ public class PackagesSearchHandler extends BaseHandle= r { * * @xmlrpc.doc Advanced method to search lucene indexes with a passed = in query written * in Lucene Query Parser syntax, additionally this method will limit = results to those - * which are associated with a given activation key. Lucene Query Par= ser syntax is - * defined here: http://lucene.apache.org/java/2_3_2/queryparsersynta= x.html + * which are associated with a given activation key.
= + * Lucene Query Parser syntax is defined = + * here.
* Fields searchable for Packages: - * name, epoch, version, release, arch, description, summary + * name, epoch, version, release, arch, description, summary
* Lucene Query Example: "name:kernel AND version:2.6.18 AND -descript= ion:devel" * @xmlrpc.param #session_key() * @xmlrpc.param #param_desc("string", "luceneQuery", --===============2713003071483828147==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:16 2015 Content-Type: multipart/mixed; boundary="===============3857453956804355532==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Mon, 01 Jun 2009 14:24:23 +0000 Message-ID: <20090601142423.CCB9C1201E2@lists.fedorahosted.org> --===============3857453956804355532== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/search/PackagesSearc= hHandler.java | 32 +++++----- 1 file changed, 18 insertions(+), 14 deletions(-) New commits: commit cd38fb8f41b7807ede602fc2d18a43031710db13 Author: John Matthews Date: Mon Jun 1 10:18:07 2009 -0400 PackageSearchHandler apidoc cleanup diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/search/P= ackagesSearchHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/pa= ckages/search/PackagesSearchHandler.java index 2f04f84..5ff9fb1 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/search/Packages= SearchHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/search/Packages= SearchHandler.java @@ -49,7 +49,7 @@ import java.util.Set; /** * PackagesSearchHandler * @version $Rev$ - * @xmlrpc.namespace packages + * @xmlrpc.namespace packages.search * @xmlrpc.doc Methods to interface to package search capabilities in sear= ch server.. */ public class PackagesSearchHandler extends BaseHandler { @@ -88,7 +88,7 @@ public class PackagesSearchHandler extends BaseHandler { * @throws FaultException A FaultException is thrown on error. * * @xmlrpc.doc Search the lucene package indexes for all packages which - * match the given query in name and description + * match the given query in name or description * @xmlrpc.param #session_key() * @xmlrpc.param #param_desc("string", "query", * "text to match in package name or description") @@ -114,7 +114,7 @@ public class PackagesSearchHandler extends BaseHandler { * match the given query in name or summary. * @xmlrpc.param #session_key() * @xmlrpc.param #param_desc("string", "query", - * "text to match in package name and description") + * "text to match in package name or summary") * @xmlrpc.returntype * #array() * $PackageOverviewSerializer @@ -139,10 +139,11 @@ public class PackagesSearchHandler extends BaseHandle= r { * @throws FaultException A FaultException is thrown on error. * * @xmlrpc.doc Advanced method to search lucene indexes with a passed = in query written - * in Lucene Query Parser syntax. Lucene Query Parser syntax is define= d here: - * http://lucene.apache.org/java/2_3_2/queryparsersyntax.html + * in Lucene Query Parser syntax.
+ * Lucene Query Parser syntax is defined + * here.
* Fields searchable for Packages: - * name, epoch, version, release, arch, description, summary + * name, epoch, version, release, arch, description, summary
* Lucene Query Example: "name:kernel AND version:2.6.18 AND -descript= ion:devel" * @xmlrpc.param #session_key() * @xmlrpc.param #param_desc("string", "luceneQuery", @@ -163,10 +164,11 @@ public class PackagesSearchHandler extends BaseHandle= r { /** * Advanced method to search lucene indexes with a passed in query wri= tten in Lucene * Query Parser syntax, additionally this method will limit results to= those which are - * in the passed in channel label. Lucene Query Parser syntax is defin= ed here: + * in the passed in channel label.
+ * Lucene Query Parser syntax is defined here: * http://lucene.apache.org/java/2_3_2/queryparsersyntax.html * Fields searchable for Packages: - * name, epoch, version, release, arch, description, summary + * name, epoch, version, release, arch, description, summary
* Lucene Query Example: "name:kernel AND version:2.6.18 AND -descript= ion:devel" * * @param sessionKey The sessionKey for the logged in used @@ -177,10 +179,11 @@ public class PackagesSearchHandler extends BaseHandle= r { * * @xmlrpc.doc Advanced method to search lucene indexes with a passed = in query written * in Lucene Query Parser syntax, additionally this method will limit = results to those - * which are in the passed in channel label. Lucene Query Parser synt= ax is defined - * here: http://lucene.apache.org/java/2_3_2/queryparsersyntax.html + * which are in the passed in channel label.
+ * Lucene Query Parser syntax is defined + * here.
* Fields searchable for Packages: - * name, epoch, version, release, arch, description, summary + * name, epoch, version, release, arch, description, summary
* Lucene Query Example: "name:kernel AND version:2.6.18 AND -descript= ion:devel" * @xmlrpc.param #session_key() * @xmlrpc.param #param_desc("string", "luceneQuery", @@ -238,10 +241,11 @@ public class PackagesSearchHandler extends BaseHandle= r { * * @xmlrpc.doc Advanced method to search lucene indexes with a passed = in query written * in Lucene Query Parser syntax, additionally this method will limit = results to those - * which are associated with a given activation key. Lucene Query Par= ser syntax is - * defined here: http://lucene.apache.org/java/2_3_2/queryparsersynta= x.html + * which are associated with a given activation key.
= + * Lucene Query Parser syntax is defined = + * here.
* Fields searchable for Packages: - * name, epoch, version, release, arch, description, summary + * name, epoch, version, release, arch, description, summary
* Lucene Query Example: "name:kernel AND version:2.6.18 AND -descript= ion:devel" * @xmlrpc.param #session_key() * @xmlrpc.param #param_desc("string", "luceneQuery", --===============3857453956804355532==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:16 2015 Content-Type: multipart/mixed; boundary="===============5948596250690057737==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - backend/satellite_tools backend/server schema/spacewalk Date: Mon, 01 Jun 2009 14:55:05 +0000 Message-ID: <20090601145505.1FB421201E2@lists.fedorahosted.org> --===============5948596250690057737== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/satellite_tools/xmlSource.py = | 3 +-- backend/server/importlib/backendOracle.py = | 5 ++--- backend/server/importlib/importLib.py = | 3 +-- schema/spacewalk/rhnsat/tables/rhnReleaseChannelMap.sql = | 10 +++------- schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/121-= rhnReleaseChannelMap.sql | 5 +++++ 5 files changed, 12 insertions(+), 14 deletions(-) New commits: commit 5bb7e31fce60fea12d596ab5a2cb33a09185f0c1 Author: Pradeep Kilambi Date: Mon Jun 1 10:54:54 2009 -0400 503243 - Dropping the is_default column as we now determine the default= in the app code based on the compatible eus channel instead of jus the def= ault. = - Also unique constraint is on product,version,arch and release instead= of is_default. This should fix the issue of syncing multiple eus channels = to satellite. diff --git a/backend/satellite_tools/xmlSource.py b/backend/satellite_tools= /xmlSource.py index 0e5001f..0bfbda2 100644 --- a/backend/satellite_tools/xmlSource.py +++ b/backend/satellite_tools/xmlSource.py @@ -629,8 +629,7 @@ class ReleaseItem(BaseItem): item_name =3D 'rhn-release' item_class =3D importLib.ReleaseChannelMap tagMap =3D { - 'channel-arch' : 'channel_arch', - 'is-default' : 'is_default', + 'channel-arch' : 'channel_arch' } addItem(ReleaseItem) = diff --git a/backend/server/importlib/backendOracle.py b/backend/server/imp= ortlib/backendOracle.py index fddc8e4..99b53e7 100644 --- a/backend/server/importlib/backendOracle.py +++ b/backend/server/importlib/backendOracle.py @@ -314,10 +314,9 @@ class OracleBackend(Backend): 'version' : DBstring(64), 'release' : DBstring(64), 'channel_arch_id': DBint(), - 'channel_id' : DBint(), - 'is_default' : DBstring(1) + 'channel_id' : DBint() }, - pk =3D ['product', 'version', 'release', 'channel_arc= h_id', 'channel_id', 'is_default'], + pk =3D ['product', 'version', 'release', 'channel_arc= h_id', 'channel_id'], attribute =3D 'release', defaultSeverity =3D 4, ), diff --git a/backend/server/importlib/importLib.py b/backend/server/importl= ib/importLib.py index 10f8fed..ab9138c 100644 --- a/backend/server/importlib/importLib.py +++ b/backend/server/importlib/importLib.py @@ -170,8 +170,7 @@ class ReleaseChannelMap(Information): 'version' : StringType, 'release' : StringType, 'channel_arch_id' : IntType, - 'channel_id' : IntType, - 'is_default' : StringType, + 'channel_id' : IntType } = = diff --git a/schema/spacewalk/rhnsat/tables/rhnReleaseChannelMap.sql b/sche= ma/spacewalk/rhnsat/tables/rhnReleaseChannelMap.sql index bb950df..f95ca9f 100644 --- a/schema/spacewalk/rhnsat/tables/rhnReleaseChannelMap.sql +++ b/schema/spacewalk/rhnsat/tables/rhnReleaseChannelMap.sql @@ -25,11 +25,7 @@ rhnReleaseChannelMap channel_arch_id number constraint rhn_rcm_caid_nn not null, channel_id number - constraint rhn_rcm_cid_nn not null, - is_default char(1) - constraint rhn_rcm_default_nn not null, - constraint rhn_rcm_default_ck - check (is_default in ('Y', 'N')) + constraint rhn_rcm_cid_nn not null ) enable row movement ; @@ -40,7 +36,7 @@ create index rhn_rcm_prod_ver_rel_caid_idx ; = alter table rhnReleaseChannelMap -add constraint rhn_rcm_pva_def_uniq -unique (product, version, channel_arch_id, is_default) +add constraint rhn_rcm_pvar_uniq +unique (product, version, channel_arch_id, release) ; = diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-sch= ema-0.6/121-rhnReleaseChannelMap.sql b/schema/spacewalk/upgrade/spacewalk-s= chema-0.5-to-spacewalk-schema-0.6/121-rhnReleaseChannelMap.sql new file mode 100644 index 0000000..7383816 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6= /121-rhnReleaseChannelMap.sql @@ -0,0 +1,5 @@ +ALTER TABLE rhnReleaseChannelMap DROP CONSTRAINT rhn_rcm_pva_def_uniq; +ALTER TABLE rhnReleaseChannelMap DROP COLUMN is_default; +ALTER TABLE rhnReleaseChannelMap = +ADD CONSTRAINT rhn_rcm_pvar_uniq +unique (product, version, channel_arch_id, release); --===============5948596250690057737==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:16 2015 Content-Type: multipart/mixed; boundary="===============7494072213759078978==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: backend/satellite_tools backend/server schema/spacewalk Date: Mon, 01 Jun 2009 14:55:31 +0000 Message-ID: <20090601145531.ADF551201E2@lists.fedorahosted.org> --===============7494072213759078978== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/satellite_tools/xmlSource.py = | 3 +-- backend/server/importlib/backendOracle.py = | 5 ++--- backend/server/importlib/importLib.py = | 3 +-- schema/spacewalk/rhnsat/tables/rhnReleaseChannelMap.sql = | 10 +++------- schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/121-= rhnReleaseChannelMap.sql | 5 +++++ 5 files changed, 12 insertions(+), 14 deletions(-) New commits: commit d40c47a6efc4a9f7b41fdd6b72219abcde80399f Author: Pradeep Kilambi Date: Mon Jun 1 10:54:54 2009 -0400 503243 - Dropping the is_default column as we now determine the default= in the app code based on the compatible eus channel instead of jus the def= ault. = - Also unique constraint is on product,version,arch and release instead= of is_default. This should fix the issue of syncing multiple eus channels = to satellite. diff --git a/backend/satellite_tools/xmlSource.py b/backend/satellite_tools= /xmlSource.py index 0e5001f..0bfbda2 100644 --- a/backend/satellite_tools/xmlSource.py +++ b/backend/satellite_tools/xmlSource.py @@ -629,8 +629,7 @@ class ReleaseItem(BaseItem): item_name =3D 'rhn-release' item_class =3D importLib.ReleaseChannelMap tagMap =3D { - 'channel-arch' : 'channel_arch', - 'is-default' : 'is_default', + 'channel-arch' : 'channel_arch' } addItem(ReleaseItem) = diff --git a/backend/server/importlib/backendOracle.py b/backend/server/imp= ortlib/backendOracle.py index fddc8e4..99b53e7 100644 --- a/backend/server/importlib/backendOracle.py +++ b/backend/server/importlib/backendOracle.py @@ -314,10 +314,9 @@ class OracleBackend(Backend): 'version' : DBstring(64), 'release' : DBstring(64), 'channel_arch_id': DBint(), - 'channel_id' : DBint(), - 'is_default' : DBstring(1) + 'channel_id' : DBint() }, - pk =3D ['product', 'version', 'release', 'channel_arc= h_id', 'channel_id', 'is_default'], + pk =3D ['product', 'version', 'release', 'channel_arc= h_id', 'channel_id'], attribute =3D 'release', defaultSeverity =3D 4, ), diff --git a/backend/server/importlib/importLib.py b/backend/server/importl= ib/importLib.py index 10f8fed..ab9138c 100644 --- a/backend/server/importlib/importLib.py +++ b/backend/server/importlib/importLib.py @@ -170,8 +170,7 @@ class ReleaseChannelMap(Information): 'version' : StringType, 'release' : StringType, 'channel_arch_id' : IntType, - 'channel_id' : IntType, - 'is_default' : StringType, + 'channel_id' : IntType } = = diff --git a/schema/spacewalk/rhnsat/tables/rhnReleaseChannelMap.sql b/sche= ma/spacewalk/rhnsat/tables/rhnReleaseChannelMap.sql index bb950df..f95ca9f 100644 --- a/schema/spacewalk/rhnsat/tables/rhnReleaseChannelMap.sql +++ b/schema/spacewalk/rhnsat/tables/rhnReleaseChannelMap.sql @@ -25,11 +25,7 @@ rhnReleaseChannelMap channel_arch_id number constraint rhn_rcm_caid_nn not null, channel_id number - constraint rhn_rcm_cid_nn not null, - is_default char(1) - constraint rhn_rcm_default_nn not null, - constraint rhn_rcm_default_ck - check (is_default in ('Y', 'N')) + constraint rhn_rcm_cid_nn not null ) enable row movement ; @@ -40,7 +36,7 @@ create index rhn_rcm_prod_ver_rel_caid_idx ; = alter table rhnReleaseChannelMap -add constraint rhn_rcm_pva_def_uniq -unique (product, version, channel_arch_id, is_default) +add constraint rhn_rcm_pvar_uniq +unique (product, version, channel_arch_id, release) ; = diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-sch= ema-0.6/121-rhnReleaseChannelMap.sql b/schema/spacewalk/upgrade/spacewalk-s= chema-0.5-to-spacewalk-schema-0.6/121-rhnReleaseChannelMap.sql new file mode 100644 index 0000000..7383816 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6= /121-rhnReleaseChannelMap.sql @@ -0,0 +1,5 @@ +ALTER TABLE rhnReleaseChannelMap DROP CONSTRAINT rhn_rcm_pva_def_uniq; +ALTER TABLE rhnReleaseChannelMap DROP COLUMN is_default; +ALTER TABLE rhnReleaseChannelMap = +ADD CONSTRAINT rhn_rcm_pvar_uniq +unique (product, version, channel_arch_id, release); --===============7494072213759078978==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:16 2015 Content-Type: multipart/mixed; boundary="===============1073966918855736389==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: 3 commits - spacewalk/setup Date: Mon, 01 Jun 2009 15:43:30 +0000 Message-ID: <20090601154330.E7CF51201E2@lists.fedorahosted.org> --===============1073966918855736389== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/setup/lib/Spacewalk/Setup.pm | 2 +- spacewalk/setup/share/oracle/upgrade-db.sh | 23 +++++++++++++++++------ 2 files changed, 18 insertions(+), 7 deletions(-) New commits: commit b805c14527bc8e021d56310933b6e11d87806a19 Author: Milan Zazrivec Date: Mon Jun 1 17:40:02 2009 +0200 pass custom sid to upgrade-db.sh for embedded db upgrade diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/S= pacewalk/Setup.pm index 3e26616..f0cda94 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -740,7 +740,7 @@ EOQ -err_message =3D> "Could not upgrade database.\n", -err_code =3D> 15, -system_opts =3D> ['/sbin/runuser', 'oracle', '-c', - SHARED_DIR . '/oracle' . '/upgrade-db= .sh' ]); + "ORACLE_CUSTOM_SID=3D$answers->{'db-si= d'} " . SHARED_DIR . '/oracle/upgrade-db.sh' ]); = system_or_exit(['service', 'oracle', 'restart'], 41, 'Could not restart oracle service'); commit 1a7a72468ed4dddf37a245c417d9fa95ecc6f47c Author: Milan Zazrivec Date: Mon Jun 1 17:34:55 2009 +0200 update copyright information diff --git a/spacewalk/setup/share/oracle/upgrade-db.sh b/spacewalk/setup/s= hare/oracle/upgrade-db.sh index 39b8abd..f082292 100644 --- a/spacewalk/setup/share/oracle/upgrade-db.sh +++ b/spacewalk/setup/share/oracle/upgrade-db.sh @@ -1,10 +1,18 @@ #!/bin/sh -# Installs/creates the RHN embedded database at mountpoint /rhnsat +# Upgrades RHN embedded database at mountpoint /rhnsat # -# Copyright (c) 2002-2004, Red Hat, Inc. -# All rights reserved. +# Copyright (c) 2008 Red Hat, Inc. # -# $Id: inst-rhnsat-db.sh,v 1.14 2008-03-17 10:54:36 mmraka Exp $ +# 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. = set -x = commit f678215dd3ba328b6e82b9b7a0e1a6beb45c0687 Author: Milan Zazrivec Date: Mon Jun 1 17:33:31 2009 +0200 support embedded db upgrade with custom sid diff --git a/spacewalk/setup/share/oracle/upgrade-db.sh b/spacewalk/setup/s= hare/oracle/upgrade-db.sh index f9ad115..39b8abd 100644 --- a/spacewalk/setup/share/oracle/upgrade-db.sh +++ b/spacewalk/setup/share/oracle/upgrade-db.sh @@ -29,8 +29,11 @@ ORACLE_CONFIG_9I_DIR=3D$ORACLE_BASE/config/9.2.0 echo "rhnsat:$ORACLE_HOME:Y" >>/etc/oratab = # change env to rhnsat instance -ORACLE_SID=3Drhnsat -export ORACLE_SID +if [ -z $ORACLE_CUSTOM_SID ]; then + export ORACLE_SID=3Drhnsat +else + export ORACLE_SID=3D$ORACLE_CUSTOM_SID +fi . oraenv = = --===============1073966918855736389==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:16 2015 Content-Type: multipart/mixed; boundary="===============6793662579292851275==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 3 commits - spacewalk/setup Date: Mon, 01 Jun 2009 15:44:42 +0000 Message-ID: <20090601154442.D1E961201E2@lists.fedorahosted.org> --===============6793662579292851275== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/setup/lib/Spacewalk/Setup.pm | 2 +- spacewalk/setup/share/oracle/upgrade-db.sh | 23 +++++++++++++++++------ 2 files changed, 18 insertions(+), 7 deletions(-) New commits: commit f5484fc4226bf5d9ffb392af1b7e164c4a4dec7b Author: Milan Zazrivec Date: Mon Jun 1 17:40:02 2009 +0200 pass custom sid to upgrade-db.sh for embedded db upgrade diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/S= pacewalk/Setup.pm index 4282df2..247ace1 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -740,7 +740,7 @@ EOQ -err_message =3D> "Could not upgrade database.\n", -err_code =3D> 15, -system_opts =3D> ['/sbin/runuser', 'oracle', '-c', - SHARED_DIR . '/oracle' . '/upgrade-db= .sh' ]); + "ORACLE_CUSTOM_SID=3D$answers->{'db-si= d'} " . SHARED_DIR . '/oracle/upgrade-db.sh' ]); = system_or_exit(['service', 'oracle', 'restart'], 41, 'Could not restart oracle service'); commit 72af153f608a2d28b3926b1f811d23c846ad266a Author: Milan Zazrivec Date: Mon Jun 1 17:34:55 2009 +0200 update copyright information diff --git a/spacewalk/setup/share/oracle/upgrade-db.sh b/spacewalk/setup/s= hare/oracle/upgrade-db.sh index 39b8abd..f082292 100644 --- a/spacewalk/setup/share/oracle/upgrade-db.sh +++ b/spacewalk/setup/share/oracle/upgrade-db.sh @@ -1,10 +1,18 @@ #!/bin/sh -# Installs/creates the RHN embedded database at mountpoint /rhnsat +# Upgrades RHN embedded database at mountpoint /rhnsat # -# Copyright (c) 2002-2004, Red Hat, Inc. -# All rights reserved. +# Copyright (c) 2008 Red Hat, Inc. # -# $Id: inst-rhnsat-db.sh,v 1.14 2008-03-17 10:54:36 mmraka Exp $ +# 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. = set -x = commit 62df9de7c034114c73e9cdf6bef8ccd70177df10 Author: Milan Zazrivec Date: Mon Jun 1 17:33:31 2009 +0200 support embedded db upgrade with custom sid diff --git a/spacewalk/setup/share/oracle/upgrade-db.sh b/spacewalk/setup/s= hare/oracle/upgrade-db.sh index f9ad115..39b8abd 100644 --- a/spacewalk/setup/share/oracle/upgrade-db.sh +++ b/spacewalk/setup/share/oracle/upgrade-db.sh @@ -29,8 +29,11 @@ ORACLE_CONFIG_9I_DIR=3D$ORACLE_BASE/config/9.2.0 echo "rhnsat:$ORACLE_HOME:Y" >>/etc/oratab = # change env to rhnsat instance -ORACLE_SID=3Drhnsat -export ORACLE_SID +if [ -z $ORACLE_CUSTOM_SID ]; then + export ORACLE_SID=3Drhnsat +else + export ORACLE_SID=3D$ORACLE_CUSTOM_SID +fi . oraenv = = --===============6793662579292851275==-- From partha at fedoraproject.org Thu Aug 20 11:57:16 2015 Content-Type: multipart/mixed; boundary="===============1346956815718848838==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Mon, 01 Jun 2009 17:15:22 +0000 Message-ID: <20090601171522.7EE861201E2@lists.fedorahosted.org> --===============1346956815718848838== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java | = 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 25eb35a04216418c1e818f5718977133990a5fd4 Author: Partha Aji Date: Mon Jun 1 13:17:12 2009 -0400 492206 - Fixed an issue ' bad cobbler template' parsing diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManage= r.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.ja= va index 6ffcf27..31f34be 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java @@ -71,7 +71,11 @@ public class KickstartManager extends BaseManager { */ public void validateKickstartFile(KickstartData ksdata) { try { - renderKickstart(ksdata); = + String text =3D renderKickstart(ksdata); + if (text.contains("Traceback (most recent call last):")) { + ValidatorException.raiseException("kickstart.jsp.error.tem= plate_generation", + KickstartUrlHelper.getCobblerProfileUrl(ksdata)); + } } catch (DownloadException de) { ValidatorException.raiseException("kickstart.jsp.error.templat= e_generation", --===============1346956815718848838==-- From partha at fedoraproject.org Thu Aug 20 11:57:16 2015 Content-Type: multipart/mixed; boundary="===============2811718938552738777==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Mon, 01 Jun 2009 17:15:55 +0000 Message-ID: <20090601171555.0CD971201E2@lists.fedorahosted.org> --===============2811718938552738777== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java | = 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit bf7f6b39880cc4e91051b3e6c904b69bd22deaa3 Author: Partha Aji Date: Mon Jun 1 13:17:12 2009 -0400 492206 - Fixed an issue ' bad cobbler template' parsing diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManage= r.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.ja= va index 6ffcf27..31f34be 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java @@ -71,7 +71,11 @@ public class KickstartManager extends BaseManager { */ public void validateKickstartFile(KickstartData ksdata) { try { - renderKickstart(ksdata); = + String text =3D renderKickstart(ksdata); + if (text.contains("Traceback (most recent call last):")) { + ValidatorException.raiseException("kickstart.jsp.error.tem= plate_generation", + KickstartUrlHelper.getCobblerProfileUrl(ksdata)); + } } catch (DownloadException de) { ValidatorException.raiseException("kickstart.jsp.error.templat= e_generation", --===============2811718938552738777==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:16 2015 Content-Type: multipart/mixed; boundary="===============1591638253287991517==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: 4 commits - projects/oracle-server-scripts spacewalk/setup Date: Mon, 01 Jun 2009 17:36:32 +0000 Message-ID: <20090601173632.B04FC1201E2@lists.fedorahosted.org> --===============1591638253287991517== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl | 98 ++++++++= +++++ projects/oracle-server-scripts/oracle-server-scripts.spec | 3 = spacewalk/setup/share/oracle/upgrade-db-10g.sh | 45 +++++ spacewalk/setup/spacewalk-setup.spec | 1 = 4 files changed, 146 insertions(+), 1 deletion(-) New commits: commit e8f5b62e1a91d3686fb294505bcb449df1754e9e Author: Milan Zazrivec Date: Mon Jun 1 19:33:18 2009 +0200 include new embedded db upgrade script into spec file diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewa= lk-setup.spec index 6e007cc..00e6018 100644 --- a/spacewalk/setup/spacewalk-setup.spec +++ b/spacewalk/setup/spacewalk-setup.spec @@ -75,6 +75,7 @@ install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setu= p/oracle/ install -m 0755 share/oracle/install-db.sh %{buildroot}/%{_datadir}/spacew= alk/setup/oracle install -m 0755 share/oracle/remove-db.sh %{buildroot}/%{_datadir}/spacewa= lk/setup/oracle install -m 0755 share/oracle/upgrade-db.sh %{buildroot}/%{_datadir}/spacew= alk/setup/oracle +install -m 0755 share/oracle/upgrade-db-10g.sh %{buildroot}/%{_datadir}/sp= acewalk/setup/oracle = = %check commit 8652f6b737069d50408ef1457f2256ce790ac42a Author: Milan Zazrivec Date: Mon Jun 1 19:31:28 2009 +0200 add 10g 10.2.0.3 -> 10.2.0.4 embedded db setup upgrade script diff --git a/spacewalk/setup/share/oracle/upgrade-db-10g.sh b/spacewalk/set= up/share/oracle/upgrade-db-10g.sh new file mode 100644 index 0000000..36b8be7 --- /dev/null +++ b/spacewalk/setup/share/oracle/upgrade-db-10g.sh @@ -0,0 +1,45 @@ +#!/bin/sh +# Upgrades RHN embedded database at mountpoint /rhnsat (10g ver 10.2.0.3 -= > 10g ver. 10.2.0.4) +# +# Copyright (c) 2009 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. + +set -x + +# exit if anything fails +set -e + +# set oracle environment to embedded server +ORAENV_ASK=3DNO +ORACLE_BASE=3D/opt/apps/oracle +ORACLE_ADMIN_DIR=3D$ORACLE_BASE/admin/10.2.0 +ORACLE_CONFIG_DIR=3D$ORACLE_BASE/config/10.2.0 + +# change env to rhnsat instance +if [ -z $ORACLE_CUSTOM_SID ]; then + export ORACLE_SID=3Drhnsat +else + export ORACLE_SID=3D$ORACLE_CUSTOM_SID +fi +. oraenv + +# upgrade database +UPGRADE_TMPL=3D$ORACLE_ADMIN_DIR/embedded-upgradedb-10g.tmpl +m4 $UPGRADE_TMPL -I$ORACLE_ADMIN_DIR \ + --define RHNORA_DBNAME=3D$ORACLE_SID \ + --define RHNORA_LOG_PATH=3D/rhnsat/admin/rhnsat/logs \ + --define RHNORA_DATA_PATH=3D/rhnsat/data/rhnsat \ + --define RHNORA_DB_USER=3Drhnsat \ + | $ORACLE_HOME/bin/sqlplus /nolog + +set +x commit c44e250c119d3c5ef578d9181fb9a5f0217c481a Author: Milan Zazrivec Date: Mon Jun 1 19:28:12 2009 +0200 include new source into spec file diff --git a/projects/oracle-server-scripts/oracle-server-scripts.spec b/pr= ojects/oracle-server-scripts/oracle-server-scripts.spec index faa736e..93c042b 100644 --- a/projects/oracle-server-scripts/oracle-server-scripts.spec +++ b/projects/oracle-server-scripts/oracle-server-scripts.spec @@ -23,6 +23,7 @@ Source9: default-createdb.tmpl Source10: embedded-createdb.tmpl Source11: rhnora.m4 Source12: embedded-upgradedb.tmpl +Source13: embedded-upgradedb-10g.tmpl License: Proprietary Group: Oracle Server BuildArch: noarch @@ -45,7 +46,7 @@ mkdir -p $RPM_BUILD_ROOT install -m755 -d $RPM_BUILD_ROOT%{oracle_admin} for f in %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} \ %{SOURCE4} %{SOURCE5} %{SOURCE9} %{SOURCE10} %{SOURCE11} \ - %{SOURCE12}; do + %{SOURCE12} %{SOURCE13}; do install -m 755 $f $RPM_BUILD_ROOT%{oracle_admin} done = commit 7f1f9420a150447608a90962553d1d605cfd674c Author: Milan Zazrivec Date: Mon Jun 1 19:24:56 2009 +0200 add template script for 10.2.0.3 -> 10.2.0.4 embedded db upgrade diff --git a/projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl b/p= rojects/oracle-server-scripts/embedded-upgradedb-10g.tmpl new file mode 100644 index 0000000..b0ac82b --- /dev/null +++ b/projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl @@ -0,0 +1,98 @@ +include(`rhnora.m4') + +-- +-- 10gR2 ver. 10.2.0.3 to 10gR2 ver. 10.2.0.4 embedded db upgrade template +-- + + +spool RHNORA_CREATELOG(RHNORA_DBNAME-10g-10g-upgrade) replace +set echo on +set term on +set pagesize 10000 +-- don't set serveroutput on otherwise you will get a lot of PLS-00213 err= ors +--set serveroutput on +whenever sqlerror exit failure +whenever oserror exit failure + +connect / as sysdba +-- create spfile from pfile=3D'upgrade-init(a).ora'; +startup upgrade + +alter session set nls_date_format =3D 'YYYY-MM-DD HH24:MI:SS'; + +-- ignore errors in oracle provided files +whenever sqlerror continue + +-- do upgrade +select sysdate, 'rdbms/admin/catupgrd.sql' script from dual; +@?/rdbms/admin/catupgrd.sql + +-- show summary +@?/rdbms/admin/utlu102s.sql + +-- invalidate all db objects +select sysdate, 'Invalidating packages' message from dual; +@?/rdbms/admin/utlirp.sql + +shutdown immediate +startup restrict + +-- recompile all db stuff incl. java stored procs +select sysdate, 'Recompiling packages' message from dual; +@?/rdbms/admin/utlrp.sql + +whenever sqlerror exit failure +set serveroutput on +-- perform migration of DICTIONARY to LOCAL managed tablespaces +begin + for s in (select tablespace_name from dba_tablespaces + where extent_management =3D 'DICTIONARY' + and tablespace_name =3D 'SYSTEM') + loop + for t in (select tablespace_name from dba_tablespaces + where extent_management =3D 'DICTIONARY' + and tablespace_name not in ('SYSTEM')) + loop + DBMS_SPACE_ADMIN.TABLESPACE_MIGRATE_TO_LOCAL(t.tablespace_name); + end loop; + for t in (select tablespace_name from dba_tablespaces + where contents=3D'PERMANENT' + and tablespace_name not in ('SYSTEM','SYSAUX')) + loop + execute immediate 'alter tablespace ' || t.tablespace_name || ' rea= d only'; + end loop; + execute immediate 'alter tablespace SYSAUX offline'; + DBMS_SPACE_ADMIN.TABLESPACE_MIGRATE_TO_LOCAL('SYSTEM'); + execute immediate 'alter tablespace SYSAUX online'; + for t in (select tablespace_name from dba_tablespaces + where status =3D 'READ ONLY') + loop + execute immediate 'alter tablespace ' || t.tablespace_name || ' rea= d write'; + end loop; + end loop; +end; +/ + +-- restart the instance to reinitialize the system parameters +shutdown immediate +startup + +-- lock default users from 9i +select sysdate, 'Locking default 9i users' message from dual; +BEGIN + FOR item IN ( SELECT USERNAME FROM DBA_USERS WHERE USERNAME IN ( + 'DBSNMP', 'OUTLN', 'TSMSYS', 'ORACLE_OCM', 'DIP') ) + LOOP + dbms_output.put_line('Locking and Expiring: ' || item.USERNAME); + execute immediate 'alter user ' || item.USERNAME || ' password expire a= ccount lock' ; + END LOOP; +END; +/ + +-- set compatible flag +alter system set compatible=3D'10.2.0.4.0' scope=3Dspfile; +disconnect + +connect / as sysdba +shutdown immediate + --===============1591638253287991517==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:16 2015 Content-Type: multipart/mixed; boundary="===============4325264150123873798==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 4 commits - projects/oracle-server-scripts spacewalk/setup Date: Mon, 01 Jun 2009 17:38:54 +0000 Message-ID: <20090601173854.762D41201E2@lists.fedorahosted.org> --===============4325264150123873798== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl | 98 ++++++++= +++++ projects/oracle-server-scripts/oracle-server-scripts.spec | 3 = spacewalk/setup/share/oracle/upgrade-db-10g.sh | 45 +++++ spacewalk/setup/spacewalk-setup.spec | 1 = 4 files changed, 146 insertions(+), 1 deletion(-) New commits: commit 4ff3296f8a3e5e060d24d9428291cf87fff1c0a6 Author: Milan Zazrivec Date: Mon Jun 1 19:33:18 2009 +0200 include new embedded db upgrade script into spec file diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewa= lk-setup.spec index cc43b6d..f75a493 100644 --- a/spacewalk/setup/spacewalk-setup.spec +++ b/spacewalk/setup/spacewalk-setup.spec @@ -75,6 +75,7 @@ install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setu= p/oracle/ install -m 0755 share/oracle/install-db.sh %{buildroot}/%{_datadir}/spacew= alk/setup/oracle install -m 0755 share/oracle/remove-db.sh %{buildroot}/%{_datadir}/spacewa= lk/setup/oracle install -m 0755 share/oracle/upgrade-db.sh %{buildroot}/%{_datadir}/spacew= alk/setup/oracle +install -m 0755 share/oracle/upgrade-db-10g.sh %{buildroot}/%{_datadir}/sp= acewalk/setup/oracle = = %check commit e72f71b640f4f19237ec12e2b85fb800623a2cf0 Author: Milan Zazrivec Date: Mon Jun 1 19:31:28 2009 +0200 add 10g 10.2.0.3 -> 10.2.0.4 embedded db setup upgrade script diff --git a/spacewalk/setup/share/oracle/upgrade-db-10g.sh b/spacewalk/set= up/share/oracle/upgrade-db-10g.sh new file mode 100644 index 0000000..36b8be7 --- /dev/null +++ b/spacewalk/setup/share/oracle/upgrade-db-10g.sh @@ -0,0 +1,45 @@ +#!/bin/sh +# Upgrades RHN embedded database at mountpoint /rhnsat (10g ver 10.2.0.3 -= > 10g ver. 10.2.0.4) +# +# Copyright (c) 2009 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. + +set -x + +# exit if anything fails +set -e + +# set oracle environment to embedded server +ORAENV_ASK=3DNO +ORACLE_BASE=3D/opt/apps/oracle +ORACLE_ADMIN_DIR=3D$ORACLE_BASE/admin/10.2.0 +ORACLE_CONFIG_DIR=3D$ORACLE_BASE/config/10.2.0 + +# change env to rhnsat instance +if [ -z $ORACLE_CUSTOM_SID ]; then + export ORACLE_SID=3Drhnsat +else + export ORACLE_SID=3D$ORACLE_CUSTOM_SID +fi +. oraenv + +# upgrade database +UPGRADE_TMPL=3D$ORACLE_ADMIN_DIR/embedded-upgradedb-10g.tmpl +m4 $UPGRADE_TMPL -I$ORACLE_ADMIN_DIR \ + --define RHNORA_DBNAME=3D$ORACLE_SID \ + --define RHNORA_LOG_PATH=3D/rhnsat/admin/rhnsat/logs \ + --define RHNORA_DATA_PATH=3D/rhnsat/data/rhnsat \ + --define RHNORA_DB_USER=3Drhnsat \ + | $ORACLE_HOME/bin/sqlplus /nolog + +set +x commit ed4eeadce9cc05b3cf1f91c6211795a7d2c3388c Author: Milan Zazrivec Date: Mon Jun 1 19:28:12 2009 +0200 include new source into spec file diff --git a/projects/oracle-server-scripts/oracle-server-scripts.spec b/pr= ojects/oracle-server-scripts/oracle-server-scripts.spec index 2941245..3bdf392 100644 --- a/projects/oracle-server-scripts/oracle-server-scripts.spec +++ b/projects/oracle-server-scripts/oracle-server-scripts.spec @@ -23,6 +23,7 @@ Source9: default-createdb.tmpl Source10: embedded-createdb.tmpl Source11: rhnora.m4 Source12: embedded-upgradedb.tmpl +Source13: embedded-upgradedb-10g.tmpl License: Proprietary Group: Oracle Server BuildArch: noarch @@ -45,7 +46,7 @@ mkdir -p $RPM_BUILD_ROOT install -m755 -d $RPM_BUILD_ROOT%{oracle_admin} for f in %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} \ %{SOURCE4} %{SOURCE5} %{SOURCE9} %{SOURCE10} %{SOURCE11} \ - %{SOURCE12}; do + %{SOURCE12} %{SOURCE13}; do install -m 755 $f $RPM_BUILD_ROOT%{oracle_admin} done = commit 37d56362427ffd0b8066818edf16eb268dbd119a Author: Milan Zazrivec Date: Mon Jun 1 19:24:56 2009 +0200 add template script for 10.2.0.3 -> 10.2.0.4 embedded db upgrade diff --git a/projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl b/p= rojects/oracle-server-scripts/embedded-upgradedb-10g.tmpl new file mode 100644 index 0000000..b0ac82b --- /dev/null +++ b/projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl @@ -0,0 +1,98 @@ +include(`rhnora.m4') + +-- +-- 10gR2 ver. 10.2.0.3 to 10gR2 ver. 10.2.0.4 embedded db upgrade template +-- + + +spool RHNORA_CREATELOG(RHNORA_DBNAME-10g-10g-upgrade) replace +set echo on +set term on +set pagesize 10000 +-- don't set serveroutput on otherwise you will get a lot of PLS-00213 err= ors +--set serveroutput on +whenever sqlerror exit failure +whenever oserror exit failure + +connect / as sysdba +-- create spfile from pfile=3D'upgrade-init(a).ora'; +startup upgrade + +alter session set nls_date_format =3D 'YYYY-MM-DD HH24:MI:SS'; + +-- ignore errors in oracle provided files +whenever sqlerror continue + +-- do upgrade +select sysdate, 'rdbms/admin/catupgrd.sql' script from dual; +@?/rdbms/admin/catupgrd.sql + +-- show summary +@?/rdbms/admin/utlu102s.sql + +-- invalidate all db objects +select sysdate, 'Invalidating packages' message from dual; +@?/rdbms/admin/utlirp.sql + +shutdown immediate +startup restrict + +-- recompile all db stuff incl. java stored procs +select sysdate, 'Recompiling packages' message from dual; +@?/rdbms/admin/utlrp.sql + +whenever sqlerror exit failure +set serveroutput on +-- perform migration of DICTIONARY to LOCAL managed tablespaces +begin + for s in (select tablespace_name from dba_tablespaces + where extent_management =3D 'DICTIONARY' + and tablespace_name =3D 'SYSTEM') + loop + for t in (select tablespace_name from dba_tablespaces + where extent_management =3D 'DICTIONARY' + and tablespace_name not in ('SYSTEM')) + loop + DBMS_SPACE_ADMIN.TABLESPACE_MIGRATE_TO_LOCAL(t.tablespace_name); + end loop; + for t in (select tablespace_name from dba_tablespaces + where contents=3D'PERMANENT' + and tablespace_name not in ('SYSTEM','SYSAUX')) + loop + execute immediate 'alter tablespace ' || t.tablespace_name || ' rea= d only'; + end loop; + execute immediate 'alter tablespace SYSAUX offline'; + DBMS_SPACE_ADMIN.TABLESPACE_MIGRATE_TO_LOCAL('SYSTEM'); + execute immediate 'alter tablespace SYSAUX online'; + for t in (select tablespace_name from dba_tablespaces + where status =3D 'READ ONLY') + loop + execute immediate 'alter tablespace ' || t.tablespace_name || ' rea= d write'; + end loop; + end loop; +end; +/ + +-- restart the instance to reinitialize the system parameters +shutdown immediate +startup + +-- lock default users from 9i +select sysdate, 'Locking default 9i users' message from dual; +BEGIN + FOR item IN ( SELECT USERNAME FROM DBA_USERS WHERE USERNAME IN ( + 'DBSNMP', 'OUTLN', 'TSMSYS', 'ORACLE_OCM', 'DIP') ) + LOOP + dbms_output.put_line('Locking and Expiring: ' || item.USERNAME); + execute immediate 'alter user ' || item.USERNAME || ' password expire a= ccount lock' ; + END LOOP; +END; +/ + +-- set compatible flag +alter system set compatible=3D'10.2.0.4.0' scope=3Dspfile; +disconnect + +connect / as sysdba +shutdown immediate + --===============4325264150123873798==-- From jmrodri at fedoraproject.org Thu Aug 20 11:57:17 2015 Content-Type: multipart/mixed; boundary="===============5049039323258170801==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 3 commits - java/code search-server/rhn_search_daemon_dev.conf search-server/run.sh Date: Mon, 01 Jun 2009 20:53:33 +0000 Message-ID: <20090601205333.3DD3F1201E2@lists.fedorahosted.org> --===============5049039323258170801== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java | 43 ++++= +++++- search-server/rhn_search_daemon_dev.conf | 9 +- search-server/run.sh | 2 = 3 files changed, 49 insertions(+), 5 deletions(-) New commits: commit 01efd4c9fb0023cf47c19b19b31e36eddb1e95fb Author: jesus m. rodriguez Date: Mon Jun 1 16:20:52 2009 -0400 496933 - update the errata index when publishing an errata. diff --git a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java= b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java index 8b42266..2535b63 100644 --- a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java +++ b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java @@ -63,6 +63,9 @@ import java.util.List; import java.util.Map; import java.util.Set; = +import redstone.xmlrpc.XmlRpcClient; +import redstone.xmlrpc.XmlRpcFault; + /** * ErrataManager is the singleton class used to provide business operations * on Errata, where those operations interact with other top tier business @@ -125,7 +128,7 @@ public class ErrataManager extends BaseManager { /** * Takes an unpublished errata and returns a published errata into the = * channels we pass in. NOTE: This method does NOT update the errata = cache for - * the channels. THat is done when packages are pushed as part of the= errata = + * the channels. That is done when packages are pushed as part of the= errata * publication process (which is not done here) * = * @param unpublished The errata to publish @@ -140,6 +143,9 @@ public class ErrataManager extends BaseManager { = retval =3D addChannelsToErrata(retval, channelIds, user); log.debug("publish - updateErrataCacheForChannelsAsync called"); + + // update the search server + updateSearchIndex(); return retval; } = @@ -153,6 +159,9 @@ public class ErrataManager extends BaseManager { //pass on to the factory Errata retval =3D ErrataFactory.publish(unpublished); log.debug("publish - errata published"); + + // update the search server + updateSearchIndex(); return retval; } = @@ -1197,5 +1206,35 @@ public class ErrataManager extends BaseManager { return m.execute(params); = } = - = + /** + * update the errata search index. + * @return true if index was updated, false otherwise. + */ + private static boolean updateSearchIndex() { + boolean flag =3D false; + + try { + XmlRpcClient client =3D new XmlRpcClient(Config.get().getSearch= ServerUrl(), true); + List args =3D new ArrayList(); + args.add("errata"); + Boolean rc =3D (Boolean)client.invoke("admin.updateIndex", args= ); + flag =3D rc.booleanValue(); + } + catch (XmlRpcFault e) { + // right now updateIndex doesn't throw any faults. + log.error("Errata index not updated. Search server unavailable.= " + + "ErrorCode =3D " + e.getErrorCode(), e); + e.printStackTrace(); + } + catch (Exception e) { + // if the search server is down, folks will know when they + // attempt to search. If this call failed the errata in + // question won't be searchable immediately, but will get picked + // up the next time the search server runs the job (after being + // restarted. + log.error("Errata index not updated. Search server unavailable.= ", e); + } + + return flag; + } } commit 8e99400b19fa5241ee5a3b4dfbe76c7f1d7553a7 Author: jesus m. rodriguez Date: Mon Jun 1 16:13:41 2009 -0400 added java debugger options for local dev config diff --git a/search-server/rhn_search_daemon_dev.conf b/search-server/rhn_s= earch_daemon_dev.conf index d9f12ac..964fe46 100644 --- a/search-server/rhn_search_daemon_dev.conf +++ b/search-server/rhn_search_daemon_dev.conf @@ -34,7 +34,12 @@ wrapper.console.format=3DPM wrapper.console.loglevel=3DINFO wrapper.logfile=3D%PWD%/rhn_search_daemon.log wrapper.logfile.format=3DLPTM -wrapper.logfile.loglevel=3DINFO +wrapper.logfile.loglevel=3DDEBUG wrapper.logfile.maxsize=3D5m wrapper.logfile.maxfiles=3D0 -wrapper.syslog.loglevel=3DNONE +wrapper.syslog.loglevel=3DDEBUG + +wrapper.java.additional.1=3D-Dsearch.config.dir=3D%PWD%/src/config/search +wrapper.java.additional.2=3D-Xdebug +wrapper.java.additional.3=3D-Xnoagent +wrapper.java.additional.4=3D-Xrunjdwp:transport=3Ddt_socket,address=3D9999= ,server=3Dy,suspend=3Dn commit 25cae0c660aaf2ffd1b0c967469f94d7035c9788 Author: jesus m. rodriguez Date: Mon Jun 1 16:13:13 2009 -0400 store pid file locally. diff --git a/search-server/run.sh b/search-server/run.sh index 7689518..0bbf58a 100755 --- a/search-server/run.sh +++ b/search-server/run.sh @@ -14,4 +14,4 @@ fi echo "starting server" export CLASSPATH=3D`pwd`/build #java -Djava.library.path=3D/usr/lib -classpath `build-classpath-directory= lib dist` com.redhat.satellite.search.Main -/usr/sbin/tanukiwrapper `pwd`/rhn_search_daemon_dev.conf wrapper.pidfile= =3Drhn-search.pid wrapper.daemonize=3DFALSE +/usr/sbin/tanukiwrapper `pwd`/rhn_search_daemon_dev.conf wrapper.pidfile= =3D`pwd`/rhn-search.pid wrapper.daemonize=3DFALSE --===============5049039323258170801==-- From jmrodri at fedoraproject.org Thu Aug 20 11:57:17 2015 Content-Type: multipart/mixed; boundary="===============4982610058178808485==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: 3 commits - java/code search-server/rhn_search_daemon_dev.conf search-server/run.sh Date: Mon, 01 Jun 2009 20:55:45 +0000 Message-ID: <20090601205545.7F3DC1201E2@lists.fedorahosted.org> --===============4982610058178808485== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java | 43 ++++= +++++- search-server/rhn_search_daemon_dev.conf | 9 +- search-server/run.sh | 2 = 3 files changed, 49 insertions(+), 5 deletions(-) New commits: commit c5b7ce6dfc5fe0a29b67dc029040fd6a0b2b9bef Author: jesus m. rodriguez Date: Mon Jun 1 16:20:52 2009 -0400 496933 - update the errata index when publishing an errata. diff --git a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java= b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java index 8b42266..2535b63 100644 --- a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java +++ b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java @@ -63,6 +63,9 @@ import java.util.List; import java.util.Map; import java.util.Set; = +import redstone.xmlrpc.XmlRpcClient; +import redstone.xmlrpc.XmlRpcFault; + /** * ErrataManager is the singleton class used to provide business operations * on Errata, where those operations interact with other top tier business @@ -125,7 +128,7 @@ public class ErrataManager extends BaseManager { /** * Takes an unpublished errata and returns a published errata into the = * channels we pass in. NOTE: This method does NOT update the errata = cache for - * the channels. THat is done when packages are pushed as part of the= errata = + * the channels. That is done when packages are pushed as part of the= errata * publication process (which is not done here) * = * @param unpublished The errata to publish @@ -140,6 +143,9 @@ public class ErrataManager extends BaseManager { = retval =3D addChannelsToErrata(retval, channelIds, user); log.debug("publish - updateErrataCacheForChannelsAsync called"); + + // update the search server + updateSearchIndex(); return retval; } = @@ -153,6 +159,9 @@ public class ErrataManager extends BaseManager { //pass on to the factory Errata retval =3D ErrataFactory.publish(unpublished); log.debug("publish - errata published"); + + // update the search server + updateSearchIndex(); return retval; } = @@ -1197,5 +1206,35 @@ public class ErrataManager extends BaseManager { return m.execute(params); = } = - = + /** + * update the errata search index. + * @return true if index was updated, false otherwise. + */ + private static boolean updateSearchIndex() { + boolean flag =3D false; + + try { + XmlRpcClient client =3D new XmlRpcClient(Config.get().getSearch= ServerUrl(), true); + List args =3D new ArrayList(); + args.add("errata"); + Boolean rc =3D (Boolean)client.invoke("admin.updateIndex", args= ); + flag =3D rc.booleanValue(); + } + catch (XmlRpcFault e) { + // right now updateIndex doesn't throw any faults. + log.error("Errata index not updated. Search server unavailable.= " + + "ErrorCode =3D " + e.getErrorCode(), e); + e.printStackTrace(); + } + catch (Exception e) { + // if the search server is down, folks will know when they + // attempt to search. If this call failed the errata in + // question won't be searchable immediately, but will get picked + // up the next time the search server runs the job (after being + // restarted. + log.error("Errata index not updated. Search server unavailable.= ", e); + } + + return flag; + } } commit db97a3702ffdf45a9a045f85b8eb904aa480436a Author: jesus m. rodriguez Date: Mon Jun 1 16:13:41 2009 -0400 added java debugger options for local dev config diff --git a/search-server/rhn_search_daemon_dev.conf b/search-server/rhn_s= earch_daemon_dev.conf index d9f12ac..964fe46 100644 --- a/search-server/rhn_search_daemon_dev.conf +++ b/search-server/rhn_search_daemon_dev.conf @@ -34,7 +34,12 @@ wrapper.console.format=3DPM wrapper.console.loglevel=3DINFO wrapper.logfile=3D%PWD%/rhn_search_daemon.log wrapper.logfile.format=3DLPTM -wrapper.logfile.loglevel=3DINFO +wrapper.logfile.loglevel=3DDEBUG wrapper.logfile.maxsize=3D5m wrapper.logfile.maxfiles=3D0 -wrapper.syslog.loglevel=3DNONE +wrapper.syslog.loglevel=3DDEBUG + +wrapper.java.additional.1=3D-Dsearch.config.dir=3D%PWD%/src/config/search +wrapper.java.additional.2=3D-Xdebug +wrapper.java.additional.3=3D-Xnoagent +wrapper.java.additional.4=3D-Xrunjdwp:transport=3Ddt_socket,address=3D9999= ,server=3Dy,suspend=3Dn commit 7b0ab56dd8ffd72a44b7c78ff0a132e9eafe584f Author: jesus m. rodriguez Date: Mon Jun 1 16:13:13 2009 -0400 store pid file locally. diff --git a/search-server/run.sh b/search-server/run.sh index 7689518..0bbf58a 100755 --- a/search-server/run.sh +++ b/search-server/run.sh @@ -14,4 +14,4 @@ fi echo "starting server" export CLASSPATH=3D`pwd`/build #java -Djava.library.path=3D/usr/lib -classpath `build-classpath-directory= lib dist` com.redhat.satellite.search.Main -/usr/sbin/tanukiwrapper `pwd`/rhn_search_daemon_dev.conf wrapper.pidfile= =3Drhn-search.pid wrapper.daemonize=3DFALSE +/usr/sbin/tanukiwrapper `pwd`/rhn_search_daemon_dev.conf wrapper.pidfile= =3D`pwd`/rhn-search.pid wrapper.daemonize=3DFALSE --===============4982610058178808485==-- From jmrodri at fedoraproject.org Thu Aug 20 11:57:17 2015 Content-Type: multipart/mixed; boundary="===============1422653263209125949==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-java-0.6.23-1' Date: Mon, 01 Jun 2009 20:57:16 +0000 Message-ID: <20090601205716.F3AB81201ED@lists.fedorahosted.org> --===============1422653263209125949== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-java-0.6.23-1' created by jesus m. rodriguez at 2009-06-01 20:56 +0000 Tagging package [spacewalk-java] version [0.6.23-1] in directory [java/]. Changes since spacewalk-branding-0.6.5-1-49: --- 0 files changed --- --===============1422653263209125949==-- From jmrodri at fedoraproject.org Thu Aug 20 11:57:17 2015 Content-Type: multipart/mixed; boundary="===============6683202011377042571==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: java/spacewalk-java.spec rel-eng/packages Date: Mon, 01 Jun 2009 20:57:14 +0000 Message-ID: <20090601205714.5E0191201E2@lists.fedorahosted.org> --===============6683202011377042571== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/spacewalk-java.spec | 29 ++++++++++++++++++++++++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 29 insertions(+), 2 deletions(-) New commits: commit 701f7400f7d7a2634a4892b3c29e4c515c46b0c1 Author: jesus m. rodriguez Date: Mon Jun 1 16:56:53 2009 -0400 Automatic commit of package [spacewalk-java] release [0.6.23-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 6656d39..325ce58 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -11,7 +11,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 0.6.22 +Version: 0.6.23 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{versi= on}.tar.gz = @@ -248,6 +248,33 @@ fi %attr(644, root, root) %{_datadir}/rhn/lib/rhn.jar = %changelog +* Mon Jun 01 2009 jesus m. rodriguez 0.6.23-1 +- 496933 - update the errata index when publishing an errata. (jesusr(a)re= dhat.com) +- 492206 - Fixed an issue ' bad cobbler template' parsing (paji(a)redhat.c= om) +- PackageSearchHandler apidoc cleanup (jmatthew(a)redhat.com) +- 457316 - Added search for packages in a particular channel. (jason.dobie= s(a)redhat.com) +- 502076 - Fixed kickstarting using a system profile (paji(a)redhat.com) +- 487014 - SystemSearch reducing scrore threshold for a single result to + redirect to SDC page (jmatthew(a)redhat.com) +- 501797 - no need to install Monitoring service (msuchy(a)redhat.com) +- 502923 - Fixed a null pointer that occured on saving non existent xen di= stro. (paji(a)redhat.com) +- 490960 - ErrataSearch limit returned results to current or trusted orgs = (jmatthew(a)redhat.com) +- remove todo indicator from code (bbuckingham(a)redhat.com) +- 501358 - api - channel.software.create - update to provide more detail on + label/name errors (bbuckingham(a)redhat.com) +- 499399 - create new api call proxy.createMonitoringScout (msuchy(a)redha= t.com) +- 502848 - adding hooks to better assist automation with the systems chann= el + subscription page (jsherril(a)redhat.com) +- 496105 - Fix for setting up activaiton key for para-host provisioning (p= aji(a)redhat.com) +- 498467 - A few changes related to the channel name limit increase. (jaso= n.dobies(a)redhat.com) +- 502099 - api - update systemgroup.addOrRemoveAdmins to not allow changes= to + access for sat/org admins (bbuckingham(a)redhat.com) +- Fix tests and actions broken by recent change to set clearing logic. (dg= oodwin(a)redhat.com) +- 472545 - update to the webui translation strings (shughes(a)redhat.com) +- 502853 - improving support for CentOS by not looking only in the base ch= annel + for the UPDATE pacakges (jsherril(a)redhat.com) +- 501387 - adding kernel opts and post kernel opts to distro edit/create = page (jsherril(a)redhat.com) + * Tue May 26 2009 Devan Goodwin 0.6.22-1 - 500366 - ssm pkg verify - fix string in resource bundle (bbuckingham(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-j= ava index 00aa9da..ce70760 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -0.6.22-1 java/ +0.6.23-1 java/ --===============6683202011377042571==-- From jmrodri at fedoraproject.org Thu Aug 20 11:57:17 2015 Content-Type: multipart/mixed; boundary="===============0056544893454701652==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: rel-eng/packages search-server/spacewalk-search.spec Date: Mon, 01 Jun 2009 21:01:59 +0000 Message-ID: <20090601210159.B9DF71201E2@lists.fedorahosted.org> --===============0056544893454701652== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/spacewalk-search | 2 +- search-server/spacewalk-search.spec | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) New commits: commit 06d17902190eb146cc791ea747136efcc68ce449 Author: jesus m. rodriguez Date: Mon Jun 1 17:01:33 2009 -0400 Automatic commit of package [spacewalk-search] release [0.6.10-1]. diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk= -search index 63e88f6..bcd06f8 100644 --- a/rel-eng/packages/spacewalk-search +++ b/rel-eng/packages/spacewalk-search @@ -1 +1 @@ -0.6.9-1 search-server/ +0.6.10-1 search-server/ diff --git a/search-server/spacewalk-search.spec b/search-server/spacewalk-= search.spec index 9e40bfe..be152c2 100644 --- a/search-server/spacewalk-search.spec +++ b/search-server/spacewalk-search.spec @@ -4,7 +4,7 @@ Name: spacewalk-search Summary: Spacewalk Full Text Search Server Group: Applications/Internet License: GPLv2 -Version: 0.6.9 +Version: 0.6.10 Release: 1%{?dist} # This src.rpm is cannonical upstream # You can obtain it using this set of commands @@ -112,6 +112,12 @@ fi %{_sysconfdir}/logrotate.d/rhn-search = %changelog +* Mon Jun 01 2009 jesus m. rodriguez 0.6.10-1 +- added java debugger options for local dev config (jesusr(a)redhat.com) +- store pid file locally. (jesusr(a)redhat.com) +- 487014 - SystemSearch reducing scrore threshold for a single result to + redirect to SDC page (jmatthew(a)redhat.com) + * Tue May 26 2009 Devan Goodwin 0.6.9-1 - 501925 - "rhn-search cleanindex" will now restart search after cleaning = index (jmatthew(a)redhat.com) --===============0056544893454701652==-- From jmrodri at fedoraproject.org Thu Aug 20 11:57:17 2015 Content-Type: multipart/mixed; boundary="===============7693467761696569435==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-search-0.6.10-1' Date: Mon, 01 Jun 2009 21:02:02 +0000 Message-ID: <20090601210202.7045E1202FF@lists.fedorahosted.org> --===============7693467761696569435== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-search-0.6.10-1' created by jesus m. rodriguez at 2009-06-01 21:01 +0000 Tagging package [spacewalk-search] version [0.6.10-1] in directory [search-= server/]. Changes since spacewalk-java-0.6.23-1: jesus m. rodriguez (1): Automatic commit of package [spacewalk-search] release [0.6.10-1]. --- rel-eng/packages/spacewalk-search | 2 +- search-server/spacewalk-search.spec | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) --- --===============7693467761696569435==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:17 2015 Content-Type: multipart/mixed; boundary="===============0271457487702874564==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: client/rhel Date: Mon, 01 Jun 2009 21:05:44 +0000 Message-ID: <20090601210544.96D831201E2@lists.fedorahosted.org> --===============0271457487702874564== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py | 2 ++ 1 file changed, 2 insertions(+) New commits: commit f38b9cedf82618420fa7404e1cd622054fd49f7b Author: Pradeep Kilambi Date: Mon Jun 1 17:05:36 2009 -0400 account for virt_uuid is None case diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py b/cl= ient/rhel/rhn-client-tools/src/up2date_client/rhnreg.py index ea4bf0f..5742ac7 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py @@ -572,6 +572,8 @@ def getRemainingSubscriptions(username, password): virt_uuid, virt_type =3D get_virt_info() if virt_uuid is not None: log.log_debug('Sending up virt_uuid: %s' % str(virt_uuid)) + else: + virt_uuid =3D "" = # If we've gotten this far, we're definitely looking at hosted. # Hosted will have to support the sending of the release, and optional= ly, --===============0271457487702874564==-- From partha at fedoraproject.org Thu Aug 20 11:57:17 2015 Content-Type: multipart/mixed; boundary="===============8644286645278000171==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Mon, 01 Jun 2009 23:04:39 +0000 Message-ID: <20090601230439.C09DA1201E2@lists.fedorahosted.org> --===============8644286645278000171== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/conf/Config.java = | 38 ++++++++++ java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEdi= tAction.java | 24 +++--- java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf= | 8 +- 3 files changed, 55 insertions(+), 15 deletions(-) New commits: commit 99024068491f8c403daf0634a776e54747ce713f Author: Partha Aji Date: Mon Jun 1 19:05:33 2009 -0400 Made default virt options in a profile configurable and other anomalies= related to virt options diff --git a/java/code/src/com/redhat/rhn/common/conf/Config.java b/java/co= de/src/com/redhat/rhn/common/conf/Config.java index 5b0c070..ef470cd 100644 --- a/java/code/src/com/redhat/rhn/common/conf/Config.java +++ b/java/code/src/com/redhat/rhn/common/conf/Config.java @@ -177,6 +177,9 @@ public class Config { public static final String VIRT_PATH_DIR =3D "kickstart.virt_storage_p= ath"; private static final String DEFAULT_VIRT_PATH =3D "/var/lib/xen"; public static final String VIRT_BRIDGE =3D "kickstart.virt_bridge"; + public static final String VIRT_MEM =3D "kickstart.virt_mem_size_kb"; + public static final String VIRT_CPU =3D "kickstart.virt_cpus"; + public static final String VIRT_DISK =3D "kickstart.virt_disk_size_gb"; /** * array of prefix in the order they should be search * if the given lookup string is without a namespace. @@ -441,6 +444,18 @@ public class Config { } = /** + * get the config entry for string s, if no value is found + * return the defaultValue specified. + * + * @param s string to get the value of + * @param defaultValue Default value if entry is not found. + * @return the value + */ + public long getLong(String s, long defaultValue) { + return Long.valueOf(getString(s, String.valueOf(defaultValue))); + } + = + /** * get the config entry for string name * * @param name string to set the value of @@ -791,4 +806,27 @@ public class Config { public String getDefaultXenVirtBridge() { return getString(VIRT_BRIDGE, "xenbr0"); } + /** + * Returns the default virt disk size in GBs + * @return the virt disk size + */ + public int getDefaultVirtDiskSize() { + return getInt(VIRT_DISK, 3); + } + + /** + * Returns the defualt VirtMemory Size in KBs + * @return the memory size + */ + public long getDefaultVirtMemorySize() { + return getLong(VIRT_MEM, 262144); + } + = + /** + * Returns the default number of virt cpus + * @return the number of virt cpus + */ + public int getDefaultVirtCpus() { + return getInt(VIRT_CPU, 1); + } = } diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Kicksta= rtDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kic= kstart/KickstartDetailsEditAction.java index d66e9f2..328d68b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetai= lsEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetai= lsEditAction.java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.action.kickstart; = = +import com.redhat.rhn.common.conf.Config; import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.common.validator.ValidatorException; @@ -63,9 +64,6 @@ public class KickstartDetailsEditAction extends BaseKicks= tartEditAction { public static final String POST_LOG =3D "post_log"; public static final String PRE_LOG =3D "pre_log"; public static final String KS_CFG =3D "ksCfg"; - = - - public static final String KERNEL_OPTIONS =3D "kernel_options"; public static final String POST_KERNEL_OPTIONS =3D "post_kernel_optio= ns"; = @@ -153,16 +151,20 @@ public class KickstartDetailsEditAction extends BaseK= ickstartEditAction { } = if (prof =3D=3D null) { - form.set(VIRT_BRIDGE, "xenbr0"); - form.set(VIRT_CPU, 1); - form.set(VIRT_DISK_SIZE, 3); - form.set(VIRT_MEMORY, 262144); + form.set(VIRT_BRIDGE, Config.get().getDefaultXenVirtBridge()); + form.set(VIRT_CPU, Config.get().getDefaultVirtCpus()); + form.set(VIRT_DISK_SIZE, Config.get().getDefaultVirtDiskSize()); + form.set(VIRT_MEMORY, Config.get().getDefaultVirtMemorySize()); } else { - setFormValueOrDefault(form, VIRT_BRIDGE, prof.getVirtBridge(), = "xenbr0"); - setFormValueOrDefault(form, VIRT_CPU, prof.getVirtCpus(), 1); - setFormValueOrDefault(form, VIRT_DISK_SIZE, prof.getVirtFileSiz= e(), 3); - setFormValueOrDefault(form, VIRT_MEMORY, prof.getVirtRam(), 262= 144); = + setFormValueOrDefault(form, VIRT_BRIDGE, prof.getVirtBridge(), = + Config.get().getDefaultXenV= irtBridge()); + setFormValueOrDefault(form, VIRT_CPU, prof.getVirtCpus(), + Config.get().getDefault= VirtCpus()); + setFormValueOrDefault(form, VIRT_DISK_SIZE, prof.getVirtFileSiz= e(), + Config.get().getDefaultVirt= DiskSize()); + setFormValueOrDefault(form, VIRT_MEMORY, prof.getVirtRam(), + Config.get().getDefaultVirtMemo= rySize()); = } = = diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virt= options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/vi= rtoptions.jspf index 2a80c2c..71bc7aa 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions= .jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions= .jspf @@ -4,20 +4,20 @@ = :<= /th> - + = : - + : - + = :<= /th> - + = = \ No newline at end of file --===============8644286645278000171==-- From partha at fedoraproject.org Thu Aug 20 11:57:17 2015 Content-Type: multipart/mixed; boundary="===============3171696989927672032==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Mon, 01 Jun 2009 23:05:26 +0000 Message-ID: <20090601230526.624711201E2@lists.fedorahosted.org> --===============3171696989927672032== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/conf/Config.java = | 38 ++++++++++ java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEdi= tAction.java | 24 +++--- java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf= | 8 +- 3 files changed, 55 insertions(+), 15 deletions(-) New commits: commit 979dc8c1eb81dffc8981df755c6a1fa0fee20a3a Author: Partha Aji Date: Mon Jun 1 19:05:33 2009 -0400 Made default virt options in a profile configurable and other anomalies= related to virt options diff --git a/java/code/src/com/redhat/rhn/common/conf/Config.java b/java/co= de/src/com/redhat/rhn/common/conf/Config.java index 5b0c070..ef470cd 100644 --- a/java/code/src/com/redhat/rhn/common/conf/Config.java +++ b/java/code/src/com/redhat/rhn/common/conf/Config.java @@ -177,6 +177,9 @@ public class Config { public static final String VIRT_PATH_DIR =3D "kickstart.virt_storage_p= ath"; private static final String DEFAULT_VIRT_PATH =3D "/var/lib/xen"; public static final String VIRT_BRIDGE =3D "kickstart.virt_bridge"; + public static final String VIRT_MEM =3D "kickstart.virt_mem_size_kb"; + public static final String VIRT_CPU =3D "kickstart.virt_cpus"; + public static final String VIRT_DISK =3D "kickstart.virt_disk_size_gb"; /** * array of prefix in the order they should be search * if the given lookup string is without a namespace. @@ -441,6 +444,18 @@ public class Config { } = /** + * get the config entry for string s, if no value is found + * return the defaultValue specified. + * + * @param s string to get the value of + * @param defaultValue Default value if entry is not found. + * @return the value + */ + public long getLong(String s, long defaultValue) { + return Long.valueOf(getString(s, String.valueOf(defaultValue))); + } + = + /** * get the config entry for string name * * @param name string to set the value of @@ -791,4 +806,27 @@ public class Config { public String getDefaultXenVirtBridge() { return getString(VIRT_BRIDGE, "xenbr0"); } + /** + * Returns the default virt disk size in GBs + * @return the virt disk size + */ + public int getDefaultVirtDiskSize() { + return getInt(VIRT_DISK, 3); + } + + /** + * Returns the defualt VirtMemory Size in KBs + * @return the memory size + */ + public long getDefaultVirtMemorySize() { + return getLong(VIRT_MEM, 262144); + } + = + /** + * Returns the default number of virt cpus + * @return the number of virt cpus + */ + public int getDefaultVirtCpus() { + return getInt(VIRT_CPU, 1); + } = } diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Kicksta= rtDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kic= kstart/KickstartDetailsEditAction.java index d66e9f2..328d68b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetai= lsEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetai= lsEditAction.java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.action.kickstart; = = +import com.redhat.rhn.common.conf.Config; import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.common.validator.ValidatorException; @@ -63,9 +64,6 @@ public class KickstartDetailsEditAction extends BaseKicks= tartEditAction { public static final String POST_LOG =3D "post_log"; public static final String PRE_LOG =3D "pre_log"; public static final String KS_CFG =3D "ksCfg"; - = - - public static final String KERNEL_OPTIONS =3D "kernel_options"; public static final String POST_KERNEL_OPTIONS =3D "post_kernel_optio= ns"; = @@ -153,16 +151,20 @@ public class KickstartDetailsEditAction extends BaseK= ickstartEditAction { } = if (prof =3D=3D null) { - form.set(VIRT_BRIDGE, "xenbr0"); - form.set(VIRT_CPU, 1); - form.set(VIRT_DISK_SIZE, 3); - form.set(VIRT_MEMORY, 262144); + form.set(VIRT_BRIDGE, Config.get().getDefaultXenVirtBridge()); + form.set(VIRT_CPU, Config.get().getDefaultVirtCpus()); + form.set(VIRT_DISK_SIZE, Config.get().getDefaultVirtDiskSize()); + form.set(VIRT_MEMORY, Config.get().getDefaultVirtMemorySize()); } else { - setFormValueOrDefault(form, VIRT_BRIDGE, prof.getVirtBridge(), = "xenbr0"); - setFormValueOrDefault(form, VIRT_CPU, prof.getVirtCpus(), 1); - setFormValueOrDefault(form, VIRT_DISK_SIZE, prof.getVirtFileSiz= e(), 3); - setFormValueOrDefault(form, VIRT_MEMORY, prof.getVirtRam(), 262= 144); = + setFormValueOrDefault(form, VIRT_BRIDGE, prof.getVirtBridge(), = + Config.get().getDefaultXenV= irtBridge()); + setFormValueOrDefault(form, VIRT_CPU, prof.getVirtCpus(), + Config.get().getDefault= VirtCpus()); + setFormValueOrDefault(form, VIRT_DISK_SIZE, prof.getVirtFileSiz= e(), + Config.get().getDefaultVirt= DiskSize()); + setFormValueOrDefault(form, VIRT_MEMORY, prof.getVirtRam(), + Config.get().getDefaultVirtMemo= rySize()); = } = = diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virt= options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/vi= rtoptions.jspf index 2a80c2c..71bc7aa 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions= .jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions= .jspf @@ -4,20 +4,20 @@ = :<= /th> - + = : - + : - + = :<= /th> - + = = \ No newline at end of file --===============3171696989927672032==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:17 2015 Content-Type: multipart/mixed; boundary="===============8644104642879452765==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - projects/oracle-server-scripts Date: Tue, 02 Jun 2009 08:44:45 +0000 Message-ID: <20090602084445.66383120375@lists.fedorahosted.org> --===============8644104642879452765== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable create | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a65fcd7f405596198ae7638efbf331a902aeca8c Author: Milan Zazrivec Date: Tue Jun 2 10:43:21 2009 +0200 lock only open accounts diff --git a/projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl b/p= rojects/oracle-server-scripts/embedded-upgradedb-10g.tmpl index 7f80cee..609c9de 100644 --- a/projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl +++ b/projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl @@ -80,7 +80,7 @@ startup select sysdate, 'Locking default 9i users' message from dual; BEGIN FOR item IN ( SELECT USERNAME FROM DBA_USERS WHERE USERNAME IN ( - 'DBSNMP', 'OUTLN', 'TSMSYS', 'ORACLE_OCM', 'DIP') ) + 'DBSNMP', 'OUTLN', 'TSMSYS', 'ORACLE_OCM', 'DIP') AND ACCOUNT_STATUS = =3D 'OPEN') LOOP dbms_output.put_line('Locking and Expiring: ' || item.USERNAME); execute immediate 'alter user ' || item.USERNAME || ' password expire a= ccount lock' ; commit 454745d638eabb5cf9c14484b4a091badda914bb Author: Milan Zazrivec Date: Tue Jun 2 10:41:42 2009 +0200 remove previously commented out line diff --git a/projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl b/p= rojects/oracle-server-scripts/embedded-upgradedb-10g.tmpl index b0ac82b..7f80cee 100644 --- a/projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl +++ b/projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl @@ -15,7 +15,6 @@ whenever sqlerror exit failure whenever oserror exit failure = connect / as sysdba --- create spfile from pfile=3D'upgrade-init(a).ora'; startup upgrade = alter session set nls_date_format =3D 'YYYY-MM-DD HH24:MI:SS'; --===============8644104642879452765==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:17 2015 Content-Type: multipart/mixed; boundary="===============3362318207138210044==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 2 commits - projects/oracle-server-scripts Date: Tue, 02 Jun 2009 08:46:06 +0000 Message-ID: <20090602084606.B9D3E120373@lists.fedorahosted.org> --===============3362318207138210044== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable create | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9adf8b6627a72ad758be2fb44fec5d23dcf7c6bf Author: Milan Zazrivec Date: Tue Jun 2 10:43:21 2009 +0200 lock only open accounts diff --git a/projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl b/p= rojects/oracle-server-scripts/embedded-upgradedb-10g.tmpl index 7f80cee..609c9de 100644 --- a/projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl +++ b/projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl @@ -80,7 +80,7 @@ startup select sysdate, 'Locking default 9i users' message from dual; BEGIN FOR item IN ( SELECT USERNAME FROM DBA_USERS WHERE USERNAME IN ( - 'DBSNMP', 'OUTLN', 'TSMSYS', 'ORACLE_OCM', 'DIP') ) + 'DBSNMP', 'OUTLN', 'TSMSYS', 'ORACLE_OCM', 'DIP') AND ACCOUNT_STATUS = =3D 'OPEN') LOOP dbms_output.put_line('Locking and Expiring: ' || item.USERNAME); execute immediate 'alter user ' || item.USERNAME || ' password expire a= ccount lock' ; commit 1892b0a5a8cf8898bd54631da83e842c89a06013 Author: Milan Zazrivec Date: Tue Jun 2 10:41:42 2009 +0200 remove previously commented out line diff --git a/projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl b/p= rojects/oracle-server-scripts/embedded-upgradedb-10g.tmpl index b0ac82b..7f80cee 100644 --- a/projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl +++ b/projects/oracle-server-scripts/embedded-upgradedb-10g.tmpl @@ -15,7 +15,6 @@ whenever sqlerror exit failure whenever oserror exit failure = connect / as sysdba --- create spfile from pfile=3D'upgrade-init(a).ora'; startup upgrade = alter session set nls_date_format =3D 'YYYY-MM-DD HH24:MI:SS'; --===============3362318207138210044==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:17 2015 Content-Type: multipart/mixed; boundary="===============3655054773923984381==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: projects/oracle-server-scripts rel-eng/packages Date: Tue, 02 Jun 2009 09:19:37 +0000 Message-ID: <20090602091937.7B315120373@lists.fedorahosted.org> --===============3655054773923984381== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable projects/oracle-server-scripts/oracle-server-scripts.spec | 4 +++- rel-eng/packages/oracle-server-scripts | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) New commits: commit 4a2fbcb7ec9fd5329be15b21a95c0c2da6d7fe66 Author: Milan Zazrivec Date: Tue Jun 2 11:18:42 2009 +0200 Automatic commit of package [oracle-server-scripts] minor release [10.2= .0-29]. diff --git a/projects/oracle-server-scripts/oracle-server-scripts.spec b/pr= ojects/oracle-server-scripts/oracle-server-scripts.spec index 93c042b..d097962 100644 --- a/projects/oracle-server-scripts/oracle-server-scripts.spec +++ b/projects/oracle-server-scripts/oracle-server-scripts.spec @@ -9,7 +9,7 @@ Summary: Oracle 10g Database Server Enterprise Edition scripts Name: oracle-server-scripts Version: 10.2.0 -Release: 28%{?dist} +Release: 29%{?dist} Source0: oracle-home.sh Source1: init-params.ora Source2: create-db.sh @@ -95,6 +95,8 @@ exit 0 %{oracle_scripts} = %changelog +* Tue Jun 02 2009 Milan Zazrivec 10.2.0-29 +- script for 10.2.0.3 to 10.2.0.4 10g upgrade * Thu May 21 2009 jesus m. rodriguez 10.2.0-28 - 498192 - fix PL/SQL compilation error during embedded db upgrade (mmraka= (a)redhat.com) - 498192 - fix ORA-10647 during embedded db upgrade (mzazrivec(a)redhat.co= m) diff --git a/rel-eng/packages/oracle-server-scripts b/rel-eng/packages/orac= le-server-scripts index cf4614c..5d0334a 100644 --- a/rel-eng/packages/oracle-server-scripts +++ b/rel-eng/packages/oracle-server-scripts @@ -1 +1 @@ -10.2.0-28 projects/oracle-server-scripts/ +10.2.0-29 projects/oracle-server-scripts/ --===============3655054773923984381==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:17 2015 Content-Type: multipart/mixed; boundary="===============0911253301269008936==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/oracle-server-scripts-10.2.0-29' Date: Tue, 02 Jun 2009 09:19:45 +0000 Message-ID: <20090602091945.6C063120373@lists.fedorahosted.org> --===============0911253301269008936== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'oracle-server-scripts-10.2.0-29' created by Milan Zazrivec at 2009-06-02 09:18 +0000 Tagging package [oracle-server-scripts] version [10.2.0-29] in directory [p= rojects/oracle-server-scripts/]. Changes since spacewalk-search-0.6.10-1-4: --- 0 files changed --- --===============0911253301269008936==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:17 2015 Content-Type: multipart/mixed; boundary="===============1331145750341998137==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: spacewalk/setup Date: Tue, 02 Jun 2009 10:11:03 +0000 Message-ID: <20090602101103.35410120373@lists.fedorahosted.org> --===============1331145750341998137== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/setup/lib/Spacewalk/Setup.pm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) New commits: commit ea7e063d97f391dffd25b095d1288476fa128499 Author: Milan Zazrivec Date: Tue Jun 2 12:08:14 2009 +0200 distinguish minor and major version embedded db upgrades diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/S= pacewalk/Setup.pm index f0cda94..f32c249 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -728,9 +728,12 @@ sub oracle_setup_embedded_db { } = = - if ($opts->{'upgrade'} and need_oracle_9i_10g_upgrade()) { + if ($opts->{'upgrade'}) { + my $upgrade_script =3D "upgrade-db-10g.sh"; + need_oracle_9i_10g_upgrade() and $upgrade_script =3D "upgrade-db.sh"; + printf loc(< "Could not upgrade database.\n", -err_code =3D> 15, -system_opts =3D> ['/sbin/runuser', 'oracle', '-c', - "ORACLE_CUSTOM_SID=3D$answers->{'db-si= d'} " . SHARED_DIR . '/oracle/upgrade-db.sh' ]); + "ORACLE_CUSTOM_SID=3D$answers->{'db-si= d'} " . SHARED_DIR . + '/oracle/' . $upgrade_script ]); = system_or_exit(['service', 'oracle', 'restart'], 41, 'Could not restart oracle service'); --===============1331145750341998137==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:17 2015 Content-Type: multipart/mixed; boundary="===============7013957184669014724==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - spacewalk/setup Date: Tue, 02 Jun 2009 10:11:39 +0000 Message-ID: <20090602101139.82969120373@lists.fedorahosted.org> --===============7013957184669014724== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/setup/lib/Spacewalk/Setup.pm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) New commits: commit b3961014569f439aa088e5a637373815ec0ea083 Author: Milan Zazrivec Date: Tue Jun 2 12:08:14 2009 +0200 distinguish minor and major version embedded db upgrades diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/S= pacewalk/Setup.pm index 247ace1..03f5b50 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -728,9 +728,12 @@ sub oracle_setup_embedded_db { } = = - if ($opts->{'upgrade'} and need_oracle_9i_10g_upgrade()) { + if ($opts->{'upgrade'}) { + my $upgrade_script =3D "upgrade-db-10g.sh"; + need_oracle_9i_10g_upgrade() and $upgrade_script =3D "upgrade-db.sh"; + printf loc(< "Could not upgrade database.\n", -err_code =3D> 15, -system_opts =3D> ['/sbin/runuser', 'oracle', '-c', - "ORACLE_CUSTOM_SID=3D$answers->{'db-si= d'} " . SHARED_DIR . '/oracle/upgrade-db.sh' ]); + "ORACLE_CUSTOM_SID=3D$answers->{'db-si= d'} " . SHARED_DIR . + '/oracle/' . $upgrade_script ]); = system_or_exit(['service', 'oracle', 'restart'], 41, 'Could not restart oracle service'); --===============7013957184669014724==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:17 2015 Content-Type: multipart/mixed; boundary="===============4662989399593432851==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: client/rhel Date: Tue, 02 Jun 2009 14:48:36 +0000 Message-ID: <20090602144836.929C0120154@lists.fedorahosted.org> --===============4662989399593432851== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/rhel/rhn-client-tools/src/up2date_client/tui.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 49a9ed5a85dd7af553f74ad2bd30d1dea77c9746 Author: James Bowes Date: Tue Jun 2 10:40:51 2009 -0400 Support infinite available entitlements in TUI registration = getRemainingSubscriptions can return -1 if your account has an unlimited amount of entitlements for the channel you're trying to subscribe to. The rhn_register GTK+ gui knew about this, but the TUI did not. diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py b/clien= t/rhel/rhn-client-tools/src/up2date_client/tui.py index ff5f271..48cec38 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py @@ -1562,7 +1562,8 @@ class Tui: = log.log_debug('subs is %s' % subs) = - if int(subs) > 0: + # -1 is infinite + if int(subs) !=3D 0: log.log_debug('we still have subscriptions %s' % str(subs)) = # bz442930 : Should allow registration when login and password= is changed --===============4662989399593432851==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:17 2015 Content-Type: multipart/mixed; boundary="===============0301389616157330107==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: backend/apache-conf spacewalk/config spacewalk/setup Date: Tue, 02 Jun 2009 15:15:52 +0000 Message-ID: <20090602151552.EB945120154@lists.fedorahosted.org> --===============0301389616157330107== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/apache-conf/zz-spacewalk-server.conf | 6 +++++ spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf | 15 ++++++++= +++++ spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 14 --------= ---- spacewalk/config/spacewalk-config.spec | 1 = spacewalk/setup/share/ssl.conf.6 | 4 +++ spacewalk/setup/spacewalk-setup.spec | 1 = 6 files changed, 27 insertions(+), 14 deletions(-) New commits: commit 215b6172009d2769f87229da6fd909dbea7aa2d1 Author: Devan Goodwin Date: Tue Jun 2 11:40:15 2009 -0300 Fixes to support mod_jk >=3D 2.2.26. = Using a newer version of mod_jk (which we only use on RHEL 4 installs) resulted in apache not being able to communicate with tomcat. This was caused by a change in 2.2.26 where mod_jk apache directives must be defined per vhost, rather than globally. To correct we must specify JkMountCopy in the vhost definitions in ssl.conf (which we modify during spacewalk-setup) as well as zz-spacewalk-server.conf. = Because of apache loading order issues, this commit introduces 00-spacewalk-mod_jk.conf to load mod_jk and configure it early. diff --git a/backend/apache-conf/zz-spacewalk-server.conf b/backend/apache-= conf/zz-spacewalk-server.conf index be1deda..0d45d9d 100644 --- a/backend/apache-conf/zz-spacewalk-server.conf +++ b/backend/apache-conf/zz-spacewalk-server.conf @@ -14,6 +14,12 @@ RewriteRule ^(/.*\.(do|jsp)(\?.*)?)$ ajp://localhost:8009/$1 [P] RewriteRule ^/rpc/api /rhn/rpc/api [P] + + + # Inherit the mod_jk settings defined in zz-spacewalk-www.conf + JkMountCopy On + + AllowOverride all diff --git a/spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf b/s= pacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf new file mode 100644 index 0000000..ed802af --- /dev/null +++ b/spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf @@ -0,0 +1,15 @@ + + LoadModule jk_module modules/mod_jk.so + + + + JkWorkersFile /etc/rhn/satellite-httpd/conf/workers.properties + JkLogLevel info + JkLogFile /var/log/httpd/mod_jk.log + JkMount /rhn/* ajp13 + JkMount /rhn ajp13 + JkMount /*.do ajp13 + JkMount /*.jsp ajp13 + JkHTTPSIndicator HTTPS + + diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spac= ewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf index 981b291..3e49b75 100644 --- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf +++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf @@ -61,9 +61,6 @@ LoadModule version_module modules/mod_version.so LoadModule proxy_ajp_module modules/mod_proxy_ajp.so - -LoadModule jk_module modules/mod_jk.so - = # Turn rewrite engine on so we can use it for # kickstart requests. @@ -76,17 +73,6 @@ RewriteRule ^/rhn(.*) ajp://localhost:8009/rhn$1 [P] RewriteRule ^(/.*\.(do|jsp)(\?.*)?)$ ajp://localhost:8009/$1 [P] = - - JkWorkersFile /etc/rhn/satellite-httpd/conf/workers.properties - JkLogLevel info - JkLogFile /var/log/httpd/mod_jk.log - JkMount /rhn/* ajp13 - JkMount /rhn ajp13 - JkMount /*.do ajp13 - JkMount /*.jsp ajp13 - JkHTTPSIndicator HTTPS - - RedirectMatch ^/renew/.* http://rhn.redhat.com RedirectMatch ^/index\.html$ /rhn/Login.do = diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spac= ewalk-config.spec index 25943b8..50c81ec 100644 --- a/spacewalk/config/spacewalk-config.spec +++ b/spacewalk/config/spacewalk-config.spec @@ -58,6 +58,7 @@ rm -rf $RPM_BUILD_ROOT %attr(0755,root,root) %{_sysconfdir}/rhn/satellite-httpd/conf/startup.pl %config(noreplace) %{_sysconfdir}/rhn/satellite-httpd/conf/rhn/rhn_monitor= ing.conf %config(noreplace) %{_sysconfdir}/httpd/conf.d/zz-spacewalk-www.conf +%config(noreplace) %{_sysconfdir}/httpd/conf.d/00-spacewalk-mod_jk.conf %config(noreplace) %{_sysconfdir}/rhn/satellite-httpd/conf/workers.propert= ies %config(noreplace) %{_sysconfdir}/webapp-keyring.gpg %config(noreplace) %{_var}/lib/cobbler/kickstarts/spacewalk-sample.ks diff --git a/spacewalk/setup/share/ssl.conf.6 b/spacewalk/setup/share/ssl.c= onf.6 new file mode 100644 index 0000000..76cd3e4 --- /dev/null +++ b/spacewalk/setup/share/ssl.conf.6 @@ -0,0 +1,4 @@ +[ \t]*\s*\n\s*JkMountCopy.*\n\s*\s*\n + + JkMountCopy On + diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewa= lk-setup.spec index 00e6018..abfec34 100644 --- a/spacewalk/setup/spacewalk-setup.spec +++ b/spacewalk/setup/spacewalk-setup.spec @@ -61,6 +61,7 @@ install -m 0644 share/ssl.conf.2 %{buildroot}/%{_datadir}= /spacewalk/setup/ install -m 0644 share/ssl.conf.3 %{buildroot}/%{_datadir}/spacewalk/setup/ install -m 0644 share/ssl.conf.4 %{buildroot}/%{_datadir}/spacewalk/setup/ install -m 0644 share/ssl.conf.5 %{buildroot}/%{_datadir}/spacewalk/setup/ +install -m 0644 share/ssl.conf.6 %{buildroot}/%{_datadir}/spacewalk/setup/ install -m 0644 share/old-jvm-list %{buildroot}/%{_datadir}/spacewalk/setu= p/ install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/defaults.d/ install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/upgrade --===============0301389616157330107==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:17 2015 Content-Type: multipart/mixed; boundary="===============3341845314282238782==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - backend/apache-conf spacewalk/config spacewalk/setup Date: Tue, 02 Jun 2009 15:19:39 +0000 Message-ID: <20090602151939.6F08E120154@lists.fedorahosted.org> --===============3341845314282238782== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/apache-conf/zz-spacewalk-server.conf | 6 +++++ spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf | 15 ++++++++= +++++ spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 14 --------= ---- spacewalk/config/spacewalk-config.spec | 1 = spacewalk/setup/share/ssl.conf.6 | 4 +++ spacewalk/setup/spacewalk-setup.spec | 1 = 6 files changed, 27 insertions(+), 14 deletions(-) New commits: commit d80331d696112db4a2bb44ddb505c89ad5cacd73 Author: Devan Goodwin Date: Tue Jun 2 11:40:15 2009 -0300 Fixes to support mod_jk >=3D 2.2.26. = Using a newer version of mod_jk (which we only use on RHEL 4 installs) resulted in apache not being able to communicate with tomcat. This was caused by a change in 2.2.26 where mod_jk apache directives must be defined per vhost, rather than globally. To correct we must specify JkMountCopy in the vhost definitions in ssl.conf (which we modify during spacewalk-setup) as well as zz-spacewalk-server.conf. = Because of apache loading order issues, this commit introduces 00-spacewalk-mod_jk.conf to load mod_jk and configure it early. diff --git a/backend/apache-conf/zz-spacewalk-server.conf b/backend/apache-= conf/zz-spacewalk-server.conf index be1deda..0d45d9d 100644 --- a/backend/apache-conf/zz-spacewalk-server.conf +++ b/backend/apache-conf/zz-spacewalk-server.conf @@ -14,6 +14,12 @@ RewriteRule ^(/.*\.(do|jsp)(\?.*)?)$ ajp://localhost:8009/$1 [P] RewriteRule ^/rpc/api /rhn/rpc/api [P] + + + # Inherit the mod_jk settings defined in zz-spacewalk-www.conf + JkMountCopy On + + AllowOverride all diff --git a/spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf b/s= pacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf new file mode 100644 index 0000000..ed802af --- /dev/null +++ b/spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf @@ -0,0 +1,15 @@ + + LoadModule jk_module modules/mod_jk.so + + + + JkWorkersFile /etc/rhn/satellite-httpd/conf/workers.properties + JkLogLevel info + JkLogFile /var/log/httpd/mod_jk.log + JkMount /rhn/* ajp13 + JkMount /rhn ajp13 + JkMount /*.do ajp13 + JkMount /*.jsp ajp13 + JkHTTPSIndicator HTTPS + + diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spac= ewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf index 981b291..3e49b75 100644 --- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf +++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf @@ -61,9 +61,6 @@ LoadModule version_module modules/mod_version.so LoadModule proxy_ajp_module modules/mod_proxy_ajp.so - -LoadModule jk_module modules/mod_jk.so - = # Turn rewrite engine on so we can use it for # kickstart requests. @@ -76,17 +73,6 @@ RewriteRule ^/rhn(.*) ajp://localhost:8009/rhn$1 [P] RewriteRule ^(/.*\.(do|jsp)(\?.*)?)$ ajp://localhost:8009/$1 [P] = - - JkWorkersFile /etc/rhn/satellite-httpd/conf/workers.properties - JkLogLevel info - JkLogFile /var/log/httpd/mod_jk.log - JkMount /rhn/* ajp13 - JkMount /rhn ajp13 - JkMount /*.do ajp13 - JkMount /*.jsp ajp13 - JkHTTPSIndicator HTTPS - - RedirectMatch ^/renew/.* http://rhn.redhat.com RedirectMatch ^/index\.html$ /rhn/Login.do = diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spac= ewalk-config.spec index d8f136f..cb69c66 100644 --- a/spacewalk/config/spacewalk-config.spec +++ b/spacewalk/config/spacewalk-config.spec @@ -58,6 +58,7 @@ rm -rf $RPM_BUILD_ROOT %attr(0755,root,root) %{_sysconfdir}/rhn/satellite-httpd/conf/startup.pl %config(noreplace) %{_sysconfdir}/rhn/satellite-httpd/conf/rhn/rhn_monitor= ing.conf %config(noreplace) %{_sysconfdir}/httpd/conf.d/zz-spacewalk-www.conf +%config(noreplace) %{_sysconfdir}/httpd/conf.d/00-spacewalk-mod_jk.conf %config(noreplace) %{_sysconfdir}/rhn/satellite-httpd/conf/workers.propert= ies %config(noreplace) %{_sysconfdir}/webapp-keyring.gpg %config(noreplace) %{_var}/lib/cobbler/kickstarts/spacewalk-sample.ks diff --git a/spacewalk/setup/share/ssl.conf.6 b/spacewalk/setup/share/ssl.c= onf.6 new file mode 100644 index 0000000..76cd3e4 --- /dev/null +++ b/spacewalk/setup/share/ssl.conf.6 @@ -0,0 +1,4 @@ +[ \t]*\s*\n\s*JkMountCopy.*\n\s*\s*\n + + JkMountCopy On + diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewa= lk-setup.spec index f75a493..b5abd01 100644 --- a/spacewalk/setup/spacewalk-setup.spec +++ b/spacewalk/setup/spacewalk-setup.spec @@ -61,6 +61,7 @@ install -m 0644 share/ssl.conf.2 %{buildroot}/%{_datadir}= /spacewalk/setup/ install -m 0644 share/ssl.conf.3 %{buildroot}/%{_datadir}/spacewalk/setup/ install -m 0644 share/ssl.conf.4 %{buildroot}/%{_datadir}/spacewalk/setup/ install -m 0644 share/ssl.conf.5 %{buildroot}/%{_datadir}/spacewalk/setup/ +install -m 0644 share/ssl.conf.6 %{buildroot}/%{_datadir}/spacewalk/setup/ install -m 0644 share/old-jvm-list %{buildroot}/%{_datadir}/spacewalk/setu= p/ install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/defaults.d/ install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/upgrade --===============3341845314282238782==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:17 2015 Content-Type: multipart/mixed; boundary="===============2957111374802198440==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - backend/satellite_tools selinux/oracle-selinux Date: Tue, 02 Jun 2009 15:42:40 +0000 Message-ID: <20090602154240.9D8E1120154@lists.fedorahosted.org> --===============2957111374802198440== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/satellite_tools/rhn-db-stats | 5 +++-- selinux/oracle-selinux/oracle.te | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 722449b286675e1f169079f6febe1e0071ddf6e0 Author: Milan Zazrivec Date: Tue Jun 2 17:19:56 2009 +0200 allow sqlplus to read shell input redirects = allow shell constructs: sqlplus $connect << EOS ... EOS diff --git a/selinux/oracle-selinux/oracle.te b/selinux/oracle-selinux/orac= le.te index 00148a4..f0c35de 100644 --- a/selinux/oracle-selinux/oracle.te +++ b/selinux/oracle-selinux/oracle.te @@ -166,6 +166,9 @@ allow oracle_db_t oracle_tnslsnr_t:fd use; allow oracle_db_t oracle_tnslsnr_t:fifo_file { rw_file_perms }; allow oracle_db_t oracle_tnslsnr_t:tcp_socket { rw_socket_perms }; = +# Allow sqlplus to read shell redirects +allow oracle_sqlplus_t tmp_t:file { read ioctl getattr }; + # sqlplus can run sql scripts oracle_script(oracle_sqlplus_t) = commit a855f9159258f5664e83a50fad6fa189f2b1e022 Author: Milan Zazrivec Date: Tue Jun 2 16:14:33 2009 +0200 allow rhn-db-stats to write to arbitrary location with running selinux diff --git a/backend/satellite_tools/rhn-db-stats b/backend/satellite_tools= /rhn-db-stats index 61fdfab..da6165b 100755 --- a/backend/satellite_tools/rhn-db-stats +++ b/backend/satellite_tools/rhn-db-stats @@ -8,8 +8,9 @@ fi CONNECT=3D$(awk '/default_db/ {split($0,a,"=3D"); print a[2]}' /etc/rhn/rh= n.conf) [ -n "$2" ] && CONNECT=3D$2 = -sqlplus $CONNECT >& /dev/null << EOS -spool $1 +# sqlplus ... | cat > ... is here to fool selinux, since oracle_sqlplus_t +# cannot write just anywhere +sqlplus $CONNECT << EOS | cat > $1 set echo on set serverout on set pagesize 2000 linesize 145 --===============2957111374802198440==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:17 2015 Content-Type: multipart/mixed; boundary="===============7246834096959391410==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 2 commits - backend/satellite_tools selinux/oracle-selinux Date: Tue, 02 Jun 2009 15:43:25 +0000 Message-ID: <20090602154325.C4CE0120154@lists.fedorahosted.org> --===============7246834096959391410== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/satellite_tools/rhn-db-stats | 5 +++-- selinux/oracle-selinux/oracle.te | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 6c3453ae93c066a2100f5d5379b8a047d13ed648 Author: Milan Zazrivec Date: Tue Jun 2 17:19:56 2009 +0200 allow sqlplus to read shell input redirects = allow shell constructs: sqlplus $connect << EOS ... EOS diff --git a/selinux/oracle-selinux/oracle.te b/selinux/oracle-selinux/orac= le.te index 00148a4..f0c35de 100644 --- a/selinux/oracle-selinux/oracle.te +++ b/selinux/oracle-selinux/oracle.te @@ -166,6 +166,9 @@ allow oracle_db_t oracle_tnslsnr_t:fd use; allow oracle_db_t oracle_tnslsnr_t:fifo_file { rw_file_perms }; allow oracle_db_t oracle_tnslsnr_t:tcp_socket { rw_socket_perms }; = +# Allow sqlplus to read shell redirects +allow oracle_sqlplus_t tmp_t:file { read ioctl getattr }; + # sqlplus can run sql scripts oracle_script(oracle_sqlplus_t) = commit 9d1fb8cd12312fe261c64807d2d2ffc81d376ac8 Author: Milan Zazrivec Date: Tue Jun 2 16:14:33 2009 +0200 allow rhn-db-stats to write to arbitrary location with running selinux diff --git a/backend/satellite_tools/rhn-db-stats b/backend/satellite_tools= /rhn-db-stats index 61fdfab..da6165b 100755 --- a/backend/satellite_tools/rhn-db-stats +++ b/backend/satellite_tools/rhn-db-stats @@ -8,8 +8,9 @@ fi CONNECT=3D$(awk '/default_db/ {split($0,a,"=3D"); print a[2]}' /etc/rhn/rh= n.conf) [ -n "$2" ] && CONNECT=3D$2 = -sqlplus $CONNECT >& /dev/null << EOS -spool $1 +# sqlplus ... | cat > ... is here to fool selinux, since oracle_sqlplus_t +# cannot write just anywhere +sqlplus $CONNECT << EOS | cat > $1 set echo on set serverout on set pagesize 2000 linesize 145 --===============7246834096959391410==-- From shughes at fedoraproject.org Thu Aug 20 11:57:17 2015 Content-Type: multipart/mixed; boundary="===============7758620088373458247==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - web/html Date: Tue, 02 Jun 2009 15:44:16 +0000 Message-ID: <20090602154416.AD528120154@lists.fedorahosted.org> --===============7758620088373458247== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable web/html/errors/error.html | 134 ++++++++++++++++++++++++++++++++++++++++= +++++ 1 file changed, 134 insertions(+) New commits: commit 8c0582404a0c8a75419016ffa9ace89a6589a120 Author: Shannon Hughes Date: Tue Jun 2 11:33:42 2009 -0400 500709 - static html for non session error pages diff --git a/web/html/errors/error.html b/web/html/errors/error.html new file mode 100644 index 0000000..265323c --- /dev/null +++ b/web/html/errors/error.html @@ -0,0 +1,134 @@ + +<= head> + + Error + + + + + + + +
+ + + + + + +
+
+

Shortcuts: Knowledgebase | Documentation<= /p> +

+
+  +
+ +
+ +
+ +
+
+
+ + + +
+
+
+
+ +
+
+ + + +
+
+ + + + + + + + +
+ +
+
+ + + + + + +
+ +
+ + +
+
+ +
+ + + + + +
+
+
+ + + + + +
+ + +
    +
    + +
    + + +

    Page Error

    +

    Error requesting page. Some possible causes of this problem:

    + +
      +
    1. Page no longer exists
    2. +
    3. Page permission issue
    4. +
    5. You are doing something naughty
    6. +
    + +

    Cookie support required. Note: cookies are not used + for marketing purposes; we use them strictly to keep track + of your login state and other state data absolutely + necessary for the proper functioning of your account.

    + +
    + +
    + Copyright =C2=A9 2002-08 Red Hat, Inc. All rights reserved. Privacy statement= : Legal state= ment : redhat.com +
    + +
    +
    + + --===============7758620088373458247==-- From shughes at fedoraproject.org Thu Aug 20 11:57:17 2015 Content-Type: multipart/mixed; boundary="===============0921637699878998514==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: web/html Date: Tue, 02 Jun 2009 15:45:09 +0000 Message-ID: <20090602154509.42E8C120154@lists.fedorahosted.org> --===============0921637699878998514== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable web/html/errors/error.html | 134 ++++++++++++++++++++++++++++++++++++++++= +++++ 1 file changed, 134 insertions(+) New commits: commit 57e516e99ec40ba4662b195757348f5de1aad018 Author: Shannon Hughes Date: Tue Jun 2 11:33:42 2009 -0400 500709 - static html for non session error pages diff --git a/web/html/errors/error.html b/web/html/errors/error.html new file mode 100644 index 0000000..265323c --- /dev/null +++ b/web/html/errors/error.html @@ -0,0 +1,134 @@ + +<= head> + + Error + + + + + + + +
    + + + + + + +
    +
    +

    Shortcuts: Knowledgebase | Documentation<= /p> +

    +
    +  +
    + +
    + +
    + +
    +
    +
    + + + +
    +
    +
    +
    + +
    +
    + + + +
    +
    + + + + + + + + +
    + +
    +
    + + + + + + +
    + +
    + + +
    +
    + +
    + + + + + +
    +
    +
    + + + + + +
    + + +
      +
      + +
      + + +

      Page Error

      +

      Error requesting page. Some possible causes of this problem:

      + +
        +
      1. Page no longer exists
      2. +
      3. Page permission issue
      4. +
      5. You are doing something naughty
      6. +
      + +

      Cookie support required. Note: cookies are not used + for marketing purposes; we use them strictly to keep track + of your login state and other state data absolutely + necessary for the proper functioning of your account.

      + +
      + +
      + Copyright =C2=A9 2002-08 Red Hat, Inc. All rights reserved. Privacy statement= : Legal state= ment : redhat.com +
      + +
      +
      + + --===============0921637699878998514==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:17 2015 Content-Type: multipart/mixed; boundary="===============5463149157189459875==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: selinux/spacewalk-monitoring-selinux Date: Tue, 02 Jun 2009 16:11:47 +0000 Message-ID: <20090602161147.25BBC120154@lists.fedorahosted.org> --===============5463149157189459875== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.fc | 1 + 1 file changed, 1 insertion(+) New commits: commit 6f686d2b9d273df52ba010948e12956a7e3f75fb Author: Milan Zazrivec Date: Tue Jun 2 18:09:20 2009 +0200 spacewalk_monitoring_conf_t for /etc/NOCpulse.ini = /etc/NOCpulse.ini would get etc_t after filesystem relabel without a permanent labeling rule. diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.fc b= /selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.fc index e4ad3d1..81cfab9 100644 --- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.fc +++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.fc @@ -11,6 +11,7 @@ /var/run/SysVStep\..* gen_context(system_u:object_r:spacewalk_monitoring_v= ar_run_t,s0) = /etc/notification(/.*)? gen_context(system_u:object_r:spacewalk_monitoring= _conf_t,s0) +/etc/NOCpulse\.ini gen_context(system_u:object_r:spacewalk_monitoring_conf= _t,s0) = /var/lib/nocpulse(/.*)? gen_context(system_u:object_r:spacewalk_monitoring= _var_lib_t,s0) /var/lib/notification(/.*)? gen_context(system_u:object_r:spacewalk_monito= ring_var_lib_t,s0) --===============5463149157189459875==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:17 2015 Content-Type: multipart/mixed; boundary="===============0663368028239532135==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - selinux/spacewalk-monitoring-selinux Date: Tue, 02 Jun 2009 16:12:23 +0000 Message-ID: <20090602161223.034CE120154@lists.fedorahosted.org> --===============0663368028239532135== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.fc | 1 + 1 file changed, 1 insertion(+) New commits: commit 8958e335989206ece036eced9c98c4e33899fde6 Author: Milan Zazrivec Date: Tue Jun 2 18:09:20 2009 +0200 spacewalk_monitoring_conf_t for /etc/NOCpulse.ini = /etc/NOCpulse.ini would get etc_t after filesystem relabel without a permanent labeling rule. diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.fc b= /selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.fc index e4ad3d1..81cfab9 100644 --- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.fc +++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.fc @@ -11,6 +11,7 @@ /var/run/SysVStep\..* gen_context(system_u:object_r:spacewalk_monitoring_v= ar_run_t,s0) = /etc/notification(/.*)? gen_context(system_u:object_r:spacewalk_monitoring= _conf_t,s0) +/etc/NOCpulse\.ini gen_context(system_u:object_r:spacewalk_monitoring_conf= _t,s0) = /var/lib/nocpulse(/.*)? gen_context(system_u:object_r:spacewalk_monitoring= _var_lib_t,s0) /var/lib/notification(/.*)? gen_context(system_u:object_r:spacewalk_monito= ring_var_lib_t,s0) --===============0663368028239532135==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:17 2015 Content-Type: multipart/mixed; boundary="===============6828519315039913788==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: java/buildconf java/code web/conf Date: Tue, 02 Jun 2009 16:31:14 +0000 Message-ID: <20090602163114.7CD3F120154@lists.fedorahosted.org> --===============6828519315039913788== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/buildconf/apidoc/html/macros.txt |= 5 = java/buildconf/apidoc/jsp/macros.txt |= 5 = java/buildconf/apidoc/singlepage/macros.txt |= 5 = java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml |= 10 = java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml |= 61 ++ java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java |= 239 +++++++++- java/code/src/com/redhat/rhn/manager/action/ActionManager.java |= 65 ++ web/conf/rhn_web.conf |= 2 = 8 files changed, 384 insertions(+), 8 deletions(-) New commits: commit 6d4d83165ec00d7ca8b7c57b5698687687d06090 Author: Brad Buckingham Date: Tue Jun 2 12:30:16 2009 -0400 501224 - api - enhance system.listSystemEvents to include more detail o= n events executed = Currently, when a user looks at the event history in the UI, they see more information than they can currently obtain with the API. = For example, - for a package action (e.g. install/remove/upgrade/verify) - user can see the pkgs that were involved in the event - for an errata update - user can see the advisory name & synopsis - for a config file deploy/upload - user can see the file name and possibly revision info - for a config file compare/diff - user can see the files compared and the differences found = The above information is not returned in the API; therefore, enhancing = the system.listSystemEvents to include an optional 'additional_info' array that will include this information when it is available. = One thing to note is that these details are stored in different tables depending on the action that was executed. As a result, we have to perform different queries depending on the action type; therefore, rath= er than use a basic serializer, the api handler itself will gather the res= ults and populate the data to be returned. diff --git a/java/buildconf/apidoc/html/macros.txt b/java/buildconf/apidoc/= html/macros.txt index 87c3b8b..f7a70d2 100644 --- a/java/buildconf/apidoc/html/macros.txt +++ b/java/buildconf/apidoc/html/macros.txt @@ -22,6 +22,11 @@
      • #end +#macro(prop_array_begin_desc $key $desc) +
      • array "$key" - $desc +
          +
        • +#end #macro(prop_array_end)
        diff --git a/java/buildconf/apidoc/jsp/macros.txt b/java/buildconf/apidoc/j= sp/macros.txt index 87c3b8b..f7a70d2 100644 --- a/java/buildconf/apidoc/jsp/macros.txt +++ b/java/buildconf/apidoc/jsp/macros.txt @@ -22,6 +22,11 @@
        • #end +#macro(prop_array_begin_desc $key $desc) +
        • array "$key" - $desc +
            +
          • +#end #macro(prop_array_end)
          diff --git a/java/buildconf/apidoc/singlepage/macros.txt b/java/buildconf/a= pidoc/singlepage/macros.txt index 87c3b8b..f7a70d2 100644 --- a/java/buildconf/apidoc/singlepage/macros.txt +++ b/java/buildconf/apidoc/singlepage/macros.txt @@ -22,6 +22,11 @@
          • #end +#macro(prop_array_begin_desc $key $desc) +
          • array "$key" - $desc +
              +
            • +#end #macro(prop_array_end)
            diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_q= ueries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_q= ueries.xml index 6f8915f..78a3e84 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.= xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.= xml @@ -1175,6 +1175,14 @@ SELECT 1 = - + + +SELECT E.id, E.advisory, E.synopsis + FROM rhnErrata E, + rhnActionErrataUpdate AEU + WHERE E.id =3D AEU.errata_id + AND AEU.action_id =3D :aid + + = diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_q= ueries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_q= ueries.xml index 6ea33fb..256a68c 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.= xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.= xml @@ -2152,6 +2152,67 @@ SELECT CC.id, CR.revision AS config_revision, = + + +SELECT CFN.path, + CFF.name AS FAILURE_REASON + FROM rhnConfigFileFailure CFF, + rhnConfigFileName CFN, + rhnActionConfigFileName ACFN + WHERE ACFN.action_id =3D :aid + AND ACFN.config_file_name_id =3D CFN.id + AND ACFN.failure_id =3D CFF.id (+) +ORDER BY CFN.path + + + + + +SELECT CFN.path, + CR.id, + CR.revision, + ACR.id AS ACTION_REVISION_ID, + CFF.name AS FAILURE_REASON + FROM rhnConfigFileFailure CFF, + rhnConfigFileName CFN, + rhnConfigFile CF, + rhnConfigRevision CR, + rhnActionConfigRevision ACR + WHERE ACR.action_id =3D :aid + AND ACR.config_revision_id =3D CR.id + AND CR.config_file_id =3D CF.id + AND CF.config_file_name_id =3D CFN.id + AND ACR.failure_id =3D CFF.id (+) +ORDER BY UPPER(CFN.path) + + + + + +SELECT CFN.path, + CR.id, + CR.id AS REVISION_ID, + CR.revision, + ACR.id AS ACTION_REVISION_ID, + CFF.name AS FAILURE_REASON, + ACRR.result AS DIFF, + rhn_config_channel.action_diff_revision_status(ACR.id) AS STATUS + FROM rhnConfigFileFailure CFF, + rhnConfigFileName CFN, + rhnConfigFile CF, + rhnConfigRevision CR, + rhnActionConfigRevision ACR, + rhnActionConfigRevisionResult ACRR + WHERE ACR.action_id =3D :aid + AND ACR.config_revision_id =3D CR.id + AND CR.config_file_id =3D CF.id + AND CF.config_file_name_id =3D CFN.id + AND ACRR.action_config_revision_id =3D ACR.id + AND ACR.failure_id =3D CFF.id (+) +ORDER BY UPPER(CFN.path) + + + {:channelId =3D call rhn_config.insert_channel( :org_id_in, :type_in= , :name_in, :label_in, :description_in)} diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHand= ler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandle= r.java index aa5a3ab..ed29fd5 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java @@ -16,6 +16,7 @@ package com.redhat.rhn.frontend.xmlrpc.system; = import java.net.URI; import java.net.URISyntaxException; +import java.sql.Blob; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -35,6 +36,7 @@ import com.redhat.rhn.FaultException; import com.redhat.rhn.common.client.ClientCertificate; import com.redhat.rhn.common.conf.Config; import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.common.hibernate.LookupException; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.validator.ValidatorError; @@ -1645,26 +1647,251 @@ public class SystemHandler extends BaseHandler { * @param sessionKey The sessionKey containing the logged in user * @param sid The id of the server you are wanting to lookup = * @return Returns an array of maps representing a system - * @since 10.3 + * @since 10.8 * = - * @xmlrpc.doc List all system events for given server. This is *all* = events for the = - * server since it was registered. This may require the caller to + * @xmlrpc.doc List all system events for given server. This includes = *all* events + * for the server since it was registered. This may require the calle= r to * filter the results to fetch the specific events they are looking fo= r. * * @xmlrpc.param #param("string", "sessionKey") * @xmlrpc.param #param("int", "serverId") - ID of system. * @xmlrpc.returntype = * #array() - * $ServerActionSerializer + * #struct("action") + * #prop_desc("int", "failed_count", "Number of times action = failed.") + * #prop_desc("string", "modified", "Date modified. (Deprecat= ed by + * modified_date)") + * #prop_desc($date, "modified_date", "Date modified.") + * #prop_desc("string", "created", "Date created. (Deprecated= by + * created_date)") + * #prop_desc($date, "created_date", "Date created.") + * #prop("string", "action_type") + * #prop_desc("int", "successful_count", + * "Number of times action was successful.") + * #prop_desc("string", "earliest_action", "Earliest date thi= s action + * will occur.") + * #prop_desc("int", "archived", "If this action is archived.= (1 or 0)") + * #prop("string", "scheduler_user") + * #prop_desc("string", "prerequisite", "Pre-requisite action= . (optional)") + * #prop_desc("string", "name", "Name of this action.") + * #prop_desc("int", "id", "Id of this action.") + * #prop_desc("string", "version", "Version of action.") + * #prop_desc("string", "completion_time", "The date/time the= event was + * completed. Format ->YYYY-MM-dd hh:mm:ss.ms + * Eg ->2007-06-04 13:58:13.0. (optional) + * (Deprecated by completed_date)") + * #prop_desc($date, "completed_date", "The date/time the eve= nt was completed. + * (optional)") + * #prop_desc("string", "pickup_time", "The date/time the act= ion was picked + * up. Format ->YYYY-MM-dd hh:mm:ss.ms + * Eg ->2007-06-04 13:58:13.0. (optional) + * (Deprecated by pickup_date)") + * #prop_desc($date, "pickup_date", "The date/time the action= was picked up. + * (optional)") + * #prop_desc("string", "result_msg", "The result string afte= r the action + * executes at the client machine. (optional)") + * #prop_array_begin_desc("additional_info", "This array cont= ains additional + * information for the event, if available.") + * #struct("info") + * #prop_desc("string", "detail", "The detail provide= d depends on the + * specific event. For example, for a package event,= this will be the + * package name, for an errata event, this will be th= e advisory name + * and synopsis, for a config file event, this will b= e path and + * optional revision information...etc.") + * #prop_desc("string", "result", "The result (if inc= luded) depends + * on the specific event. For example, for a package= or errata event, + * no result is included, for a config file event, th= e result might + * include an error (if one occurred, such as the fil= e was missing) + * or in the case of a config file comparison it migh= t include the + * differenes found.") + * #struct_end() + * #prop_array_end() + * #struct_end() * #array_end() */ - public List listSystemEvents(String sessionKey, Integer = sid) { + public List listSystemEvents(String sessionKey, Integer sid) { + List retval =3D new LinkedList(); // Get the logged in user and server User loggedInUser =3D getLoggedInUser(sessionKey); Server server =3D lookupServer(loggedInUser, sid); = - return ActionFactory.listServerActionsForServer(server); + List sActions =3D ActionFactory.listServerActionsFor= Server(server); + + // In order to support bug 501224, this method is being updated to= populate + // the result vs having the serializer do so. The reason is that = in order to + // support this bug, we want to be able to return some additional = detail for the + // various events in the system history; however, those details ar= e stored in + // different database tables depending upon the event type. This = includes + // information like, the specific errata applied, pkgs installed/r= emoved/ + // upgraded/verified, config files uploaded, deployed or compared.= ..etc. + + List results =3D new ArrayList(); + for (ServerAction sAction : sActions) { + + Map result =3D new HashMap(); + + Action action =3D sAction.getParentAction(); + + if (action.getFailedCount() !=3D null) { + result.put("failed_count", action.getFailedCount()); + } + if (action.getActionType().getName() !=3D null) { + result.put("action_type", action.getActionType().getName()= ); + } + if (action.getSuccessfulCount() !=3D null) { + result.put("successful_count", action.getSuccessfulCount()= ); + } + if (action.getEarliestAction() !=3D null) { + result.put("earliest_action", action.getEarliestAction().t= oString()); + } + if (action.getArchived() !=3D null) { + result.put("archived", action.getArchived()); + } + if (action.getSchedulerUser().getLogin() !=3D null) { + result.put("scheduler_user", action.getSchedulerUser().get= Login()); + } + if (action.getPrerequisite() !=3D null) { + result.put("prerequisite", action.getPrerequisite()); + } + if (action.getName() !=3D null) { + result.put("name", action.getName()); + } + if (action.getId() !=3D null) { + result.put("id", action.getId()); + } + if (action.getVersion() !=3D null) { + result.put("version", action.getVersion().toString()); + } + + if (sAction.getCompletionTime() !=3D null) { + result.put("completion_time", sAction.getCompletionTime().= toString()); + } + if (sAction.getPickupTime() !=3D null) { + result.put("pickup_time", sAction.getPickupTime().toString= ()); + } + if (sAction.getModified() !=3D null) { + result.put("modified", sAction.getModified().toString()); + result.put("modified_date", sAction.getModified()); + } + if (sAction.getCreated() !=3D null) { + result.put("created", sAction.getCreated().toString()); + result.put("created_date", sAction.getCreated()); + } + if (sAction.getCompletionTime() !=3D null) { + result.put("completed_date", sAction.getCompletionTime()); + } + if (sAction.getPickupTime() !=3D null) { + result.put("pickup_date", sAction.getPickupTime()); + } + if (sAction.getResultMsg() !=3D null) { + result.put("result_msg", sAction.getResultMsg()); + } + + // depending on the event type, we need to retrieve additional= information + // and store that information in the result + ActionType type =3D action.getActionType(); + List> additionalInfo =3D new ArrayList>(); + + if (type.equals(ActionFactory.TYPE_PACKAGES_REMOVE) || + type.equals(ActionFactory.TYPE_PACKAGES_UPDATE) || + type.equals(ActionFactory.TYPE_PACKAGES_VERIFY)) { + + // retrieve the list of package names associated with the = action... + + DataResult pkgs =3D ActionManager.getPackageList(action.ge= tId(), null); + for (Iterator itr =3D pkgs.iterator(); itr.hasNext();) { + Map pkg =3D (Map) itr.next(); + String detail =3D (String) pkg.get("nvre"); + + Map info =3D new HashMap(); + info.put("detail", detail); + additionalInfo.add(info); + } + } + else if (type.equals(ActionFactory.TYPE_ERRATA)) { + + // retrieve the errata that were associated with the actio= n... + DataResult errata =3D ActionManager.getErrataList(action.g= etId()); + for (Iterator itr =3D errata.iterator(); itr.hasNext();) { + Map erratum =3D (Map) itr.next(); + String detail =3D (String) erratum.get("advisory"); + detail +=3D " (" + (String) erratum.get("synopsis") + = ")"; + + Map info =3D new HashMap(); + info.put("detail", detail); + additionalInfo.add(info); + } + } + else if (type.equals(ActionFactory.TYPE_CONFIGFILES_UPLOAD) || + type.equals(ActionFactory.TYPE_CONFIGFILES_MTIME_UPLO= AD)) { + + // retrieve the details associated with the action... + DataResult files =3D ActionManager.getConfigFileUploadList= (action.getId()); + for (Iterator itr =3D files.iterator(); itr.hasNext();) { + Map file =3D (Map) itr.next(); + + Map info =3D new HashMap(); + info.put("detail", (String) file.get("path")); + String error =3D (String) file.get("failure_reason"); + if (error !=3D null) { + info.put("result", error); + } + additionalInfo.add(info); + } + } + else if (type.equals(ActionFactory.TYPE_CONFIGFILES_DEPLOY)) { + + // retrieve the details associated with the action... + DataResult files =3D ActionManager.getConfigFileDeployList= (action.getId()); + for (Iterator itr =3D files.iterator(); itr.hasNext();) { + Map file =3D (Map) itr.next(); + + Map info =3D new HashMap(); + String path =3D (String) file.get("path"); + path +=3D " (rev. " + (Long) file.get("revision") + ")= "; + info.put("detail", path); + String error =3D (String) file.get("failure_reason"); + if (error !=3D null) { + info.put("result", error); + } + additionalInfo.add(info); + } + } + else if (type.equals(ActionFactory.TYPE_CONFIGFILES_DIFF)) { + + // retrieve the details associated with the action... + DataResult files =3D ActionManager.getConfigFileDiffList(a= ction.getId()); + for (Iterator itr =3D files.iterator(); itr.hasNext();) { + Map file =3D (Map) itr.next(); + + Map info =3D new HashMap(); + String path =3D (String) file.get("path"); + path +=3D " (rev. " + (Long) file.get("revision") + ")= "; + info.put("detail", path); + + String error =3D (String) file.get("failure_reason"); + if (error !=3D null) { + info.put("result", error); + } + else { + // if there wasn't an error, check to see if there= was a difference + // detected... + Blob blob =3D (Blob) file.get("diff"); + if (blob !=3D null) { + String diff =3D HibernateFactory.blobToString(= blob); + info.put("result", diff); + } + } + additionalInfo.add(info); + } + } + if (additionalInfo.size() > 0) { + result.put("additional_info", additionalInfo); + } + results.add(result); + } + return results; } = /** diff --git a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java= b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java index 612c3b4..c8c3de5 100644 --- a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java +++ b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java @@ -763,6 +763,71 @@ public class ActionManager extends BaseManager { dr.setTotalSize(dr.size()); return dr; } + + /** + * Returns the list of errata associated with a specific action. + * @param aid The action id for the action in question + * @return Return a list containing the errata for the action. + */ + public static DataResult getErrataList(Long aid) { + SelectMode m =3D ModeFactory.getMode("Errata_queries", + "errata_associated_with_action"); + + Map params =3D new HashMap(); + params.put("aid", aid); + + DataResult dr =3D m.execute(params); + dr.setTotalSize(dr.size()); + return dr; + } + + /** + * Returns the list of details associated with a config file upload ac= tion. + * @param aid The action id for the action in question + * @return Return a list containing the errata for the action. + */ + public static DataResult getConfigFileUploadList(Long aid) { + SelectMode m =3D ModeFactory.getMode("config_queries", "upload_act= ion_status"); + + Map params =3D new HashMap(); + params.put("aid", aid); + + DataResult dr =3D m.execute(params); + dr.setTotalSize(dr.size()); + return dr; + } + + /** + * Returns the list of details associated with a config file deploy ac= tion. + * @param aid The action id for the action in question + * @return Return a list containing the details for the action. + */ + public static DataResult getConfigFileDeployList(Long aid) { + SelectMode m =3D ModeFactory.getMode("config_queries", "config_act= ion_revisions"); + + Map params =3D new HashMap(); + params.put("aid", aid); + + DataResult dr =3D m.execute(params); + dr.setTotalSize(dr.size()); + return dr; + } + + /** + * Returns the list of details associated with a config file diff acti= on. + * @param aid The action id for the action in question + * @return Return a list containing the details for the action. + */ + public static DataResult getConfigFileDiffList(Long aid) { + SelectMode m =3D ModeFactory.getMode("config_queries", "diff_actio= n_revisions"); + + Map params =3D new HashMap(); + params.put("aid", aid); + + DataResult dr =3D m.execute(params); + dr.setTotalSize(dr.size()); + return dr; + } = /** * Retrieves the systems that have completed a given action diff --git a/web/conf/rhn_web.conf b/web/conf/rhn_web.conf index c6d86de..a9a640d 100644 --- a/web/conf/rhn_web.conf +++ b/web/conf/rhn_web.conf @@ -228,7 +228,7 @@ web.config_delim_end =3D |} web.version =3D 0.5 = # the version of API -web.apiversion =3D 10.7 +web.apiversion =3D 10.8 = # maximum size for a config file web.maximum_config_file_size =3D 131072 --===============6828519315039913788==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:18 2015 Content-Type: multipart/mixed; boundary="===============8455147341290595609==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/buildconf java/code web/conf Date: Tue, 02 Jun 2009 16:41:23 +0000 Message-ID: <20090602164123.1E33D120154@lists.fedorahosted.org> --===============8455147341290595609== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/buildconf/apidoc/html/macros.txt |= 5 = java/buildconf/apidoc/jsp/macros.txt |= 5 = java/buildconf/apidoc/singlepage/macros.txt |= 79 +++ java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml |= 10 = java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml |= 61 ++ java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java |= 239 +++++++++- java/code/src/com/redhat/rhn/manager/action/ActionManager.java |= 65 ++ web/conf/rhn_web.conf |= 2 = 8 files changed, 458 insertions(+), 8 deletions(-) New commits: commit 4bbcadff178a8ee783be7c6be15a9a7e090c5888 Author: Brad Buckingham Date: Tue Jun 2 12:30:16 2009 -0400 501224 - api - enhance system.listSystemEvents to include more detail o= n events executed = Currently, when a user looks at the event history in the UI, they see more information than they can currently obtain with the API. = For example, - for a package action (e.g. install/remove/upgrade/verify) - user can see the pkgs that were involved in the event - for an errata update - user can see the advisory name & synopsis - for a config file deploy/upload - user can see the file name and possibly revision info - for a config file compare/diff - user can see the files compared and the differences found = The above information is not returned in the API; therefore, enhancing = the system.listSystemEvents to include an optional 'additional_info' array that will include this information when it is available. = One thing to note is that these details are stored in different tables depending on the action that was executed. As a result, we have to perform different queries depending on the action type; therefore, rath= er than use a basic serializer, the api handler itself will gather the res= ults and populate the data to be returned. diff --git a/java/buildconf/apidoc/html/macros.txt b/java/buildconf/apidoc/= html/macros.txt index 87c3b8b..f7a70d2 100644 --- a/java/buildconf/apidoc/html/macros.txt +++ b/java/buildconf/apidoc/html/macros.txt @@ -22,6 +22,11 @@
            • #end +#macro(prop_array_begin_desc $key $desc) +
            • array "$key" - $desc +
                +
              • +#end #macro(prop_array_end)
              diff --git a/java/buildconf/apidoc/jsp/macros.txt b/java/buildconf/apidoc/j= sp/macros.txt index 87c3b8b..f7a70d2 100644 --- a/java/buildconf/apidoc/jsp/macros.txt +++ b/java/buildconf/apidoc/jsp/macros.txt @@ -22,6 +22,11 @@
              • #end +#macro(prop_array_begin_desc $key $desc) +
              • array "$key" - $desc +
                  +
                • +#end #macro(prop_array_end)
                diff --git a/java/buildconf/apidoc/singlepage/macros.txt b/java/buildconf/a= pidoc/singlepage/macros.txt new file mode 100644 index 0000000..f7a70d2 --- /dev/null +++ b/java/buildconf/apidoc/singlepage/macros.txt @@ -0,0 +1,79 @@ + +#set($date=3D"dateTime.iso8601") + +#macro( serializer $serializer ) +
              • $serializer
              • +#end +#macro( prop $type $value ) +
              • $type "$value"
              • +#end +#macro( prop_desc $type $value $desc ) +
              • $type "$value" - $desc
              • +#end +#macro(prop_array $key $type $desc) +
              • array "$key" +
                  +
                • $type $desc
                • +
                +
              • +#end +#macro(prop_array_begin $key) +
              • array "$key" +
                  +
                • +#end +#macro(prop_array_begin_desc $key $desc) +
                • array "$key" - $desc +
                    +
                  • +#end +#macro(prop_array_end) +
                  • +
                  +
                • +#end +#macro( struct $type ) = + struct - $type +
                    +#end +#macro( struct_end ) +
                  +#end +#macro( array) +array: +
                    +
                  • +#end +#macro(array_end) +
                  +#end +#macro(array_single $type $desc) +array: +
                    +
                  • $type - $desc
                  • +
                  +#end +#macro(options) +
                    +#end +#macro(item $item) +
                  • $item
                  • +#end +#macro(item_desc $item, $desc) +
                  • $item - $desc
                  • +#end +#macro(options_end) +
                  +#end +#macro(param $type $value) + $type $value +#end +#macro(param_desc $type $value $desc) + $type $value - $desc +#end +#macro(session_key) + #param("string", "sessionKey") +#end +#macro(return_int_success) + int - 1 on success, exception thrown otherwise. +#end diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_q= ueries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_q= ueries.xml index 6f8915f..78a3e84 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.= xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.= xml @@ -1175,6 +1175,14 @@ SELECT 1 = - + + +SELECT E.id, E.advisory, E.synopsis + FROM rhnErrata E, + rhnActionErrataUpdate AEU + WHERE E.id =3D AEU.errata_id + AND AEU.action_id =3D :aid + + = diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_q= ueries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_q= ueries.xml index 6ea33fb..256a68c 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.= xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.= xml @@ -2152,6 +2152,67 @@ SELECT CC.id, CR.revision AS config_revision, = + + +SELECT CFN.path, + CFF.name AS FAILURE_REASON + FROM rhnConfigFileFailure CFF, + rhnConfigFileName CFN, + rhnActionConfigFileName ACFN + WHERE ACFN.action_id =3D :aid + AND ACFN.config_file_name_id =3D CFN.id + AND ACFN.failure_id =3D CFF.id (+) +ORDER BY CFN.path + + + + + +SELECT CFN.path, + CR.id, + CR.revision, + ACR.id AS ACTION_REVISION_ID, + CFF.name AS FAILURE_REASON + FROM rhnConfigFileFailure CFF, + rhnConfigFileName CFN, + rhnConfigFile CF, + rhnConfigRevision CR, + rhnActionConfigRevision ACR + WHERE ACR.action_id =3D :aid + AND ACR.config_revision_id =3D CR.id + AND CR.config_file_id =3D CF.id + AND CF.config_file_name_id =3D CFN.id + AND ACR.failure_id =3D CFF.id (+) +ORDER BY UPPER(CFN.path) + + + + + +SELECT CFN.path, + CR.id, + CR.id AS REVISION_ID, + CR.revision, + ACR.id AS ACTION_REVISION_ID, + CFF.name AS FAILURE_REASON, + ACRR.result AS DIFF, + rhn_config_channel.action_diff_revision_status(ACR.id) AS STATUS + FROM rhnConfigFileFailure CFF, + rhnConfigFileName CFN, + rhnConfigFile CF, + rhnConfigRevision CR, + rhnActionConfigRevision ACR, + rhnActionConfigRevisionResult ACRR + WHERE ACR.action_id =3D :aid + AND ACR.config_revision_id =3D CR.id + AND CR.config_file_id =3D CF.id + AND CF.config_file_name_id =3D CFN.id + AND ACRR.action_config_revision_id =3D ACR.id + AND ACR.failure_id =3D CFF.id (+) +ORDER BY UPPER(CFN.path) + + + {:channelId =3D call rhn_config.insert_channel( :org_id_in, :type_in= , :name_in, :label_in, :description_in)} diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHand= ler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandle= r.java index aa5a3ab..ed29fd5 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java @@ -16,6 +16,7 @@ package com.redhat.rhn.frontend.xmlrpc.system; = import java.net.URI; import java.net.URISyntaxException; +import java.sql.Blob; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -35,6 +36,7 @@ import com.redhat.rhn.FaultException; import com.redhat.rhn.common.client.ClientCertificate; import com.redhat.rhn.common.conf.Config; import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.common.hibernate.LookupException; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.validator.ValidatorError; @@ -1645,26 +1647,251 @@ public class SystemHandler extends BaseHandler { * @param sessionKey The sessionKey containing the logged in user * @param sid The id of the server you are wanting to lookup = * @return Returns an array of maps representing a system - * @since 10.3 + * @since 10.8 * = - * @xmlrpc.doc List all system events for given server. This is *all* = events for the = - * server since it was registered. This may require the caller to + * @xmlrpc.doc List all system events for given server. This includes = *all* events + * for the server since it was registered. This may require the calle= r to * filter the results to fetch the specific events they are looking fo= r. * * @xmlrpc.param #param("string", "sessionKey") * @xmlrpc.param #param("int", "serverId") - ID of system. * @xmlrpc.returntype = * #array() - * $ServerActionSerializer + * #struct("action") + * #prop_desc("int", "failed_count", "Number of times action = failed.") + * #prop_desc("string", "modified", "Date modified. (Deprecat= ed by + * modified_date)") + * #prop_desc($date, "modified_date", "Date modified.") + * #prop_desc("string", "created", "Date created. (Deprecated= by + * created_date)") + * #prop_desc($date, "created_date", "Date created.") + * #prop("string", "action_type") + * #prop_desc("int", "successful_count", + * "Number of times action was successful.") + * #prop_desc("string", "earliest_action", "Earliest date thi= s action + * will occur.") + * #prop_desc("int", "archived", "If this action is archived.= (1 or 0)") + * #prop("string", "scheduler_user") + * #prop_desc("string", "prerequisite", "Pre-requisite action= . (optional)") + * #prop_desc("string", "name", "Name of this action.") + * #prop_desc("int", "id", "Id of this action.") + * #prop_desc("string", "version", "Version of action.") + * #prop_desc("string", "completion_time", "The date/time the= event was + * completed. Format ->YYYY-MM-dd hh:mm:ss.ms + * Eg ->2007-06-04 13:58:13.0. (optional) + * (Deprecated by completed_date)") + * #prop_desc($date, "completed_date", "The date/time the eve= nt was completed. + * (optional)") + * #prop_desc("string", "pickup_time", "The date/time the act= ion was picked + * up. Format ->YYYY-MM-dd hh:mm:ss.ms + * Eg ->2007-06-04 13:58:13.0. (optional) + * (Deprecated by pickup_date)") + * #prop_desc($date, "pickup_date", "The date/time the action= was picked up. + * (optional)") + * #prop_desc("string", "result_msg", "The result string afte= r the action + * executes at the client machine. (optional)") + * #prop_array_begin_desc("additional_info", "This array cont= ains additional + * information for the event, if available.") + * #struct("info") + * #prop_desc("string", "detail", "The detail provide= d depends on the + * specific event. For example, for a package event,= this will be the + * package name, for an errata event, this will be th= e advisory name + * and synopsis, for a config file event, this will b= e path and + * optional revision information...etc.") + * #prop_desc("string", "result", "The result (if inc= luded) depends + * on the specific event. For example, for a package= or errata event, + * no result is included, for a config file event, th= e result might + * include an error (if one occurred, such as the fil= e was missing) + * or in the case of a config file comparison it migh= t include the + * differenes found.") + * #struct_end() + * #prop_array_end() + * #struct_end() * #array_end() */ - public List listSystemEvents(String sessionKey, Integer = sid) { + public List listSystemEvents(String sessionKey, Integer sid) { + List retval =3D new LinkedList(); // Get the logged in user and server User loggedInUser =3D getLoggedInUser(sessionKey); Server server =3D lookupServer(loggedInUser, sid); = - return ActionFactory.listServerActionsForServer(server); + List sActions =3D ActionFactory.listServerActionsFor= Server(server); + + // In order to support bug 501224, this method is being updated to= populate + // the result vs having the serializer do so. The reason is that = in order to + // support this bug, we want to be able to return some additional = detail for the + // various events in the system history; however, those details ar= e stored in + // different database tables depending upon the event type. This = includes + // information like, the specific errata applied, pkgs installed/r= emoved/ + // upgraded/verified, config files uploaded, deployed or compared.= ..etc. + + List results =3D new ArrayList(); + for (ServerAction sAction : sActions) { + + Map result =3D new HashMap(); + + Action action =3D sAction.getParentAction(); + + if (action.getFailedCount() !=3D null) { + result.put("failed_count", action.getFailedCount()); + } + if (action.getActionType().getName() !=3D null) { + result.put("action_type", action.getActionType().getName()= ); + } + if (action.getSuccessfulCount() !=3D null) { + result.put("successful_count", action.getSuccessfulCount()= ); + } + if (action.getEarliestAction() !=3D null) { + result.put("earliest_action", action.getEarliestAction().t= oString()); + } + if (action.getArchived() !=3D null) { + result.put("archived", action.getArchived()); + } + if (action.getSchedulerUser().getLogin() !=3D null) { + result.put("scheduler_user", action.getSchedulerUser().get= Login()); + } + if (action.getPrerequisite() !=3D null) { + result.put("prerequisite", action.getPrerequisite()); + } + if (action.getName() !=3D null) { + result.put("name", action.getName()); + } + if (action.getId() !=3D null) { + result.put("id", action.getId()); + } + if (action.getVersion() !=3D null) { + result.put("version", action.getVersion().toString()); + } + + if (sAction.getCompletionTime() !=3D null) { + result.put("completion_time", sAction.getCompletionTime().= toString()); + } + if (sAction.getPickupTime() !=3D null) { + result.put("pickup_time", sAction.getPickupTime().toString= ()); + } + if (sAction.getModified() !=3D null) { + result.put("modified", sAction.getModified().toString()); + result.put("modified_date", sAction.getModified()); + } + if (sAction.getCreated() !=3D null) { + result.put("created", sAction.getCreated().toString()); + result.put("created_date", sAction.getCreated()); + } + if (sAction.getCompletionTime() !=3D null) { + result.put("completed_date", sAction.getCompletionTime()); + } + if (sAction.getPickupTime() !=3D null) { + result.put("pickup_date", sAction.getPickupTime()); + } + if (sAction.getResultMsg() !=3D null) { + result.put("result_msg", sAction.getResultMsg()); + } + + // depending on the event type, we need to retrieve additional= information + // and store that information in the result + ActionType type =3D action.getActionType(); + List> additionalInfo =3D new ArrayList>(); + + if (type.equals(ActionFactory.TYPE_PACKAGES_REMOVE) || + type.equals(ActionFactory.TYPE_PACKAGES_UPDATE) || + type.equals(ActionFactory.TYPE_PACKAGES_VERIFY)) { + + // retrieve the list of package names associated with the = action... + + DataResult pkgs =3D ActionManager.getPackageList(action.ge= tId(), null); + for (Iterator itr =3D pkgs.iterator(); itr.hasNext();) { + Map pkg =3D (Map) itr.next(); + String detail =3D (String) pkg.get("nvre"); + + Map info =3D new HashMap(); + info.put("detail", detail); + additionalInfo.add(info); + } + } + else if (type.equals(ActionFactory.TYPE_ERRATA)) { + + // retrieve the errata that were associated with the actio= n... + DataResult errata =3D ActionManager.getErrataList(action.g= etId()); + for (Iterator itr =3D errata.iterator(); itr.hasNext();) { + Map erratum =3D (Map) itr.next(); + String detail =3D (String) erratum.get("advisory"); + detail +=3D " (" + (String) erratum.get("synopsis") + = ")"; + + Map info =3D new HashMap(); + info.put("detail", detail); + additionalInfo.add(info); + } + } + else if (type.equals(ActionFactory.TYPE_CONFIGFILES_UPLOAD) || + type.equals(ActionFactory.TYPE_CONFIGFILES_MTIME_UPLO= AD)) { + + // retrieve the details associated with the action... + DataResult files =3D ActionManager.getConfigFileUploadList= (action.getId()); + for (Iterator itr =3D files.iterator(); itr.hasNext();) { + Map file =3D (Map) itr.next(); + + Map info =3D new HashMap(); + info.put("detail", (String) file.get("path")); + String error =3D (String) file.get("failure_reason"); + if (error !=3D null) { + info.put("result", error); + } + additionalInfo.add(info); + } + } + else if (type.equals(ActionFactory.TYPE_CONFIGFILES_DEPLOY)) { + + // retrieve the details associated with the action... + DataResult files =3D ActionManager.getConfigFileDeployList= (action.getId()); + for (Iterator itr =3D files.iterator(); itr.hasNext();) { + Map file =3D (Map) itr.next(); + + Map info =3D new HashMap(); + String path =3D (String) file.get("path"); + path +=3D " (rev. " + (Long) file.get("revision") + ")= "; + info.put("detail", path); + String error =3D (String) file.get("failure_reason"); + if (error !=3D null) { + info.put("result", error); + } + additionalInfo.add(info); + } + } + else if (type.equals(ActionFactory.TYPE_CONFIGFILES_DIFF)) { + + // retrieve the details associated with the action... + DataResult files =3D ActionManager.getConfigFileDiffList(a= ction.getId()); + for (Iterator itr =3D files.iterator(); itr.hasNext();) { + Map file =3D (Map) itr.next(); + + Map info =3D new HashMap(); + String path =3D (String) file.get("path"); + path +=3D " (rev. " + (Long) file.get("revision") + ")= "; + info.put("detail", path); + + String error =3D (String) file.get("failure_reason"); + if (error !=3D null) { + info.put("result", error); + } + else { + // if there wasn't an error, check to see if there= was a difference + // detected... + Blob blob =3D (Blob) file.get("diff"); + if (blob !=3D null) { + String diff =3D HibernateFactory.blobToString(= blob); + info.put("result", diff); + } + } + additionalInfo.add(info); + } + } + if (additionalInfo.size() > 0) { + result.put("additional_info", additionalInfo); + } + results.add(result); + } + return results; } = /** diff --git a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java= b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java index 612c3b4..c8c3de5 100644 --- a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java +++ b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java @@ -763,6 +763,71 @@ public class ActionManager extends BaseManager { dr.setTotalSize(dr.size()); return dr; } + + /** + * Returns the list of errata associated with a specific action. + * @param aid The action id for the action in question + * @return Return a list containing the errata for the action. + */ + public static DataResult getErrataList(Long aid) { + SelectMode m =3D ModeFactory.getMode("Errata_queries", + "errata_associated_with_action"); + + Map params =3D new HashMap(); + params.put("aid", aid); + + DataResult dr =3D m.execute(params); + dr.setTotalSize(dr.size()); + return dr; + } + + /** + * Returns the list of details associated with a config file upload ac= tion. + * @param aid The action id for the action in question + * @return Return a list containing the errata for the action. + */ + public static DataResult getConfigFileUploadList(Long aid) { + SelectMode m =3D ModeFactory.getMode("config_queries", "upload_act= ion_status"); + + Map params =3D new HashMap(); + params.put("aid", aid); + + DataResult dr =3D m.execute(params); + dr.setTotalSize(dr.size()); + return dr; + } + + /** + * Returns the list of details associated with a config file deploy ac= tion. + * @param aid The action id for the action in question + * @return Return a list containing the details for the action. + */ + public static DataResult getConfigFileDeployList(Long aid) { + SelectMode m =3D ModeFactory.getMode("config_queries", "config_act= ion_revisions"); + + Map params =3D new HashMap(); + params.put("aid", aid); + + DataResult dr =3D m.execute(params); + dr.setTotalSize(dr.size()); + return dr; + } + + /** + * Returns the list of details associated with a config file diff acti= on. + * @param aid The action id for the action in question + * @return Return a list containing the details for the action. + */ + public static DataResult getConfigFileDiffList(Long aid) { + SelectMode m =3D ModeFactory.getMode("config_queries", "diff_actio= n_revisions"); + + Map params =3D new HashMap(); + params.put("aid", aid); + + DataResult dr =3D m.execute(params); + dr.setTotalSize(dr.size()); + return dr; + } = /** * Retrieves the systems that have completed a given action diff --git a/web/conf/rhn_web.conf b/web/conf/rhn_web.conf index c6d86de..a9a640d 100644 --- a/web/conf/rhn_web.conf +++ b/web/conf/rhn_web.conf @@ -228,7 +228,7 @@ web.config_delim_end =3D |} web.version =3D 0.5 = # the version of API -web.apiversion =3D 10.7 +web.apiversion =3D 10.8 = # maximum size for a config file web.maximum_config_file_size =3D 131072 --===============8455147341290595609==-- From partha at fedoraproject.org Thu Aug 20 11:57:18 2015 Content-Type: multipart/mixed; boundary="===============1750629563862398636==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Tue, 02 Jun 2009 16:57:30 +0000 Message-ID: <20090602165730.8795D120154@lists.fedorahosted.org> --===============1750629563862398636== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java | 6= +++++- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 6d69ff325f616d3ce832575681eaed08b9f1fab1 Author: Partha Aji Date: Tue Jun 2 12:58:50 2009 -0400 502646 - Fixed list tag filter issue hitting the enter key in IE diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil= .java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java index 1f3fbce..46c83d5 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java @@ -46,6 +46,9 @@ import com.redhat.rhn.frontend.struts.RequestContext; * @version $Rev $ */ public class ListTagUtil { + private static final String IE_MAGIC_SNIPPET =3D ""; + = private ListTagUtil() { = } @@ -628,7 +631,8 @@ public class ListTagUtil { ListTagUtil.write(pageContext, filterValue); } ListTagUtil.write(pageContext, "\" />"); - + = + ListTagUtil.write(pageContext, IE_MAGIC_SNIPPET); ListTagUtil.write(pageContext, "    To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Tue, 02 Jun 2009 16:58:04 +0000 Message-ID: <20090602165804.0ED18120154@lists.fedorahosted.org> --===============1109942349526413525== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java | 6= +++++- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 1e0d5f0d8b326aff7030001c23a05ac4e9233595 Author: Partha Aji Date: Tue Jun 2 12:58:50 2009 -0400 502646 - Fixed list tag filter issue hitting the enter key in IE diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil= .java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java index 1f3fbce..46c83d5 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java @@ -46,6 +46,9 @@ import com.redhat.rhn.frontend.struts.RequestContext; * @version $Rev $ */ public class ListTagUtil { + private static final String IE_MAGIC_SNIPPET =3D ""; + = private ListTagUtil() { = } @@ -628,7 +631,8 @@ public class ListTagUtil { ListTagUtil.write(pageContext, filterValue); } ListTagUtil.write(pageContext, "\" />"); - + = + ListTagUtil.write(pageContext, IE_MAGIC_SNIPPET); ListTagUtil.write(pageContext, "    To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - satellite/install Date: Tue, 02 Jun 2009 18:40:52 +0000 Message-ID: <20090602184052.C0475120154@lists.fedorahosted.org> --===============5384139286163764738== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable satellite/install/install.pl | 11 +++++++++++ 1 file changed, 11 insertions(+) New commits: commit 449a348a7b1fc42055d894ff1fa1fe2f74408b56 Author: Devan Goodwin Date: Tue Jun 2 15:39:39 2009 -0300 502958 - Use up2date in installer if on RHEL 4 that has yum installed. diff --git a/satellite/install/install.pl b/satellite/install/install.pl index 1c88b4c..f91f7dc 100755 --- a/satellite/install/install.pl +++ b/satellite/install/install.pl @@ -73,6 +73,17 @@ Spacewalk::Setup::upgrade_stop_services(\%opts); remove_obsoleted_packages(\%opts); = my $have_yum =3D ( -f '/usr/bin/yum' ? 1 : 0 ); +if ($have_yum) { + # If we have yum available but are on RHEL 4, stick with up2date: + # NOTE: Even if the system has no redhat-release (i.e. Fedora) this re= gex + # will simply not match. + my $redhat_release =3D `rpm -q --qf=3D'%{VERSION}' redhat-release`; + if ($redhat_release =3D~ /^4.*/) { + $have_yum =3D 0; + print loc("Warning: Found yum on RHEL 4, using up2date instead.\n"= ); + } +} + = my $run_updater; if (defined $opts{'run-updater'}) { --===============5384139286163764738==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:18 2015 Content-Type: multipart/mixed; boundary="===============1235106419905475918==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: satellite/install Date: Tue, 02 Jun 2009 18:41:45 +0000 Message-ID: <20090602184145.57F33120154@lists.fedorahosted.org> --===============1235106419905475918== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable satellite/install/install.pl | 11 +++++++++++ 1 file changed, 11 insertions(+) New commits: commit 0530358fae431007a25697ec6210478033414502 Author: Devan Goodwin Date: Tue Jun 2 15:39:39 2009 -0300 502958 - Use up2date in installer if on RHEL 4 that has yum installed. diff --git a/satellite/install/install.pl b/satellite/install/install.pl index 1c88b4c..f91f7dc 100755 --- a/satellite/install/install.pl +++ b/satellite/install/install.pl @@ -73,6 +73,17 @@ Spacewalk::Setup::upgrade_stop_services(\%opts); remove_obsoleted_packages(\%opts); = my $have_yum =3D ( -f '/usr/bin/yum' ? 1 : 0 ); +if ($have_yum) { + # If we have yum available but are on RHEL 4, stick with up2date: + # NOTE: Even if the system has no redhat-release (i.e. Fedora) this re= gex + # will simply not match. + my $redhat_release =3D `rpm -q --qf=3D'%{VERSION}' redhat-release`; + if ($redhat_release =3D~ /^4.*/) { + $have_yum =3D 0; + print loc("Warning: Found yum on RHEL 4, using up2date instead.\n"= ); + } +} + = my $run_updater; if (defined $opts{'run-updater'}) { --===============1235106419905475918==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:18 2015 Content-Type: multipart/mixed; boundary="===============3746517666880642983==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: 3 commits - java/code scripts/channel-to-update-level web/html web/modules Date: Tue, 02 Jun 2009 18:43:27 +0000 Message-ID: <20090602184327.7DBF8120154@lists.fedorahosted.org> --===============3746517666880642983== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml = | 53 +++ java/code/src/com/redhat/rhn/domain/channel/Channel.java = | 17 + java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java = | 58 +-- java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java = | 10 = java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncErrataActi= on.java | 97 ++++++ java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncErrataPack= agesAction.java | 148 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml= | 25 + java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml= | 8 = java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/ListSetHelper.ja= va | 33 ++ java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java = | 37 -- java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java = | 91 ++++++ java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java = | 62 ++++ java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java = | 16 + java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java = | 7 = java/code/webapp/WEB-INF/nav/manage_channel.xml = | 4 = java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp = | 80 +++++ java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp = | 110 +++++++ java/code/webapp/WEB-INF/struts-config.xml = | 21 + scripts/channel-to-update-level/create-channel-update = | 4 = web/html/nav/manage_channel.xml = | 4 = web/modules/pxt/PXT/Request.pm = | 4 = 21 files changed, 820 insertions(+), 69 deletions(-) New commits: commit 120c37f03e2fde78cb07e4f532b9eaffb9179ce2 Author: Justin Sherrill Date: Tue Jun 2 14:35:58 2009 -0400 435043 - adding errata sync page for syncing out of date errata (that h= ave been updated by red hat) diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_q= ueries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_q= ueries.xml index 78a3e84..6ad0a82 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.= xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.= xml @@ -1185,4 +1185,57 @@ SELECT E.id, E.advisory, E.synopsis = + + + + + select distinct E.id, E.advisory_name, E.advisory, E.advisory_type, E.syn= opsis as advisory_synopsis, E.update_date + from rhnChannelErrata CE inner join + rhnErrataPackage EP on CE.errata_id =3D EP.errata_id inner join + rhnErrataCloned EC on EC.original_id =3D CE.errata_id inner join + rhnChannelErrata CE2 on CE2.errata_id =3D EC.id inner join + rhnErrata E on E.id =3D EC.id + where CE.channel_id =3D :ocid --original + and CE2.channel_id =3D :cid --clone + and Ep.package_id in (select CP.package_id + from rhnChannelPackage CP + where + CP.channel_id =3D :ocid --original + and CP.package_id not in (select CP2.package_id + from rhnChannelPackage CP2 + where CP2.channel_id =3D :cid)) --clone + + + + + + select P.id id, PN.name || '-' || PE.version + || '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':= ' || PE.epoch END) + || '-' || PA.label nvrea, + P.summary + from rhnPackage P inner join + rhnPackageArch PA on P.package_arch_id =3D PA.id inner join + rhnPackageEVR PE on P.evr_id =3D PE.id inner join + rhnPackageName PN on PN.id =3D P.name_id inner join + rhnErrataPackage EP on EP.package_id =3D P.id inner join + rhnErrataCloned EC on EC.original_id =3D EP.errata_id inner join + rhnChannelPackage CP on CP.package_id =3D P.id + where CP.channel_id =3D :ocid + and EC.id in ( select element + from rhnSet S + where S.label =3D :set_label) + and P.id not in ( select CP2.package_id + from rhnChannelPackage CP2 + where CP2.channel_id =3D :cid) + + + + + + select CE.errata_id as id + from rhnChannelErrata CE + where CE.channel_id =3D :cid + + + diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.java b/jav= a/code/src/com/redhat/rhn/domain/channel/Channel.java index 07ab885..cef2312 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/Channel.java +++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.java @@ -387,6 +387,7 @@ public class Channel extends BaseDomainHelper implement= s Comparable { /** * Adds a single package to the channel * @param packageIn The package to add + * @deprecated */ public void addPackage(Package packageIn) { if (!getChannelArch().isCompatible(packageIn.getPackageArch())) { @@ -397,6 +398,22 @@ public class Channel extends BaseDomainHelper implemen= ts Comparable { } = /** + * Adds a single package to the channel + * @param packageIn The package to add + * @param user the user doign the add + */ + public void addPackage(Package packageIn, User user) { + if (!getChannelArch().isCompatible(packageIn.getPackageArch())) { + throw new IncompatibleArchException(packageIn.getPackageArch(), + getChannelArch()); + } + List list =3D new ArrayList(); + list.add(packageIn.getId()); + ChannelManager.addPackages(this, list, user); + } + + + /** * Removes a single package from the channel * @param user the user doing the remove * @param packageIn The package to remove diff --git a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java = b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java index 0d6733a..d87966a 100644 --- a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java +++ b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java @@ -204,7 +204,7 @@ public class ErrataFactory extends HibernateFactory { published =3D ErrataFactory.createPublishedErrata(); } = - copyDetails(published, unpublished); + copyDetails(published, unpublished, false); = //Save the published Errata save(published); @@ -353,7 +353,7 @@ public class ErrataFactory extends HibernateFactory { = UnpublishedClonedErrata clone =3D new UnpublishedClonedErrata(); = - copyDetails(clone, e); + copyDetails(clone, e, true); = clone.setAdvisoryName(clonedAdvisoryName); clone.setAdvisory(clonedAdvisory); @@ -368,11 +368,19 @@ public class ErrataFactory extends HibernateFactory { * Helper method to copy the details for. * @param copy The object to copy into. * @param original The object to copy from. + * @param clone set to true if this is a cloned errata, and thus + * things like org or advisory name shouldn't be set */ - private static void copyDetails(Errata copy, Errata original) { + private static void copyDetails(Errata copy, Errata original, boolean = clone) { = //Set the easy things first ;) - copy.setAdvisory(original.getAdvisory()); + + if (!clone) { + copy.setAdvisory(original.getAdvisory()); + copy.setAdvisoryName(original.getAdvisoryName()); + copy.setOrg(original.getOrg()); + } + copy.setAdvisoryType(original.getAdvisoryType()); copy.setProduct(original.getProduct()); copy.setDescription(original.getDescription()); @@ -383,11 +391,10 @@ public class ErrataFactory extends HibernateFactory { copy.setUpdateDate(original.getUpdateDate()); copy.setNotes(original.getNotes()); copy.setRefersTo(original.getRefersTo()); - copy.setAdvisoryName(original.getAdvisoryName()); copy.setAdvisoryRel(original.getAdvisoryRel()); copy.setLocallyModified(original.getLocallyModified()); copy.setLastModified(original.getLastModified()); - copy.setOrg(original.getOrg()); + = /* = * Copy the packages @@ -415,39 +422,16 @@ public class ErrataFactory extends HibernateFactory { Iterator bugsItr =3D IteratorUtils.getIterator(original.getBugs()); while (bugsItr.hasNext()) { Bug bugIn =3D (Bug) bugsItr.next(); - Bug clone; + Bug cloneB; if (copy.isPublished()) { //we want published bugs - clone =3D ErrataManager.createNewPublishedBug(bugIn.getId(= ), = + cloneB =3D ErrataManager.createNewPublishedBug(bugIn.getId= (), bugIn.getSumma= ry()); } else { //we want unpublished bugs - clone =3D ErrataManager.createNewUnpublishedBug(bugIn.getI= d(), + cloneB =3D ErrataManager.createNewUnpublishedBug(bugIn.get= Id(), bugIn.getSum= mary()); } - copy.addBug(clone); - } - = - /* - * Copy the files using the same idea as the above bug copying - */ - Iterator filesItr =3D IteratorUtils.getIterator(original.getFiles(= )); - while (filesItr.hasNext()) { - ErrataFile fileIn =3D (ErrataFile) filesItr.next(); - ErrataFile clone; - Set packages =3D new HashSet(fileIn.getPackages()); - if (copy.isPublished()) { - clone =3D ErrataManager.createNewPublishedErrataFile(fileI= n.getFileType(), - fileIn.= getChecksum(), - fileIn.= getFileName(), - package= s); - } - else { - clone =3D ErrataManager.createNewUnpublishedErrataFile(fil= eIn.getFileType(), - fileI= n.getChecksum(), - fileI= n.getFileName(), - packa= ges); - } - copy.addFile(clone); + copy.addBug(cloneB); } } = @@ -1048,7 +1032,13 @@ public class ErrataFactory extends HibernateFactory { } = = - + /** + * Sync all the errata details from one errata to another + * @param cloned the cloned errata that needs syncing + */ + public static void syncErrataDetails(PublishedClonedErrata cloned) { + copyDetails(cloned, cloned.getOriginal(), true); + } = } = diff --git a/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryT= est.java b/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTes= t.java index 13e2fda..42988a6 100644 --- a/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java +++ b/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java @@ -270,7 +270,9 @@ public class ErrataFactoryTest extends BaseTestCaseWith= User { = private static void fillOutErrata(Errata e, Long orgId) throws Excepti= on { String name =3D "JAVA Test " + TestUtils.randomString(); - e.setOrg(OrgFactory.lookupById(orgId)); + if (orgId !=3D null) { + e.setOrg(OrgFactory.lookupById(orgId)); + } e.setAdvisory(name); e.setAdvisoryType(ErrataFactory.ERRATA_TYPE_BUG); e.setProduct("Red Hat Linux"); @@ -334,11 +336,7 @@ public class ErrataFactoryTest extends BaseTestCaseWit= hUser { assertEquals(published.getLocallyModified(), clone.getLocallyModifi= ed()); assertEquals(clonedAdvisoryName, clone.getAdvisoryName()); assertEquals(clonedAdvisory, clone.getAdvisory()); - = - assertEquals(1, clone.getFiles().size()); - ErrataFile ef =3D (ErrataFile)clone.getFiles().iterator().next(); - assertEquals(1, ef.getPackages().size()); - = + /* Create a 2nd clone and make sure that the cloning function * does not create a clone whose name collides with the already * existing clone diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/Sy= ncErrataAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/= manage/SyncErrataAction.java new file mode 100644 index 0000000..88410bd --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncErrat= aAction.java @@ -0,0 +1,97 @@ +/** + * Copyright (c) 2009 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.channel.manage; + +import com.redhat.rhn.domain.channel.Channel; +import com.redhat.rhn.domain.channel.InvalidChannelRoleException; +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.taglibs.list.helper.ListRhnSetHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.Listable; +import com.redhat.rhn.manager.channel.ChannelManager; +import com.redhat.rhn.manager.rhnset.RhnSetDecl; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * SyncErrataAction + * @version $Rev$ + */ +public class SyncErrataAction extends RhnAction implements Listable { + + /** + * + * {@inheritDoc} + */ + public ActionForward execute(ActionMapping mapping, + ActionForm formIn, + HttpServletRequest request, + HttpServletResponse response) { + + RequestContext rc =3D new RequestContext(request); + User user =3D rc.getLoggedInUser(); + + Channel chan =3D ChannelManager.lookupByIdAndUser( + rc.getRequiredParam(RequestContext.CID), user); + + try { + ChannelManager.verifyChannelAdmin(user, chan.getId()); + } + catch (InvalidChannelRoleException e) { + addMessage(request, e.getMessage()); + return mapping.findForward("default"); + } + + ListRhnSetHelper helper =3D new ListRhnSetHelper(this, request, + RhnSetDecl.ERRATA_TO_SYNC.createCustom(chan.getId())); + + helper.execute(); + if (helper.isDispatched()) { + Map params =3D new HashMap(); + params.put(RequestContext.CID, chan.getId()); + return getStrutsDelegate().forwardParams(mapping.findForward("= submit"), + params); + } + + request.setAttribute("channel_name", chan.getName()); + request.setAttribute(RequestContext.CID, chan.getId()); + return mapping.findForward("default"); + } + + + /** + * + * {@inheritDoc} + */ + public List getResult(RequestContext context) { + User user =3D context.getLoggedInUser(); + Channel chan =3D ChannelManager.lookupByIdAndUser( + context.getRequiredParam(RequestContext.CID), user); + + return ChannelManager.listErrataNeedingResync(chan, user); + } + + +} diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/Sy= ncErrataPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/action/= channel/manage/SyncErrataPackagesAction.java new file mode 100644 index 0000000..88b4234 --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncErrat= aPackagesAction.java @@ -0,0 +1,148 @@ +/** + * Copyright (c) 2009 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.channel.manage; + +import com.redhat.rhn.domain.channel.Channel; +import com.redhat.rhn.domain.channel.InvalidChannelRoleException; +import com.redhat.rhn.domain.errata.Errata; +import com.redhat.rhn.domain.errata.ErrataFactory; +import com.redhat.rhn.domain.errata.impl.PublishedClonedErrata; +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.taglibs.list.helper.ListRhnSetHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.Listable; +import com.redhat.rhn.manager.channel.ChannelEditor; +import com.redhat.rhn.manager.channel.ChannelManager; +import com.redhat.rhn.manager.errata.ErrataManager; +import com.redhat.rhn.manager.rhnset.RhnSetDecl; + +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.ActionMessage; +import org.apache.struts.action.ActionMessages; + +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * SyncErrataAction + * @version $Rev$ + */ +public class SyncErrataPackagesAction extends RhnAction implements Listabl= e { + + + private Logger log =3D Logger.getLogger(SyncErrataPackagesAction.class= ); + + /** + * + * {@inheritDoc} + */ + public ActionForward execute(ActionMapping mapping, + ActionForm formIn, + HttpServletRequest request, + HttpServletResponse response) { + + RequestContext rc =3D new RequestContext(request); + User user =3D rc.getLoggedInUser(); + + Channel chan =3D ChannelManager.lookupByIdAndUser( + rc.getRequiredParam(RequestContext.CID), user); + + try { + ChannelManager.verifyChannelAdmin(user, chan.getId()); + } + catch (InvalidChannelRoleException e) { + addMessage(request, e.getMessage()); + return mapping.findForward("default"); + } + + RhnSetDecl pkgDecl =3D RhnSetDecl.ERRATA_PACKAGES_TO_SYNC.createCu= stom(chan.getId()); + + ListRhnSetHelper helper =3D new ListRhnSetHelper(this, request, + pkgDecl); + + helper.setPreSelectAll(true); + helper.execute(); + + if (helper.isDispatched()) { + + Set eSet =3D RhnSetDecl.ERRATA_TO_SYNC.createCustom( + chan.getId()).get(user).getElementValues(); + Set pSet =3D pkgDecl.get(user).getElementValues(); + syncErrata(eSet, pSet, chan, user); + + + ActionMessages msg =3D new ActionMessages(); + String[] msgParams =3D {eSet.size() + "", pSet.size() + "", ch= an.getName()}; + msg.add(ActionMessages.GLOBAL_MESSAGE, + new ActionMessage("channel.jsp.errata.sync.complete", + msgParams)); + getStrutsDelegate().saveMessages(rc.getRequest(), msg); + + + Map params =3D new HashMap(); + params.put(RequestContext.CID, chan.getId()); + return getStrutsDelegate().forwardParams(mapping.findForward("= submit"), + params); + } + + request.setAttribute("channel_name", chan.getName()); + request.setAttribute(RequestContext.CID, chan.getId()); + return mapping.findForward("default"); + } + + + /** + * + * {@inheritDoc} + */ + public List getResult(RequestContext context) { + User user =3D context.getLoggedInUser(); + Channel chan =3D ChannelManager.lookupByIdAndUser( + context.getRequiredParam(RequestContext.CID), user); + String label =3D RhnSetDecl.ERRATA_TO_SYNC.createCustom( + chan.getId()).getLabel(); + + return ChannelManager.listErrataPackagesForResync(chan, user, labe= l); + } + + + private void syncErrata(Collection eids, Collection pids, + Channel chan, User u= ser) { + + ChannelEditor.getInstance().addPackages(user, chan, pids); + for (Long eid : eids) { + Errata e =3D ErrataManager.lookupErrata(eid, user); + if (e.isPublished() && e.isCloned()) { + ErrataFactory.syncErrataDetails((PublishedClonedErrata) e); + } + else { + log.fatal("Tried to sync errata with id " + eid + + " But it was not published or was not cloned"); + } + } + + } + +} diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResour= ce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringReso= urce_en_US.xml index 2470475..a5a3751 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml @@ -21302,6 +21302,31 @@ given channel. Picked Up + + Sync Errata + + + The following errata were cloned from errata that have since bee= n updated. + This page will allow you to syncronize your cloned errata to that of = its original. + + + Packages that were omitted as part of the origianl cloning proce= ss will be included here. + + + No out of date errata were found. + + + Packages to Push + + + The following packages will be pushed to this channel as part of= the errata sync process. Please review this list and unselect any unwante= d packages. + + + Sucessfully syncronized {0} errata and pushed {1} packages to ch= annel {2}. + + + + diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResour= ce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringReso= urce_en_US.xml index 93f3b37..0722a3c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_U= S.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_U= S.xml @@ -1006,6 +1006,13 @@ http://www.oasis-open.org/committees/xliff/documents= /xliff-core-1.1.xsd" = + + Sync + + /rhn/channels/manage/errata/Syn= cErrata.do + + + Organizations @@ -1013,6 +1020,7 @@ http://www.oasis-open.org/committees/xliff/documents/= xliff-core-1.1.xsd" = + Trusts diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/List= SetHelper.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/= ListSetHelper.java index d6a8e8f..ed7d337 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/ListSetHelp= er.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/ListSetHelp= er.java @@ -15,6 +15,7 @@ = package com.redhat.rhn.frontend.taglibs.list.helper; = +import com.redhat.rhn.frontend.dto.BaseDto; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnHelper; import com.redhat.rhn.frontend.struts.Selectable; @@ -24,6 +25,7 @@ import com.redhat.rhn.frontend.taglibs.list.TagHelper; = import java.util.Collection; import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -86,6 +88,7 @@ abstract class ListSetHelper extends ListHelper { private boolean dispatched =3D false; private boolean ignoreEmptySelection =3D false; private boolean willClearSet =3D true; + private boolean preSelectAll =3D false; = private Set initSet =3D Collections.EMPTY_SET; = /** @@ -138,8 +141,8 @@ abstract class ListSetHelper extends ListHelper { if (!context.isSubmitted() && alphaBarPressed =3D=3D null && willC= learSet) { clear(); add(getPreSelected()); - } = - = + } + if (request.getParameter(RequestContext.DISPATCH) !=3D null) { // if its one of the Dispatch actions handle it.. = update(); @@ -161,6 +164,16 @@ abstract class ListSetHelper extends ListHelper { = List dataSet =3D getDataSet(); = + + if (!context.isSubmitted() && alphaBarPressed =3D=3D null && preSe= lectAll) { + Set selSet =3D new HashSet(); + for (BaseDto bdto : (List) dataSet) { + selSet.add(bdto.getId()); + } + add(selSet); + } + + // if its a list action update the set and the selections if (ListTagHelper.getListAction(getListName(), request) !=3D null)= { execute(dataSet); @@ -290,4 +303,20 @@ abstract class ListSetHelper extends ListHelper { this.willClearSet =3D willClearSetIn; } = + + /** + * @return Returns the preSelectAll. + */ + public boolean isPreSelectAll() { + return preSelectAll; + } + + + /** + * @param preSelectAllIn The preSelectAll to set. + */ + public void setPreSelectAll(boolean preSelectAllIn) { + this.preSelectAll =3D preSelectAllIn; + } + } diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.jav= a b/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java index 5b00f26..651ee8a 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java @@ -16,16 +16,15 @@ package com.redhat.rhn.manager.channel; = import com.redhat.rhn.common.db.datasource.CallableMode; import com.redhat.rhn.common.db.datasource.ModeFactory; -import com.redhat.rhn.common.hibernate.LookupException; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.security.PermissionException; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelFactory; -import com.redhat.rhn.domain.rhnpackage.Package; import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.manager.rhnpackage.PackageManager; import com.redhat.rhn.manager.user.UserManager; = +import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -57,7 +56,7 @@ public class ChannelEditor { * @param channel The channel to add the packages to * @param packageIds A list containing the ids of packages to add. */ - public void addPackages(User user, Channel channel, List packageIds) { + public void addPackages(User user, Channel channel, Collection package= Ids) { changePackages(user, channel, packageIds, true); } = @@ -67,7 +66,7 @@ public class ChannelEditor { * @param channel The channel to remove the packages from * @param packageIds A list containing the ids of packages to remove. */ - public void removePackages(User user, Channel channel, List packageIds= ) { + public void removePackages(User user, Channel channel, Collection pack= ageIds) { changePackages(user, channel, packageIds, false); } = @@ -76,7 +75,8 @@ public class ChannelEditor { * @param add If true, we are adding the list of packages to the chann= el. Otherwise, * remove the list of packages from the channel. */ - private void changePackages(User user, Channel channel, List packageId= s, boolean add) { + private void changePackages(User user, Channel channel, + Collection packageIds, boolean add) { //Make sure the person adding packages is a channel admin if (!UserManager.verifyChannelAdmin(user, channel)) { StringBuffer msg =3D new StringBuffer("User: "); @@ -112,27 +112,18 @@ public class ChannelEditor { } } = + List existingPids =3D ChannelFactory.getPackageIds(channel.g= etId()); + //Loop through packages and add to channel. = for (Iterator itr =3D packageIds.iterator(); itr.hasNext();) { Long pid =3D convertObjectToLong(itr.next()); - Package pkg =3D PackageManager.lookupByIdAndUser(pid, user); - if (pkg !=3D null) { - if (add) { - channel.addPackage(pkg); - } - else { - channel.removePackage(pkg, user); - } + List list =3D new ArrayList(); + list.add(pid); + if (add && !existingPids.contains(pid)) { + ChannelManager.addPackages(channel, list, user); } - else { - //throw a lookup exception - LocalizationService ls =3D LocalizationService.getInstance= (); - String msg =3D "The package: " + pid + " could not be foun= d."; - LookupException e =3D new LookupException(msg); - e.setLocalizedTitle(ls.getMessage("lookup.jsp.title.packag= e")); - e.setLocalizedReason1(ls.getMessage("lookup.jsp.reason1.pa= ckage")); - e.setLocalizedReason2(ls.getMessage("lookup.jsp.reason2.pa= ckage")); - throw e; + else if (!add) { + ChannelManager.removePackages(channel, list, user); } } = diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.ja= va b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java index f84a434..41433a2 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -32,6 +32,7 @@ import com.redhat.rhn.domain.channel.ChannelFactory; import com.redhat.rhn.domain.channel.ChannelFamily; import com.redhat.rhn.domain.channel.ChannelFamilyFactory; import com.redhat.rhn.domain.channel.ChannelVersion; +import com.redhat.rhn.domain.channel.ClonedChannel; import com.redhat.rhn.domain.channel.DistChannelMap; import com.redhat.rhn.domain.channel.InvalidChannelRoleException; import com.redhat.rhn.domain.channel.ProductName; @@ -2506,6 +2507,42 @@ public class ChannelManager extends BaseManager { } = /** + * Remove packages from a channel very quickly + * @param chan the channel + * @param packageIds list of package ids + * @param user the user doing the removing + */ + public static void addPackages(Channel chan, List packageIds, Us= er user) { + + if (!UserManager.verifyChannelAdmin(user, chan)) { + StringBuffer msg =3D new StringBuffer("User: "); + msg.append(user.getLogin()); + msg.append(" does not have channel admin access to channel: "); + msg.append(chan.getLabel()); + + LocalizationService ls =3D LocalizationService.getInstance(); + PermissionException pex =3D new PermissionException(msg.toStri= ng()); + pex.setLocalizedTitle(ls.getMessage("permission.jsp.title.chan= nel")); + pex.setLocalizedSummary(ls.getMessage("permission.jsp.summary.= channel")); + throw pex; + } + + Map params =3D new HashMap(); + params.put("cid", chan.getId()); + + WriteMode m =3D ModeFactory.getWriteMode("Channel_queries", "add_c= hannel_package"); + for (Long pid : packageIds) { + params.put("pid", pid); + m.executeUpdate(params); + } + + + HibernateFactory.getSession().refresh(chan); + + } + + + /** * Remove a set of erratas from a channel * and remove associated packages * @param chan The channel to remove from @@ -2553,4 +2590,58 @@ public class ChannelManager extends BaseManager { return (List) mode.execute(params); } = + /** + * List errata that is within a channel that needs to be resynced + * This is determined by the packages in the channel + * + * @param c the channel + * @param user the user + * @return list of errataOverview objects that need to be resynced + */ + public static List listErrataNeedingResync(Channel c, User user) { + if (!user.hasRole(RoleFactory.CHANNEL_ADMIN)) { + throw new PermissionException(RoleFactory.CHANNEL_ADMIN); + } + + if (c.isCloned()) { + Map params =3D new HashMap(); + params.put("cid", c.getId()); + ClonedChannel cc =3D (ClonedChannel) c; + params.put("ocid", cc.getOriginal().getId()); + SelectMode m =3D ModeFactory.getMode("Errata_queries", + "list_errata_needing_sync"); + return m.execute(params); + } + else { + return Collections.EMPTY_LIST; + } + } + + /** + * List errata packages that need to be resynced + * @param c the channel to look for packages in + * @param user the user doing it + * @param setLabel the set of errata to base the package off of + * @return the list of PackageOverview objects + */ + public static List listErrataPackagesForResync(Channel c, User user, S= tring setLabel) { + if (!user.hasRole(RoleFactory.CHANNEL_ADMIN)) { + throw new PermissionException(RoleFactory.CHANNEL_ADMIN); + } + + if (c.isCloned()) { + Map params =3D new HashMap(); + params.put("cid", c.getId()); + params.put("set_label", setLabel); + ClonedChannel cc =3D (ClonedChannel) c; + params.put("ocid", cc.getOriginal().getId()); + SelectMode m =3D ModeFactory.getMode("Errata_queries", + "list_packages_needing_sync_from_set"); + return m.execute(params); + } + else { + return Collections.EMPTY_LIST; + } + } + } diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManag= erTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelMana= gerTest.java index 4f52632..7818c97 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java +++ b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java @@ -39,6 +39,7 @@ import com.redhat.rhn.domain.server.ServerFactory; import com.redhat.rhn.domain.server.VirtualInstance; import com.redhat.rhn.domain.server.test.ServerFactoryTest; import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.action.user.AdminUserEditAction; import com.redhat.rhn.frontend.dto.ChannelOverview; import com.redhat.rhn.frontend.dto.ErrataOverview; import com.redhat.rhn.frontend.dto.EssentialChannelDto; @@ -49,6 +50,7 @@ import com.redhat.rhn.frontend.xmlrpc.NoSuchChannelExcept= ion; import com.redhat.rhn.manager.channel.ChannelEntitlementCounter; import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.entitlement.EntitlementManager; +import com.redhat.rhn.manager.errata.ErrataManager; import com.redhat.rhn.manager.rhnpackage.test.PackageManagerTest; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; @@ -747,4 +749,64 @@ public class ChannelManagerTest extends BaseTestCaseWi= thUser { = = } + + public void testListErrataNeedingResync() throws Exception { + + user.addRole(RoleFactory.CHANNEL_ADMIN); + + Channel ochan =3D ChannelFactoryTest.createTestChannel(); + Channel cchan =3D ChannelFactoryTest.createTestClonedChannel(ochan= , user); + + Errata oe =3D ErrataFactoryTest.createTestErrata(null); + ochan.addErrata(oe); + + List list =3D new ArrayList(); + list.add(cchan.getId()); + + Errata ce =3D ErrataManager.createClone(user, oe); + ce =3D ErrataManager.publish(ce, list, user); + + Package testPackage =3D PackageTest.createTestPackage(); + oe.addPackage(testPackage); + ochan.addPackage(testPackage); + + List result =3D ChannelManager.listErrataNeedingR= esync(cchan, user); + assertTrue(result.size() =3D=3D 1); + assertEquals(result.get(0).getId(), ce.getId()); + + } + + public void testListErrataPackagesForResync() throws Exception { + + user.addRole(RoleFactory.CHANNEL_ADMIN); + + Channel ochan =3D ChannelFactoryTest.createTestChannel(); + Channel cchan =3D ChannelFactoryTest.createTestClonedChannel(ochan= , user); + + Errata oe =3D ErrataFactoryTest.createTestErrata(null); + ochan.addErrata(oe); + + List list =3D new ArrayList(); + list.add(cchan.getId()); + + Errata ce =3D ErrataManager.createClone(user, oe); + ce =3D ErrataManager.publish(ce, list, user); + + Package testPackage =3D PackageTest.createTestPackage(); + oe.addPackage(testPackage); + ochan.addPackage(testPackage); + + RhnSet set =3D RhnSetDecl.ERRATA_TO_SYNC.get(user); + set.clear(); + set.add(ce.getId()); + RhnSetManager.store(set); + + List result =3D ChannelManager.listErrataPackage= sForResync(cchan, user, set.getLabel()); + assertTrue(result.size() =3D=3D 1); + + assertEquals(result.get(0).getId(), testPackage.getId()); + + } + + } diff --git a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java= b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java index 2535b63..2f757e0 100644 --- a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java +++ b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java @@ -31,6 +31,7 @@ import com.redhat.rhn.domain.errata.Errata; import com.redhat.rhn.domain.errata.ErrataFactory; import com.redhat.rhn.domain.errata.ErrataFile; import com.redhat.rhn.domain.errata.ErrataFileType; +import com.redhat.rhn.domain.errata.impl.PublishedClonedErrata; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.role.RoleFactory; @@ -1237,4 +1238,19 @@ public class ErrataManager extends BaseManager { = return flag; } + + /** + * resync an errata, including all it's details + * doesn't actually push any packages to a channel + * @param cloned the cloned errata needing resyncing + * @param user the user doign the syncing + */ + public static void reSyncErrata(PublishedClonedErrata cloned, User user= ) { + if (!user.hasRole(RoleFactory.CHANNEL_ADMIN)) { + throw new PermissionException(RoleFactory.CHANNEL_ADMIN); + } + ErrataFactory.syncErrataDetails(cloned); + } + + } diff --git a/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java b/= java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java index d1cd5fb..a151135 100644 --- a/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java +++ b/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java @@ -81,6 +81,13 @@ public class RhnSetDecl { public static final RhnSetDecl ERRATA_TO_DELETE_BULK =3D make("errata_= to_delete_bulk", SetCleanup.UNOWNED_ERRATA); = + // set of errata by errata_id; needs new cleanup + public static final RhnSetDecl ERRATA_TO_SYNC =3D make("errata_to_sync= ", + SetCleanup.UNOWNED_ERRATA); + + public static final RhnSetDecl ERRATA_PACKAGES_TO_SYNC =3D make("errat= a_packages_to_sync", + SetCleanup.UNOWNED_PACKAGES); + // set of file list: needs new cleanup public static final RhnSetDecl FILE_LISTS =3D make("file_lists", SetCleanup.UNOWNED_FILE_LIST); diff --git a/java/code/webapp/WEB-INF/nav/manage_channel.xml b/java/code/we= bapp/WEB-INF/nav/manage_channel.xml index ae6cc40..acdb4cd 100644 --- a/java/code/webapp/WEB-INF/nav/manage_channel.xml +++ b/java/code/webapp/WEB-INF/nav/manage_channel.xml @@ -29,6 +29,10 @@ /network/software/channels/manage/errata/clone.pxt?pxt:= trap=3Drhn:empty_set&set_label=3Derrata_clone_actions /network/software/channels/manage/errata/clone_confirm.= pxt + + /rhn/channels/manage/errata/SyncErrata.do + /rhn/channels/manage/errata/ConfirmSyncPackages.do + /rhn/channels/manage/ChannelPackageMenu.do diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesyn= c.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp new file mode 100644 index 0000000..6a82188 --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp @@ -0,0 +1,80 @@ +<%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> +<%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> +<%@ taglib uri=3D"http://rhn.redhat.com/tags/list" prefix=3D"rl" %> + + + + + + + + + + + + + + + + + <%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage= _channel_header.jspf" %> +
                  + +

                  + + + + + + + + + + + + + + + + + + + ${current.nvrea} + + + + + ${current.summary} + + + +
                  +
                  + " /> +
                  + + + +
                  + + + \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp b= /java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp new file mode 100644 index 0000000..089d675 --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp @@ -0,0 +1,110 @@ +<%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> +<%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> +<%@ taglib uri=3D"http://rhn.redhat.com/tags/list" prefix=3D"rl" %> + + + + + + + + + + + + + + + <%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage= _channel_header.jspf" %> +

                  + 3D"erratum" +

                  + + + + + + + + + + + + + + + + + + + + 3D"Product + + + 3D"Product + + + 3D"Bug + + + + + + + + ${current.advisoryName} + + + + + ${current.advisorySynopsis} + + + + + ${current.updateDate} + + + + + + + + +

                  + "> +

                  + + + +
                  + + + + + = \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/= WEB-INF/struts-config.xml index 31c416e..1b8023b 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -6169,6 +6169,27 @@ = + + + + + + + + + + + + + /network/software/channels/manage/errata/clone.pxt /network/software/channels/manage/errata/clone_confirm.= pxt
                  + + /rhn/channels/manage/errata/SyncErrata.do + /rhn/channels/manage/errata/ConfirmSyncPackages.do + /rhn/channels/manage/ChannelPackageMenu.do commit f3f25b5bd528e2c0bb290b2423e1dedc92f9971b Author: Justin Sherrill Date: Tue Jun 2 14:25:22 2009 -0400 small fix to channel-to-update so it doesnt ignore bundle size diff --git a/scripts/channel-to-update-level/create-channel-update b/script= s/channel-to-update-level/create-channel-update index a3a0d98..606f620 100755 --- a/scripts/channel-to-update-level/create-channel-update +++ b/scripts/channel-to-update-level/create-channel-update @@ -49,14 +49,14 @@ def main(): gather(hasOpt("C", "clear")) exit(0) = - global server, user, password, filename, ssl + global server, user, password, filename, ssl, bundleSize server =3D getOpt("s", "server", msg =3D "--server not provided") user =3D getOpt("l", "user", "--user not provided") = password =3D getOpt("p", "password") = if password =3D=3D None: password =3D getpass.getpass() if (getOpt("b", "bundle") is not None): - bundleSize =3D=3D int(getOpt("b", "bundle")) = + bundleSize =3D int(getOpt("b", "bundle")) = #did you provide a data file? If not we need all the information if not hasOpt("D", "data"): commit b89fcdb834dbe8b68967788152561a3ccf720c7f Author: Justin Sherrill Date: Fri May 29 15:45:24 2009 -0400 501784 - fixed issue with timed out logins that required cookie deletio= n to log in again = issue resolved around the fact that we are no longer setting the domain= in the java stack, but still was in the perl coupled with the fact the exp= ire time on the perl side was using the config value session_cookie_lifetim= e which was not set, resulting in a cookie that would only expire when the = browser was closed diff --git a/web/modules/pxt/PXT/Request.pm b/web/modules/pxt/PXT/Request.pm index dd66184..3855b09 100644 --- a/web/modules/pxt/PXT/Request.pm +++ b/web/modules/pxt/PXT/Request.pm @@ -456,8 +456,8 @@ sub cookie_jar { my $session_cookie =3D new Apache2::Cookie $self->{apr}, -name =3D> $self->session_cookie_name, -value =3D> $self->session->key, - #-domain =3D> PXT::Config->get("base_domain"), = - # Don't set the cookie's domain, as it will cause issues since we aren'= t setting it in the java stack = + #-domain =3D> PXT::Config->get("base_domain"), + # Don't set the cookie's domain, as it will cause issues since we aren'= t setting it in the java stack @expire, @secure, -path =3D> "/"; --===============3746517666880642983==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:18 2015 Content-Type: multipart/mixed; boundary="===============2233504342559986352==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code web/html Date: Tue, 02 Jun 2009 18:48:08 +0000 Message-ID: <20090602184808.5523C120154@lists.fedorahosted.org> --===============2233504342559986352== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml = | 53 +++ java/code/src/com/redhat/rhn/domain/channel/Channel.java = | 17 + java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java = | 58 +-- java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java = | 10 = java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncErrataActi= on.java | 97 ++++++ java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncErrataPack= agesAction.java | 148 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml= | 25 + java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml= | 8 = java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/ListSetHelper.ja= va | 33 ++ java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java = | 37 -- java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java = | 91 ++++++ java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java = | 62 ++++ java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java = | 16 + java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java = | 7 = java/code/webapp/WEB-INF/nav/manage_channel.xml = | 4 = java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp = | 80 +++++ java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp = | 110 +++++++ java/code/webapp/WEB-INF/struts-config.xml = | 21 + web/html/nav/manage_channel.xml = | 4 = 19 files changed, 816 insertions(+), 65 deletions(-) New commits: commit f7d6ead5ffe7ea99e446122c9337c6f14b4eb55e Author: Justin Sherrill Date: Tue Jun 2 14:35:58 2009 -0400 435043 - adding errata sync page for syncing out of date errata (that h= ave been updated by red hat) diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_q= ueries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_q= ueries.xml index 78a3e84..6ad0a82 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.= xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.= xml @@ -1185,4 +1185,57 @@ SELECT E.id, E.advisory, E.synopsis = + + + + + select distinct E.id, E.advisory_name, E.advisory, E.advisory_type, E.syn= opsis as advisory_synopsis, E.update_date + from rhnChannelErrata CE inner join + rhnErrataPackage EP on CE.errata_id =3D EP.errata_id inner join + rhnErrataCloned EC on EC.original_id =3D CE.errata_id inner join + rhnChannelErrata CE2 on CE2.errata_id =3D EC.id inner join + rhnErrata E on E.id =3D EC.id + where CE.channel_id =3D :ocid --original + and CE2.channel_id =3D :cid --clone + and Ep.package_id in (select CP.package_id + from rhnChannelPackage CP + where + CP.channel_id =3D :ocid --original + and CP.package_id not in (select CP2.package_id + from rhnChannelPackage CP2 + where CP2.channel_id =3D :cid)) --clone + + + + + + select P.id id, PN.name || '-' || PE.version + || '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':= ' || PE.epoch END) + || '-' || PA.label nvrea, + P.summary + from rhnPackage P inner join + rhnPackageArch PA on P.package_arch_id =3D PA.id inner join + rhnPackageEVR PE on P.evr_id =3D PE.id inner join + rhnPackageName PN on PN.id =3D P.name_id inner join + rhnErrataPackage EP on EP.package_id =3D P.id inner join + rhnErrataCloned EC on EC.original_id =3D EP.errata_id inner join + rhnChannelPackage CP on CP.package_id =3D P.id + where CP.channel_id =3D :ocid + and EC.id in ( select element + from rhnSet S + where S.label =3D :set_label) + and P.id not in ( select CP2.package_id + from rhnChannelPackage CP2 + where CP2.channel_id =3D :cid) + + + + + + select CE.errata_id as id + from rhnChannelErrata CE + where CE.channel_id =3D :cid + + + diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.java b/jav= a/code/src/com/redhat/rhn/domain/channel/Channel.java index 07ab885..cef2312 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/Channel.java +++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.java @@ -387,6 +387,7 @@ public class Channel extends BaseDomainHelper implement= s Comparable { /** * Adds a single package to the channel * @param packageIn The package to add + * @deprecated */ public void addPackage(Package packageIn) { if (!getChannelArch().isCompatible(packageIn.getPackageArch())) { @@ -397,6 +398,22 @@ public class Channel extends BaseDomainHelper implemen= ts Comparable { } = /** + * Adds a single package to the channel + * @param packageIn The package to add + * @param user the user doign the add + */ + public void addPackage(Package packageIn, User user) { + if (!getChannelArch().isCompatible(packageIn.getPackageArch())) { + throw new IncompatibleArchException(packageIn.getPackageArch(), + getChannelArch()); + } + List list =3D new ArrayList(); + list.add(packageIn.getId()); + ChannelManager.addPackages(this, list, user); + } + + + /** * Removes a single package from the channel * @param user the user doing the remove * @param packageIn The package to remove diff --git a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java = b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java index 0d6733a..d87966a 100644 --- a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java +++ b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java @@ -204,7 +204,7 @@ public class ErrataFactory extends HibernateFactory { published =3D ErrataFactory.createPublishedErrata(); } = - copyDetails(published, unpublished); + copyDetails(published, unpublished, false); = //Save the published Errata save(published); @@ -353,7 +353,7 @@ public class ErrataFactory extends HibernateFactory { = UnpublishedClonedErrata clone =3D new UnpublishedClonedErrata(); = - copyDetails(clone, e); + copyDetails(clone, e, true); = clone.setAdvisoryName(clonedAdvisoryName); clone.setAdvisory(clonedAdvisory); @@ -368,11 +368,19 @@ public class ErrataFactory extends HibernateFactory { * Helper method to copy the details for. * @param copy The object to copy into. * @param original The object to copy from. + * @param clone set to true if this is a cloned errata, and thus + * things like org or advisory name shouldn't be set */ - private static void copyDetails(Errata copy, Errata original) { + private static void copyDetails(Errata copy, Errata original, boolean = clone) { = //Set the easy things first ;) - copy.setAdvisory(original.getAdvisory()); + + if (!clone) { + copy.setAdvisory(original.getAdvisory()); + copy.setAdvisoryName(original.getAdvisoryName()); + copy.setOrg(original.getOrg()); + } + copy.setAdvisoryType(original.getAdvisoryType()); copy.setProduct(original.getProduct()); copy.setDescription(original.getDescription()); @@ -383,11 +391,10 @@ public class ErrataFactory extends HibernateFactory { copy.setUpdateDate(original.getUpdateDate()); copy.setNotes(original.getNotes()); copy.setRefersTo(original.getRefersTo()); - copy.setAdvisoryName(original.getAdvisoryName()); copy.setAdvisoryRel(original.getAdvisoryRel()); copy.setLocallyModified(original.getLocallyModified()); copy.setLastModified(original.getLastModified()); - copy.setOrg(original.getOrg()); + = /* = * Copy the packages @@ -415,39 +422,16 @@ public class ErrataFactory extends HibernateFactory { Iterator bugsItr =3D IteratorUtils.getIterator(original.getBugs()); while (bugsItr.hasNext()) { Bug bugIn =3D (Bug) bugsItr.next(); - Bug clone; + Bug cloneB; if (copy.isPublished()) { //we want published bugs - clone =3D ErrataManager.createNewPublishedBug(bugIn.getId(= ), = + cloneB =3D ErrataManager.createNewPublishedBug(bugIn.getId= (), bugIn.getSumma= ry()); } else { //we want unpublished bugs - clone =3D ErrataManager.createNewUnpublishedBug(bugIn.getI= d(), + cloneB =3D ErrataManager.createNewUnpublishedBug(bugIn.get= Id(), bugIn.getSum= mary()); } - copy.addBug(clone); - } - = - /* - * Copy the files using the same idea as the above bug copying - */ - Iterator filesItr =3D IteratorUtils.getIterator(original.getFiles(= )); - while (filesItr.hasNext()) { - ErrataFile fileIn =3D (ErrataFile) filesItr.next(); - ErrataFile clone; - Set packages =3D new HashSet(fileIn.getPackages()); - if (copy.isPublished()) { - clone =3D ErrataManager.createNewPublishedErrataFile(fileI= n.getFileType(), - fileIn.= getChecksum(), - fileIn.= getFileName(), - package= s); - } - else { - clone =3D ErrataManager.createNewUnpublishedErrataFile(fil= eIn.getFileType(), - fileI= n.getChecksum(), - fileI= n.getFileName(), - packa= ges); - } - copy.addFile(clone); + copy.addBug(cloneB); } } = @@ -1048,7 +1032,13 @@ public class ErrataFactory extends HibernateFactory { } = = - + /** + * Sync all the errata details from one errata to another + * @param cloned the cloned errata that needs syncing + */ + public static void syncErrataDetails(PublishedClonedErrata cloned) { + copyDetails(cloned, cloned.getOriginal(), true); + } = } = diff --git a/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryT= est.java b/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTes= t.java index 13e2fda..42988a6 100644 --- a/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java +++ b/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java @@ -270,7 +270,9 @@ public class ErrataFactoryTest extends BaseTestCaseWith= User { = private static void fillOutErrata(Errata e, Long orgId) throws Excepti= on { String name =3D "JAVA Test " + TestUtils.randomString(); - e.setOrg(OrgFactory.lookupById(orgId)); + if (orgId !=3D null) { + e.setOrg(OrgFactory.lookupById(orgId)); + } e.setAdvisory(name); e.setAdvisoryType(ErrataFactory.ERRATA_TYPE_BUG); e.setProduct("Red Hat Linux"); @@ -334,11 +336,7 @@ public class ErrataFactoryTest extends BaseTestCaseWit= hUser { assertEquals(published.getLocallyModified(), clone.getLocallyModifi= ed()); assertEquals(clonedAdvisoryName, clone.getAdvisoryName()); assertEquals(clonedAdvisory, clone.getAdvisory()); - = - assertEquals(1, clone.getFiles().size()); - ErrataFile ef =3D (ErrataFile)clone.getFiles().iterator().next(); - assertEquals(1, ef.getPackages().size()); - = + /* Create a 2nd clone and make sure that the cloning function * does not create a clone whose name collides with the already * existing clone diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/Sy= ncErrataAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/= manage/SyncErrataAction.java new file mode 100644 index 0000000..88410bd --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncErrat= aAction.java @@ -0,0 +1,97 @@ +/** + * Copyright (c) 2009 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.channel.manage; + +import com.redhat.rhn.domain.channel.Channel; +import com.redhat.rhn.domain.channel.InvalidChannelRoleException; +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.taglibs.list.helper.ListRhnSetHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.Listable; +import com.redhat.rhn.manager.channel.ChannelManager; +import com.redhat.rhn.manager.rhnset.RhnSetDecl; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * SyncErrataAction + * @version $Rev$ + */ +public class SyncErrataAction extends RhnAction implements Listable { + + /** + * + * {@inheritDoc} + */ + public ActionForward execute(ActionMapping mapping, + ActionForm formIn, + HttpServletRequest request, + HttpServletResponse response) { + + RequestContext rc =3D new RequestContext(request); + User user =3D rc.getLoggedInUser(); + + Channel chan =3D ChannelManager.lookupByIdAndUser( + rc.getRequiredParam(RequestContext.CID), user); + + try { + ChannelManager.verifyChannelAdmin(user, chan.getId()); + } + catch (InvalidChannelRoleException e) { + addMessage(request, e.getMessage()); + return mapping.findForward("default"); + } + + ListRhnSetHelper helper =3D new ListRhnSetHelper(this, request, + RhnSetDecl.ERRATA_TO_SYNC.createCustom(chan.getId())); + + helper.execute(); + if (helper.isDispatched()) { + Map params =3D new HashMap(); + params.put(RequestContext.CID, chan.getId()); + return getStrutsDelegate().forwardParams(mapping.findForward("= submit"), + params); + } + + request.setAttribute("channel_name", chan.getName()); + request.setAttribute(RequestContext.CID, chan.getId()); + return mapping.findForward("default"); + } + + + /** + * + * {@inheritDoc} + */ + public List getResult(RequestContext context) { + User user =3D context.getLoggedInUser(); + Channel chan =3D ChannelManager.lookupByIdAndUser( + context.getRequiredParam(RequestContext.CID), user); + + return ChannelManager.listErrataNeedingResync(chan, user); + } + + +} diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/Sy= ncErrataPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/action/= channel/manage/SyncErrataPackagesAction.java new file mode 100644 index 0000000..88b4234 --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncErrat= aPackagesAction.java @@ -0,0 +1,148 @@ +/** + * Copyright (c) 2009 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.channel.manage; + +import com.redhat.rhn.domain.channel.Channel; +import com.redhat.rhn.domain.channel.InvalidChannelRoleException; +import com.redhat.rhn.domain.errata.Errata; +import com.redhat.rhn.domain.errata.ErrataFactory; +import com.redhat.rhn.domain.errata.impl.PublishedClonedErrata; +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.taglibs.list.helper.ListRhnSetHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.Listable; +import com.redhat.rhn.manager.channel.ChannelEditor; +import com.redhat.rhn.manager.channel.ChannelManager; +import com.redhat.rhn.manager.errata.ErrataManager; +import com.redhat.rhn.manager.rhnset.RhnSetDecl; + +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.ActionMessage; +import org.apache.struts.action.ActionMessages; + +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * SyncErrataAction + * @version $Rev$ + */ +public class SyncErrataPackagesAction extends RhnAction implements Listabl= e { + + + private Logger log =3D Logger.getLogger(SyncErrataPackagesAction.class= ); + + /** + * + * {@inheritDoc} + */ + public ActionForward execute(ActionMapping mapping, + ActionForm formIn, + HttpServletRequest request, + HttpServletResponse response) { + + RequestContext rc =3D new RequestContext(request); + User user =3D rc.getLoggedInUser(); + + Channel chan =3D ChannelManager.lookupByIdAndUser( + rc.getRequiredParam(RequestContext.CID), user); + + try { + ChannelManager.verifyChannelAdmin(user, chan.getId()); + } + catch (InvalidChannelRoleException e) { + addMessage(request, e.getMessage()); + return mapping.findForward("default"); + } + + RhnSetDecl pkgDecl =3D RhnSetDecl.ERRATA_PACKAGES_TO_SYNC.createCu= stom(chan.getId()); + + ListRhnSetHelper helper =3D new ListRhnSetHelper(this, request, + pkgDecl); + + helper.setPreSelectAll(true); + helper.execute(); + + if (helper.isDispatched()) { + + Set eSet =3D RhnSetDecl.ERRATA_TO_SYNC.createCustom( + chan.getId()).get(user).getElementValues(); + Set pSet =3D pkgDecl.get(user).getElementValues(); + syncErrata(eSet, pSet, chan, user); + + + ActionMessages msg =3D new ActionMessages(); + String[] msgParams =3D {eSet.size() + "", pSet.size() + "", ch= an.getName()}; + msg.add(ActionMessages.GLOBAL_MESSAGE, + new ActionMessage("channel.jsp.errata.sync.complete", + msgParams)); + getStrutsDelegate().saveMessages(rc.getRequest(), msg); + + + Map params =3D new HashMap(); + params.put(RequestContext.CID, chan.getId()); + return getStrutsDelegate().forwardParams(mapping.findForward("= submit"), + params); + } + + request.setAttribute("channel_name", chan.getName()); + request.setAttribute(RequestContext.CID, chan.getId()); + return mapping.findForward("default"); + } + + + /** + * + * {@inheritDoc} + */ + public List getResult(RequestContext context) { + User user =3D context.getLoggedInUser(); + Channel chan =3D ChannelManager.lookupByIdAndUser( + context.getRequiredParam(RequestContext.CID), user); + String label =3D RhnSetDecl.ERRATA_TO_SYNC.createCustom( + chan.getId()).getLabel(); + + return ChannelManager.listErrataPackagesForResync(chan, user, labe= l); + } + + + private void syncErrata(Collection eids, Collection pids, + Channel chan, User u= ser) { + + ChannelEditor.getInstance().addPackages(user, chan, pids); + for (Long eid : eids) { + Errata e =3D ErrataManager.lookupErrata(eid, user); + if (e.isPublished() && e.isCloned()) { + ErrataFactory.syncErrataDetails((PublishedClonedErrata) e); + } + else { + log.fatal("Tried to sync errata with id " + eid + + " But it was not published or was not cloned"); + } + } + + } + +} diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResour= ce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringReso= urce_en_US.xml index 2470475..a5a3751 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml @@ -21302,6 +21302,31 @@ given channel. Picked Up + + Sync Errata + + + The following errata were cloned from errata that have since bee= n updated. + This page will allow you to syncronize your cloned errata to that of = its original. + + + Packages that were omitted as part of the origianl cloning proce= ss will be included here. + + + No out of date errata were found. + + + Packages to Push + + + The following packages will be pushed to this channel as part of= the errata sync process. Please review this list and unselect any unwante= d packages. + + + Sucessfully syncronized {0} errata and pushed {1} packages to ch= annel {2}. + + + + diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResour= ce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringReso= urce_en_US.xml index 93f3b37..0722a3c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_U= S.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_U= S.xml @@ -1006,6 +1006,13 @@ http://www.oasis-open.org/committees/xliff/documents= /xliff-core-1.1.xsd"
                  = + + Sync + + /rhn/channels/manage/errata/Syn= cErrata.do + + + Organizations @@ -1013,6 +1020,7 @@ http://www.oasis-open.org/committees/xliff/documents/= xliff-core-1.1.xsd" = + Trusts diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/List= SetHelper.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/= ListSetHelper.java index d6a8e8f..ed7d337 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/ListSetHelp= er.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/ListSetHelp= er.java @@ -15,6 +15,7 @@ = package com.redhat.rhn.frontend.taglibs.list.helper; = +import com.redhat.rhn.frontend.dto.BaseDto; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnHelper; import com.redhat.rhn.frontend.struts.Selectable; @@ -24,6 +25,7 @@ import com.redhat.rhn.frontend.taglibs.list.TagHelper; = import java.util.Collection; import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -86,6 +88,7 @@ abstract class ListSetHelper extends ListHelper { private boolean dispatched =3D false; private boolean ignoreEmptySelection =3D false; private boolean willClearSet =3D true; + private boolean preSelectAll =3D false; = private Set initSet =3D Collections.EMPTY_SET; = /** @@ -138,8 +141,8 @@ abstract class ListSetHelper extends ListHelper { if (!context.isSubmitted() && alphaBarPressed =3D=3D null && willC= learSet) { clear(); add(getPreSelected()); - } = - = + } + if (request.getParameter(RequestContext.DISPATCH) !=3D null) { // if its one of the Dispatch actions handle it.. = update(); @@ -161,6 +164,16 @@ abstract class ListSetHelper extends ListHelper { = List dataSet =3D getDataSet(); = + + if (!context.isSubmitted() && alphaBarPressed =3D=3D null && preSe= lectAll) { + Set selSet =3D new HashSet(); + for (BaseDto bdto : (List) dataSet) { + selSet.add(bdto.getId()); + } + add(selSet); + } + + // if its a list action update the set and the selections if (ListTagHelper.getListAction(getListName(), request) !=3D null)= { execute(dataSet); @@ -290,4 +303,20 @@ abstract class ListSetHelper extends ListHelper { this.willClearSet =3D willClearSetIn; } = + + /** + * @return Returns the preSelectAll. + */ + public boolean isPreSelectAll() { + return preSelectAll; + } + + + /** + * @param preSelectAllIn The preSelectAll to set. + */ + public void setPreSelectAll(boolean preSelectAllIn) { + this.preSelectAll =3D preSelectAllIn; + } + } diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.jav= a b/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java index 5b00f26..651ee8a 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java @@ -16,16 +16,15 @@ package com.redhat.rhn.manager.channel; = import com.redhat.rhn.common.db.datasource.CallableMode; import com.redhat.rhn.common.db.datasource.ModeFactory; -import com.redhat.rhn.common.hibernate.LookupException; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.security.PermissionException; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelFactory; -import com.redhat.rhn.domain.rhnpackage.Package; import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.manager.rhnpackage.PackageManager; import com.redhat.rhn.manager.user.UserManager; = +import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -57,7 +56,7 @@ public class ChannelEditor { * @param channel The channel to add the packages to * @param packageIds A list containing the ids of packages to add. */ - public void addPackages(User user, Channel channel, List packageIds) { + public void addPackages(User user, Channel channel, Collection package= Ids) { changePackages(user, channel, packageIds, true); } = @@ -67,7 +66,7 @@ public class ChannelEditor { * @param channel The channel to remove the packages from * @param packageIds A list containing the ids of packages to remove. */ - public void removePackages(User user, Channel channel, List packageIds= ) { + public void removePackages(User user, Channel channel, Collection pack= ageIds) { changePackages(user, channel, packageIds, false); } = @@ -76,7 +75,8 @@ public class ChannelEditor { * @param add If true, we are adding the list of packages to the chann= el. Otherwise, * remove the list of packages from the channel. */ - private void changePackages(User user, Channel channel, List packageId= s, boolean add) { + private void changePackages(User user, Channel channel, + Collection packageIds, boolean add) { //Make sure the person adding packages is a channel admin if (!UserManager.verifyChannelAdmin(user, channel)) { StringBuffer msg =3D new StringBuffer("User: "); @@ -112,27 +112,18 @@ public class ChannelEditor { } } = + List existingPids =3D ChannelFactory.getPackageIds(channel.g= etId()); + //Loop through packages and add to channel. = for (Iterator itr =3D packageIds.iterator(); itr.hasNext();) { Long pid =3D convertObjectToLong(itr.next()); - Package pkg =3D PackageManager.lookupByIdAndUser(pid, user); - if (pkg !=3D null) { - if (add) { - channel.addPackage(pkg); - } - else { - channel.removePackage(pkg, user); - } + List list =3D new ArrayList(); + list.add(pid); + if (add && !existingPids.contains(pid)) { + ChannelManager.addPackages(channel, list, user); } - else { - //throw a lookup exception - LocalizationService ls =3D LocalizationService.getInstance= (); - String msg =3D "The package: " + pid + " could not be foun= d."; - LookupException e =3D new LookupException(msg); - e.setLocalizedTitle(ls.getMessage("lookup.jsp.title.packag= e")); - e.setLocalizedReason1(ls.getMessage("lookup.jsp.reason1.pa= ckage")); - e.setLocalizedReason2(ls.getMessage("lookup.jsp.reason2.pa= ckage")); - throw e; + else if (!add) { + ChannelManager.removePackages(channel, list, user); } } = diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.ja= va b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java index f84a434..41433a2 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -32,6 +32,7 @@ import com.redhat.rhn.domain.channel.ChannelFactory; import com.redhat.rhn.domain.channel.ChannelFamily; import com.redhat.rhn.domain.channel.ChannelFamilyFactory; import com.redhat.rhn.domain.channel.ChannelVersion; +import com.redhat.rhn.domain.channel.ClonedChannel; import com.redhat.rhn.domain.channel.DistChannelMap; import com.redhat.rhn.domain.channel.InvalidChannelRoleException; import com.redhat.rhn.domain.channel.ProductName; @@ -2506,6 +2507,42 @@ public class ChannelManager extends BaseManager { } = /** + * Remove packages from a channel very quickly + * @param chan the channel + * @param packageIds list of package ids + * @param user the user doing the removing + */ + public static void addPackages(Channel chan, List packageIds, Us= er user) { + + if (!UserManager.verifyChannelAdmin(user, chan)) { + StringBuffer msg =3D new StringBuffer("User: "); + msg.append(user.getLogin()); + msg.append(" does not have channel admin access to channel: "); + msg.append(chan.getLabel()); + + LocalizationService ls =3D LocalizationService.getInstance(); + PermissionException pex =3D new PermissionException(msg.toStri= ng()); + pex.setLocalizedTitle(ls.getMessage("permission.jsp.title.chan= nel")); + pex.setLocalizedSummary(ls.getMessage("permission.jsp.summary.= channel")); + throw pex; + } + + Map params =3D new HashMap(); + params.put("cid", chan.getId()); + + WriteMode m =3D ModeFactory.getWriteMode("Channel_queries", "add_c= hannel_package"); + for (Long pid : packageIds) { + params.put("pid", pid); + m.executeUpdate(params); + } + + + HibernateFactory.getSession().refresh(chan); + + } + + + /** * Remove a set of erratas from a channel * and remove associated packages * @param chan The channel to remove from @@ -2553,4 +2590,58 @@ public class ChannelManager extends BaseManager { return (List) mode.execute(params); } = + /** + * List errata that is within a channel that needs to be resynced + * This is determined by the packages in the channel + * + * @param c the channel + * @param user the user + * @return list of errataOverview objects that need to be resynced + */ + public static List listErrataNeedingResync(Channel c, User user) { + if (!user.hasRole(RoleFactory.CHANNEL_ADMIN)) { + throw new PermissionException(RoleFactory.CHANNEL_ADMIN); + } + + if (c.isCloned()) { + Map params =3D new HashMap(); + params.put("cid", c.getId()); + ClonedChannel cc =3D (ClonedChannel) c; + params.put("ocid", cc.getOriginal().getId()); + SelectMode m =3D ModeFactory.getMode("Errata_queries", + "list_errata_needing_sync"); + return m.execute(params); + } + else { + return Collections.EMPTY_LIST; + } + } + + /** + * List errata packages that need to be resynced + * @param c the channel to look for packages in + * @param user the user doing it + * @param setLabel the set of errata to base the package off of + * @return the list of PackageOverview objects + */ + public static List listErrataPackagesForResync(Channel c, User user, S= tring setLabel) { + if (!user.hasRole(RoleFactory.CHANNEL_ADMIN)) { + throw new PermissionException(RoleFactory.CHANNEL_ADMIN); + } + + if (c.isCloned()) { + Map params =3D new HashMap(); + params.put("cid", c.getId()); + params.put("set_label", setLabel); + ClonedChannel cc =3D (ClonedChannel) c; + params.put("ocid", cc.getOriginal().getId()); + SelectMode m =3D ModeFactory.getMode("Errata_queries", + "list_packages_needing_sync_from_set"); + return m.execute(params); + } + else { + return Collections.EMPTY_LIST; + } + } + } diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManag= erTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelMana= gerTest.java index 4f52632..7818c97 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java +++ b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java @@ -39,6 +39,7 @@ import com.redhat.rhn.domain.server.ServerFactory; import com.redhat.rhn.domain.server.VirtualInstance; import com.redhat.rhn.domain.server.test.ServerFactoryTest; import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.action.user.AdminUserEditAction; import com.redhat.rhn.frontend.dto.ChannelOverview; import com.redhat.rhn.frontend.dto.ErrataOverview; import com.redhat.rhn.frontend.dto.EssentialChannelDto; @@ -49,6 +50,7 @@ import com.redhat.rhn.frontend.xmlrpc.NoSuchChannelExcept= ion; import com.redhat.rhn.manager.channel.ChannelEntitlementCounter; import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.entitlement.EntitlementManager; +import com.redhat.rhn.manager.errata.ErrataManager; import com.redhat.rhn.manager.rhnpackage.test.PackageManagerTest; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; @@ -747,4 +749,64 @@ public class ChannelManagerTest extends BaseTestCaseWi= thUser { = = } + + public void testListErrataNeedingResync() throws Exception { + + user.addRole(RoleFactory.CHANNEL_ADMIN); + + Channel ochan =3D ChannelFactoryTest.createTestChannel(); + Channel cchan =3D ChannelFactoryTest.createTestClonedChannel(ochan= , user); + + Errata oe =3D ErrataFactoryTest.createTestErrata(null); + ochan.addErrata(oe); + + List list =3D new ArrayList(); + list.add(cchan.getId()); + + Errata ce =3D ErrataManager.createClone(user, oe); + ce =3D ErrataManager.publish(ce, list, user); + + Package testPackage =3D PackageTest.createTestPackage(); + oe.addPackage(testPackage); + ochan.addPackage(testPackage); + + List result =3D ChannelManager.listErrataNeedingR= esync(cchan, user); + assertTrue(result.size() =3D=3D 1); + assertEquals(result.get(0).getId(), ce.getId()); + + } + + public void testListErrataPackagesForResync() throws Exception { + + user.addRole(RoleFactory.CHANNEL_ADMIN); + + Channel ochan =3D ChannelFactoryTest.createTestChannel(); + Channel cchan =3D ChannelFactoryTest.createTestClonedChannel(ochan= , user); + + Errata oe =3D ErrataFactoryTest.createTestErrata(null); + ochan.addErrata(oe); + + List list =3D new ArrayList(); + list.add(cchan.getId()); + + Errata ce =3D ErrataManager.createClone(user, oe); + ce =3D ErrataManager.publish(ce, list, user); + + Package testPackage =3D PackageTest.createTestPackage(); + oe.addPackage(testPackage); + ochan.addPackage(testPackage); + + RhnSet set =3D RhnSetDecl.ERRATA_TO_SYNC.get(user); + set.clear(); + set.add(ce.getId()); + RhnSetManager.store(set); + + List result =3D ChannelManager.listErrataPackage= sForResync(cchan, user, set.getLabel()); + assertTrue(result.size() =3D=3D 1); + + assertEquals(result.get(0).getId(), testPackage.getId()); + + } + + } diff --git a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java= b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java index 2535b63..2f757e0 100644 --- a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java +++ b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java @@ -31,6 +31,7 @@ import com.redhat.rhn.domain.errata.Errata; import com.redhat.rhn.domain.errata.ErrataFactory; import com.redhat.rhn.domain.errata.ErrataFile; import com.redhat.rhn.domain.errata.ErrataFileType; +import com.redhat.rhn.domain.errata.impl.PublishedClonedErrata; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.role.RoleFactory; @@ -1237,4 +1238,19 @@ public class ErrataManager extends BaseManager { = return flag; } + + /** + * resync an errata, including all it's details + * doesn't actually push any packages to a channel + * @param cloned the cloned errata needing resyncing + * @param user the user doign the syncing + */ + public static void reSyncErrata(PublishedClonedErrata cloned, User user= ) { + if (!user.hasRole(RoleFactory.CHANNEL_ADMIN)) { + throw new PermissionException(RoleFactory.CHANNEL_ADMIN); + } + ErrataFactory.syncErrataDetails(cloned); + } + + } diff --git a/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java b/= java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java index d1cd5fb..a151135 100644 --- a/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java +++ b/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java @@ -81,6 +81,13 @@ public class RhnSetDecl { public static final RhnSetDecl ERRATA_TO_DELETE_BULK =3D make("errata_= to_delete_bulk", SetCleanup.UNOWNED_ERRATA); = + // set of errata by errata_id; needs new cleanup + public static final RhnSetDecl ERRATA_TO_SYNC =3D make("errata_to_sync= ", + SetCleanup.UNOWNED_ERRATA); + + public static final RhnSetDecl ERRATA_PACKAGES_TO_SYNC =3D make("errat= a_packages_to_sync", + SetCleanup.UNOWNED_PACKAGES); + // set of file list: needs new cleanup public static final RhnSetDecl FILE_LISTS =3D make("file_lists", SetCleanup.UNOWNED_FILE_LIST); diff --git a/java/code/webapp/WEB-INF/nav/manage_channel.xml b/java/code/we= bapp/WEB-INF/nav/manage_channel.xml index ae6cc40..acdb4cd 100644 --- a/java/code/webapp/WEB-INF/nav/manage_channel.xml +++ b/java/code/webapp/WEB-INF/nav/manage_channel.xml @@ -29,6 +29,10 @@ /network/software/channels/manage/errata/clone.pxt?pxt:= trap=3Drhn:empty_set&set_label=3Derrata_clone_actions /network/software/channels/manage/errata/clone_confirm.= pxt + + /rhn/channels/manage/errata/SyncErrata.do + /rhn/channels/manage/errata/ConfirmSyncPackages.do + /rhn/channels/manage/ChannelPackageMenu.do diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesyn= c.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp new file mode 100644 index 0000000..6a82188 --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp @@ -0,0 +1,80 @@ +<%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> +<%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> +<%@ taglib uri=3D"http://rhn.redhat.com/tags/list" prefix=3D"rl" %> + + + + + + + + + + + + + + + + + <%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage= _channel_header.jspf" %> +
                  + +

                  + + + + + + + + + + + + + + + + + + + ${current.nvrea} + + + + + ${current.summary} + + + +
                  +
                  + " /> +
                  + + + +
                  + + + \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp b= /java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp new file mode 100644 index 0000000..089d675 --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp @@ -0,0 +1,110 @@ +<%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> +<%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> +<%@ taglib uri=3D"http://rhn.redhat.com/tags/list" prefix=3D"rl" %> + + + + + + + + + + + + + + + <%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage= _channel_header.jspf" %> +

                  + 3D"erratum" +

                  + + + + + + + + + + + + + + + + + + + + 3D"Product + + + 3D"Product + + + 3D"Bug + + + + + + + + ${current.advisoryName} + + + + + ${current.advisorySynopsis} + + + + + ${current.updateDate} + + + + + + + + +

                  + "> +

                  + + + +
                  + + + + + = \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/= WEB-INF/struts-config.xml index 31c416e..1b8023b 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -6169,6 +6169,27 @@ = + + + + + + + + + + + + + /network/software/channels/manage/errata/clone.pxt /network/software/channels/manage/errata/clone_confirm.= pxt
                  + + /rhn/channels/manage/errata/SyncErrata.do + /rhn/channels/manage/errata/ConfirmSyncPackages.do + /rhn/channels/manage/ChannelPackageMenu.do --===============2233504342559986352==-- From shughes at fedoraproject.org Thu Aug 20 11:57:18 2015 Content-Type: multipart/mixed; boundary="===============3442292367466654877==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: spacewalk/config web/html Date: Tue, 02 Jun 2009 19:44:40 +0000 Message-ID: <20090602194440.B4F4E1201D6@lists.fedorahosted.org> --===============3442292367466654877== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 9 + web/html/errors/403.html | 140 +++++++++++= +++++ web/html/errors/404.html | 123 +++++++++++= +++ web/html/errors/413.html | 131 +++++++++++= +++ web/html/errors/500.html | 135 +++++++++++= ++++ web/html/errors/error.html | 134 -----------= ---- 6 files changed, 538 insertions(+), 134 deletions(-) New commits: commit 8c5ce1571887e2098646555e6775b0be49ab015d Author: Shannon Hughes Date: Tue Jun 2 15:38:28 2009 -0400 500709 - html error code page support for sessionless bots diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spac= ewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf index 3e49b75..930ec30 100644 --- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf +++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf @@ -17,10 +17,19 @@ PerlPassEnv NLS_LANG = PerlOptions +GlobalRequest = +# generic html; no session for vulnerability bots +ErrorDocument 403 /errors/403.html +ErrorDocument 404 /errors/404.html +ErrorDocument 413 /errors/413.html +ErrorDocument 500 /errors/500.html + + + ErrorDocument 403 /errors/permission.pxt ErrorDocument 404 /errors/404.pxt ErrorDocument 413 /errors/413.pxt ErrorDocument 500 /errors/500.pxt + = AddType text/pxt .pxt diff --git a/web/html/errors/403.html b/web/html/errors/403.html new file mode 100644 index 0000000..530c7f9 --- /dev/null +++ b/web/html/errors/403.html @@ -0,0 +1,140 @@ + +<= head> + + Error + + + + + + + +
                  + + + + + + +
                  +
                  +

                  Shortcuts: Knowledgebase | Documentation<= /p> +

                  +
                  +  +
                  + +
                  + +
                  + +
                  +
                  +
                  + + + +
                  +
                  +
                  +
                  + +
                  +
                  + + + +
                  +
                  + + + + + + + + +
                  + +
                  +
                  + + + + + + +
                  + +
                  + + +
                  +
                  + +
                  + + + + + +
                  +
                  +
                  + + + + + +
                  + + +
                    +
                    + +
                    + + +

                    Permission Error

                    +

                    You do not have the appropriate permission set to access the requested = page. You may have reached this error page in one of several ways:

                    +
                      +
                    1. You are using Konqueror 3.0, which does not handle form + variables properly in all cases. Continuing to use Konqueror = 3.0 + will have unexpected results. If you are using Konqueror 3.0, + please use another browser.
                    2. +
                    3. Your login session has expired. For security reasons, Red= Hat + Network terminates your login session after 15 minutes of + inactivity. To sign in again, click here. +
                    4. +
                    5. You've found an error in our site. Please contact your Sup= port representative with details of how you received this message.
                    6. +
                    7. Your browser does not have cookies enabled. The Red + Hat Network requires cookies in order to function; if you + have disabled them, please re-enable them to use the site. +
                    8. +
                    9. You've done something naughty. Stop it.
                    10. +
                    + + +
                    + +
                    + Copyright =C2=A9 2002-08 Red Hat, Inc. All rights reserved. Privacy statement= : Legal state= ment : redhat.com +
                    + +
                    +
                    + + diff --git a/web/html/errors/404.html b/web/html/errors/404.html new file mode 100644 index 0000000..b7b489a --- /dev/null +++ b/web/html/errors/404.html @@ -0,0 +1,123 @@ + +<= head> + + Error + + + + + + + +
                    + + + + + + +
                    +
                    +

                    Shortcuts: Knowledgebase | Documentation<= /p> +

                    +
                    +  +
                    + +
                    + +
                    + +
                    +
                    +
                    + + + +
                    +
                    +
                    +
                    + +
                    +
                    + + + +
                    +
                    + + + + + + + + +
                    + +
                    +
                    + + + + + + +
                    + +
                    + + +
                    +
                    + +
                    + + + + + +
                    +
                    +
                    + + + + + +
                    + + +
                      +
                      + +
                      + + +

                      404 Error - File Not Found

                      +

                      Please report this error to your local administrator.

                      + +
                      + +
                      + Copyright =C2=A9 2002-08 Red Hat, Inc. All rights reserved. Privacy statement= : Legal state= ment : redhat.com +
                      + +
                      +
                      + + diff --git a/web/html/errors/413.html b/web/html/errors/413.html new file mode 100644 index 0000000..5670692 --- /dev/null +++ b/web/html/errors/413.html @@ -0,0 +1,131 @@ + +<= head> + + Error + + + + + + + +
                      + + + + + + +
                      +
                      +

                      Shortcuts: Knowledgebase | Documentation<= /p> +

                      +
                      +  +
                      + +
                      + +
                      + +
                      +
                      +
                      + + + +
                      +
                      +
                      +
                      + +
                      +
                      + + + +
                      +
                      + + + + + + + + +
                      + +
                      +
                      + + + + + + +
                      + +
                      + + +
                      +
                      + +
                      + + + + + +
                      +
                      +
                      + + + + + +
                      + + +
                        +
                        + +
                        + +

                        413 Error - Request Entity Too Large

                        +

                        The amount of data provided in the request exceeds the capacity l= imit.

                        +

                        + You have probably received this error because you have attempted to + upload a file that is larger than the maximum allowed size. +

                        + +

                        + Please report this error to your local administrator. +

                        + + +
                        + +
                        + Copyright =C2=A9 2002-08 Red Hat, Inc. All rights reserved. Privacy statement= : Legal state= ment : redhat.com +
                        + +
                        +
                        + + diff --git a/web/html/errors/500.html b/web/html/errors/500.html new file mode 100644 index 0000000..a5237a8 --- /dev/null +++ b/web/html/errors/500.html @@ -0,0 +1,135 @@ + +<= head> + + Error + + + + + + + +
                        + + + + + + +
                        +
                        +

                        Shortcuts: Knowledgebase | Documentation<= /p> +

                        +
                        +  +
                        + +
                        + +
                        + +
                        +
                        +
                        + + + +
                        +
                        +
                        +
                        + +
                        +
                        + + + +
                        +
                        + + + + + + + + +
                        + +
                        +
                        + + + + + + +
                        + +
                        + + +
                        +
                        + +
                        + + + + + +
                        +
                        +
                        + + + + + +
                        + + +
                          +
                          + +
                          + + +

                          500 Error - Internal Server Error

                          +

                          You may have reached this page in one of the following ways:

                          +
                            +
                          1. You are using an outdated version of Konqueror 3.0, which + may not handle form variables properly in all cases. Continui= ng to + use this outdated version of Konqueror may have unexpected res= ults. + Please up2date to the latest version of Konqueror (3.03 or + greater), or if this is not possible, please use another + browser.
                          2. +
                          3. You've found an error in the site. Please report this err= or + to your local administrator with details of how you received t= his + message.
                          4. +
                          + + +
                          + +
                          + Copyright =C2=A9 2002-08 Red Hat, Inc. All rights reserved. Privacy statement= : Legal state= ment : redhat.com +
                          + +
                          +
                          + + diff --git a/web/html/errors/error.html b/web/html/errors/error.html deleted file mode 100644 index 265323c..0000000 --- a/web/html/errors/error.html +++ /dev/null @@ -1,134 +0,0 @@ - -<= head> - - Error - - - - - - - -
                          - - - - - - -
                          -
                          -

                          Shortcuts: Knowledgebase | Documentation<= /p> -

                          -
                          -  -
                          - -
                          - -
                          - -
                          -
                          -
                          - - - -
                          -
                          -
                          -
                          - -
                          -
                          - - - -
                          -
                          - - - - - - - - -
                          - -
                          -
                          - - - - - - -
                          - -
                          - - -
                          -
                          - -
                          - - - - - -
                          -
                          -
                          - - - - - -
                          - - -
                            -
                            - -
                            - - -

                            Page Error

                            -

                            Error requesting page. Some possible causes of this problem:

                            - -
                              -
                            1. Page no longer exists
                            2. -
                            3. Page permission issue
                            4. -
                            5. You are doing something naughty
                            6. -
                            - -

                            Cookie support required. Note: cookies are not used - for marketing purposes; we use them strictly to keep track - of your login state and other state data absolutely - necessary for the proper functioning of your account.

                            - -
                            - -
                            - Copyright =C2=A9 2002-08 Red Hat, Inc. All rights reserved. Privacy statement= : Legal state= ment : redhat.com -
                            - -
                            -
                            - - --===============3442292367466654877==-- From shughes at fedoraproject.org Thu Aug 20 11:57:18 2015 Content-Type: multipart/mixed; boundary="===============3671754806746943064==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - spacewalk/config web/html Date: Tue, 02 Jun 2009 19:46:27 +0000 Message-ID: <20090602194627.3B2E91201D6@lists.fedorahosted.org> --===============3671754806746943064== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 9 + web/html/errors/403.html | 140 +++++++++++= +++++ web/html/errors/404.html | 123 +++++++++++= +++ web/html/errors/413.html | 131 +++++++++++= +++ web/html/errors/500.html | 135 +++++++++++= ++++ web/html/errors/error.html | 134 -----------= ---- 6 files changed, 538 insertions(+), 134 deletions(-) New commits: commit 7d726b8f00efc4a7c19e344fddf9d758532da1e1 Author: Shannon Hughes Date: Tue Jun 2 15:38:28 2009 -0400 500709 - html error code page support for sessionless bots diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spac= ewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf index 3e49b75..930ec30 100644 --- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf +++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf @@ -17,10 +17,19 @@ PerlPassEnv NLS_LANG = PerlOptions +GlobalRequest = +# generic html; no session for vulnerability bots +ErrorDocument 403 /errors/403.html +ErrorDocument 404 /errors/404.html +ErrorDocument 413 /errors/413.html +ErrorDocument 500 /errors/500.html + + + ErrorDocument 403 /errors/permission.pxt ErrorDocument 404 /errors/404.pxt ErrorDocument 413 /errors/413.pxt ErrorDocument 500 /errors/500.pxt + = AddType text/pxt .pxt diff --git a/web/html/errors/403.html b/web/html/errors/403.html new file mode 100644 index 0000000..530c7f9 --- /dev/null +++ b/web/html/errors/403.html @@ -0,0 +1,140 @@ + +<= head> + + Error + + + + + + + +
                            + + + + + + +
                            +
                            +

                            Shortcuts: Knowledgebase | Documentation<= /p> +

                            +
                            +  +
                            + +
                            + +
                            + +
                            +
                            +
                            + + + +
                            +
                            +
                            +
                            + +
                            +
                            + + + +
                            +
                            + + + + + + + + +
                            + +
                            +
                            + + + + + + +
                            + +
                            + + +
                            +
                            + +
                            + + + + + +
                            +
                            +
                            + + + + + +
                            + + +
                              +
                              + +
                              + + +

                              Permission Error

                              +

                              You do not have the appropriate permission set to access the requested = page. You may have reached this error page in one of several ways:

                              +
                                +
                              1. You are using Konqueror 3.0, which does not handle form + variables properly in all cases. Continuing to use Konqueror = 3.0 + will have unexpected results. If you are using Konqueror 3.0, + please use another browser.
                              2. +
                              3. Your login session has expired. For security reasons, Red= Hat + Network terminates your login session after 15 minutes of + inactivity. To sign in again, click here. +
                              4. +
                              5. You've found an error in our site. Please contact your Sup= port representative with details of how you received this message.
                              6. +
                              7. Your browser does not have cookies enabled. The Red + Hat Network requires cookies in order to function; if you + have disabled them, please re-enable them to use the site. +
                              8. +
                              9. You've done something naughty. Stop it.
                              10. +
                              + + +
                              + +
                              + Copyright =C2=A9 2002-08 Red Hat, Inc. All rights reserved. Privacy statement= : Legal state= ment : redhat.com +
                              + +
                              +
                              + + diff --git a/web/html/errors/404.html b/web/html/errors/404.html new file mode 100644 index 0000000..b7b489a --- /dev/null +++ b/web/html/errors/404.html @@ -0,0 +1,123 @@ + +<= head> + + Error + + + + + + + +
                              + + + + + + +
                              +
                              +

                              Shortcuts: Knowledgebase | Documentation<= /p> +

                              +
                              +  +
                              + +
                              + +
                              + +
                              +
                              +
                              + + + +
                              +
                              +
                              +
                              + +
                              +
                              + + + +
                              +
                              + + + + + + + + +
                              + +
                              +
                              + + + + + + +
                              + +
                              + + +
                              +
                              + +
                              + + + + + +
                              +
                              +
                              + + + + + +
                              + + +
                                +
                                + +
                                + + +

                                404 Error - File Not Found

                                +

                                Please report this error to your local administrator.

                                + +
                                + +
                                + Copyright =C2=A9 2002-08 Red Hat, Inc. All rights reserved. Privacy statement= : Legal state= ment : redhat.com +
                                + +
                                +
                                + + diff --git a/web/html/errors/413.html b/web/html/errors/413.html new file mode 100644 index 0000000..5670692 --- /dev/null +++ b/web/html/errors/413.html @@ -0,0 +1,131 @@ + +<= head> + + Error + + + + + + + +
                                + + + + + + +
                                +
                                +

                                Shortcuts: Knowledgebase | Documentation<= /p> +

                                +
                                +  +
                                + +
                                + +
                                + +
                                +
                                +
                                + + + +
                                +
                                +
                                +
                                + +
                                +
                                + + + +
                                +
                                + + + + + + + + +
                                + +
                                +
                                + + + + + + +
                                + +
                                + + +
                                +
                                + +
                                + + + + + +
                                +
                                +
                                + + + + + +
                                + + +
                                  +
                                  + +
                                  + +

                                  413 Error - Request Entity Too Large

                                  +

                                  The amount of data provided in the request exceeds the capacity l= imit.

                                  +

                                  + You have probably received this error because you have attempted to + upload a file that is larger than the maximum allowed size. +

                                  + +

                                  + Please report this error to your local administrator. +

                                  + + +
                                  + +
                                  + Copyright =C2=A9 2002-08 Red Hat, Inc. All rights reserved. Privacy statement= : Legal state= ment : redhat.com +
                                  + +
                                  +
                                  + + diff --git a/web/html/errors/500.html b/web/html/errors/500.html new file mode 100644 index 0000000..a5237a8 --- /dev/null +++ b/web/html/errors/500.html @@ -0,0 +1,135 @@ + +<= head> + + Error + + + + + + + +
                                  + + + + + + +
                                  +
                                  +

                                  Shortcuts: Knowledgebase | Documentation<= /p> +

                                  +
                                  +  +
                                  + +
                                  + +
                                  + +
                                  +
                                  +
                                  + + + +
                                  +
                                  +
                                  +
                                  + +
                                  +
                                  + + + +
                                  +
                                  + + + + + + + + +
                                  + +
                                  +
                                  + + + + + + +
                                  + +
                                  + + +
                                  +
                                  + +
                                  + + + + + +
                                  +
                                  +
                                  + + + + + +
                                  + + +
                                    +
                                    + +
                                    + + +

                                    500 Error - Internal Server Error

                                    +

                                    You may have reached this page in one of the following ways:

                                    +
                                      +
                                    1. You are using an outdated version of Konqueror 3.0, which + may not handle form variables properly in all cases. Continui= ng to + use this outdated version of Konqueror may have unexpected res= ults. + Please up2date to the latest version of Konqueror (3.03 or + greater), or if this is not possible, please use another + browser.
                                    2. +
                                    3. You've found an error in the site. Please report this err= or + to your local administrator with details of how you received t= his + message.
                                    4. +
                                    + + +
                                    + +
                                    + Copyright =C2=A9 2002-08 Red Hat, Inc. All rights reserved. Privacy statement= : Legal state= ment : redhat.com +
                                    + +
                                    +
                                    + + diff --git a/web/html/errors/error.html b/web/html/errors/error.html deleted file mode 100644 index 265323c..0000000 --- a/web/html/errors/error.html +++ /dev/null @@ -1,134 +0,0 @@ - -<= head> - - Error - - - - - - - -
                                    - - - - - - -
                                    -
                                    -

                                    Shortcuts: Knowledgebase | Documentation<= /p> -

                                    -
                                    -  -
                                    - -
                                    - -
                                    - -
                                    -
                                    -
                                    - - - -
                                    -
                                    -
                                    -
                                    - -
                                    -
                                    - - - -
                                    -
                                    - - - - - - - - -
                                    - -
                                    -
                                    - - - - - - -
                                    - -
                                    - - -
                                    -
                                    - -
                                    - - - - - -
                                    -
                                    -
                                    - - - - - -
                                    - - -
                                      -
                                      - -
                                      - - -

                                      Page Error

                                      -

                                      Error requesting page. Some possible causes of this problem:

                                      - -
                                        -
                                      1. Page no longer exists
                                      2. -
                                      3. Page permission issue
                                      4. -
                                      5. You are doing something naughty
                                      6. -
                                      - -

                                      Cookie support required. Note: cookies are not used - for marketing purposes; we use them strictly to keep track - of your login state and other state data absolutely - necessary for the proper functioning of your account.

                                      - -
                                      - -
                                      - Copyright =C2=A9 2002-08 Red Hat, Inc. All rights reserved. Privacy statement= : Legal state= ment : redhat.com -
                                      - -
                                      -
                                      - - --===============3671754806746943064==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:18 2015 Content-Type: multipart/mixed; boundary="===============2009807239506023780==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Tue, 02 Jun 2009 19:51:45 +0000 Message-ID: <20090602195145.E64A61201D6@lists.fedorahosted.org> --===============2009807239506023780== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/org/MigrationManager.java | 2= - java/code/src/com/redhat/rhn/manager/system/ServerGroupManager.java | 15= ++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) New commits: commit 4c197d83bfd697f7782d2765df507c359944653b Author: Brad Buckingham Date: Tue Jun 2 15:51:14 2009 -0400 503545 - api - system.migrateSystems - update to handle systems that ar= e in a system group = Currently, if a sat admin attempts to migrate a system from an org that= the sat admin is not a member of, the request is denied. The reason being the sat admin does not normally have 'permission' (e.g. ui) to do this. diff --git a/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java= b/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java index a498c04..4d8eafa 100644 --- a/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java +++ b/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java @@ -122,7 +122,7 @@ public class MigrationManager extends BaseManager { for (ManagedServerGroup group : server.getManagedGroups()) { List tempList =3D new LinkedList(); tempList.add(server); - manager.removeServers(group, tempList, user); + manager.removeServers(group, tempList); } = // Remove custom data values (aka System->CustomInfo) diff --git a/java/code/src/com/redhat/rhn/manager/system/ServerGroupManager= .java b/java/code/src/com/redhat/rhn/manager/system/ServerGroupManager.java index 463147c..2c3c9d6 100644 --- a/java/code/src/com/redhat/rhn/manager/system/ServerGroupManager.java +++ b/java/code/src/com/redhat/rhn/manager/system/ServerGroupManager.java @@ -357,20 +357,29 @@ public class ServerGroupManager { /** * Dissociates a bunch of servers from a server group * @param sg the server group to process - * @param servers a collection of servers to deassociate = + * @param servers a collection of servers to dissociate * @param loggedInUser the loggedInUser needed for credentials */ public void removeServers(ServerGroup sg, Collection servers, = User loggedInUser)= { validateAccessCredentials(loggedInUser, sg, sg.getName()); validateAdminCredentials(loggedInUser); + removeServers(sg, servers); + } + + /** + * Dissociates a bunch of servers from a server group. + * **WARNING** This method does not validate the user's access or + * admin credentials; therefore, it should be used with caution. + * @param sg the server group to process + * @param servers a collection of servers to dissociate + */ + public void removeServers(ServerGroup sg, Collection servers) { for (Iterator itr =3D servers.iterator(); itr.hasNext();) { Server s =3D (Server) itr.next(); SystemManager.removeServerFromServerGroup(s, sg); = } - = } - = = /** * Returns the admins of a given servergroup. This list includes --===============2009807239506023780==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:18 2015 Content-Type: multipart/mixed; boundary="===============4637595741220756137==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Tue, 02 Jun 2009 22:42:23 +0000 Message-ID: <20090602224223.6A5E41201D6@lists.fedorahosted.org> --===============4637595741220756137== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml = | 1 - 1 file changed, 1 deletion(-) New commits: commit 07c05bdc8cbccac46aa0a4024d2740d4fd80c2d9 Author: Justin Sherrill Date: Tue Jun 2 18:41:25 2009 -0400 502259 - fixing query error that prevented solaris patch clusters from = being installed diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_= queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package= _queries.xml index 12f302c..cbf3315 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries= .xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries= .xml @@ -1036,7 +1036,6 @@ SELECT pn.name AS NAME, AND SPP.patch_id =3D full_list.id AND PNEVRA.id =3D SPP.package_nevra_id AND PNEVRA.name_id =3D SP.name_id - AND PNEVRA.evr_id =3D SP.evr_id AND ((PNEVRA.package_arch_id IS NULL AND SP.package_arch_id IS= NULL) OR PNEVRA.package_arch_id =3D SP.package_arch_id) AND NOT EXISTS (SELECT 1 FROM rhnSolarisPatchedPackage SPdP --===============4637595741220756137==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:18 2015 Content-Type: multipart/mixed; boundary="===============5396990068519063194==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Tue, 02 Jun 2009 22:43:25 +0000 Message-ID: <20090602224325.2D9251201D6@lists.fedorahosted.org> --===============5396990068519063194== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml = | 1 - 1 file changed, 1 deletion(-) New commits: commit 5b77160c0c6fb07aa7768a35bbce75c0f20cd858 Author: Justin Sherrill Date: Tue Jun 2 18:41:25 2009 -0400 502259 - fixing query error that prevented solaris patch clusters from = being installed diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_= queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package= _queries.xml index 12f302c..cbf3315 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries= .xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries= .xml @@ -1036,7 +1036,6 @@ SELECT pn.name AS NAME, AND SPP.patch_id =3D full_list.id AND PNEVRA.id =3D SPP.package_nevra_id AND PNEVRA.name_id =3D SP.name_id - AND PNEVRA.evr_id =3D SP.evr_id AND ((PNEVRA.package_arch_id IS NULL AND SP.package_arch_id IS= NULL) OR PNEVRA.package_arch_id =3D SP.package_arch_id) AND NOT EXISTS (SELECT 1 FROM rhnSolarisPatchedPackage SPdP --===============5396990068519063194==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:18 2015 Content-Type: multipart/mixed; boundary="===============0175616508252641240==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: rel-eng/build-missing-builds-in-koji.sh Date: Wed, 03 Jun 2009 11:57:27 +0000 Message-ID: <20090603115727.5ED3A120252@lists.fedorahosted.org> --===============0175616508252641240== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/build-missing-builds-in-koji.sh | 1 + 1 file changed, 1 insertion(+) New commits: commit d4349e89fd21b672ae9ef7f36b274f67e8f143e9 Author: Miroslav Such=C3=BD Date: Wed Jun 3 13:48:00 2009 +0200 ignore solaris packages, do not try to build them diff --git a/rel-eng/build-missing-builds-in-koji.sh b/rel-eng/build-missin= g-builds-in-koji.sh index 8abf0e9..215d59e 100755 --- a/rel-eng/build-missing-builds-in-koji.sh +++ b/rel-eng/build-missing-builds-in-koji.sh @@ -16,6 +16,7 @@ for tag in 0 1; do } /Builds missing in koji/ { x=3D1 }' | \ xargs -I replacestring awk '{print $2}' rel-eng/packages/replacestring = | \ + grep -v solaris | \ while read package ; do ( echo Building package in path $package = --===============0175616508252641240==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:18 2015 Content-Type: multipart/mixed; boundary="===============4323700059846563357==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: proxy/installer Date: Wed, 03 Jun 2009 12:10:59 +0000 Message-ID: <20090603121059.C9A2A120252@lists.fedorahosted.org> --===============4323700059846563357== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/installer/configure-proxy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit ebaf09fdf4ec7a6ce56bce38d3cbe3329ce48264 Author: Miroslav Such=C3=BD Date: Wed Jun 3 14:10:25 2009 +0200 500151 - do not insist on presence of sslbuildir if we force own CA diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure= -proxy.sh index 995a8de..043bd79 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -194,8 +194,8 @@ DIR=3D/usr/share/doc/proxy/conf-template HOSTNAME=3D$(hostname) = SSL_BUILD_DIR=3D${SSL_BUILD_DIR:-/root/ssl-build} -if ! [ -d $SSL_BUILD_DIR ]; then - echo "Error: ssl build directory $SSL_BUILD_DIR do not exist." +if ! [ -d $SSL_BUILD_DIR ] && [ 0$FORCE_OWN_CA -eq 0 ]; then + echo "Error: ssl build directory $SSL_BUILD_DIR do not exist. Please crea= te this directory." exit 1 fi = --===============4323700059846563357==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:18 2015 Content-Type: multipart/mixed; boundary="===============3560946397494322589==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - proxy/installer Date: Wed, 03 Jun 2009 12:11:43 +0000 Message-ID: <20090603121143.6145E120252@lists.fedorahosted.org> --===============3560946397494322589== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/installer/configure-proxy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit b3382fec2140ad0683b55a84fa58c25a9d721ce5 Author: Miroslav Such=C3=BD Date: Wed Jun 3 14:10:25 2009 +0200 500151 - do not insist on presence of sslbuildir if we force own CA (cherry picked from commit ebaf09fdf4ec7a6ce56bce38d3cbe3329ce48264) diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure= -proxy.sh index 90b0d8a..bf56977 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -194,8 +194,8 @@ DIR=3D/usr/share/doc/proxy/conf-template HOSTNAME=3D$(hostname) = SSL_BUILD_DIR=3D${SSL_BUILD_DIR:-/root/ssl-build} -if ! [ -d $SSL_BUILD_DIR ]; then - echo "Error: ssl build directory $SSL_BUILD_DIR do not exist." +if ! [ -d $SSL_BUILD_DIR ] && [ 0$FORCE_OWN_CA -eq 0 ]; then + echo "Error: ssl build directory $SSL_BUILD_DIR do not exist. Please crea= te this directory." exit 1 fi = --===============3560946397494322589==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:18 2015 Content-Type: multipart/mixed; boundary="===============0456303940369825267==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Wed, 03 Jun 2009 13:13:56 +0000 Message-ID: <20090603131356.172F6120252@lists.fedorahosted.org> --===============0456303940369825267== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/org/MigrationManager.java | 2= - java/code/src/com/redhat/rhn/manager/system/ServerGroupManager.java | 15= ++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) New commits: commit cd542846056d042a773a13cb5204d0e65267acc8 Author: Brad Buckingham Date: Tue Jun 2 15:51:14 2009 -0400 503545 - api - system.migrateSystems - update to handle systems that ar= e in a system group = Currently, if a sat admin attempts to migrate a system from an org that= the sat admin is not a member of, the request is denied. The reason being the sat admin does not normally have 'permission' (e.g. ui) to do this. diff --git a/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java= b/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java index a498c04..4d8eafa 100644 --- a/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java +++ b/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java @@ -122,7 +122,7 @@ public class MigrationManager extends BaseManager { for (ManagedServerGroup group : server.getManagedGroups()) { List tempList =3D new LinkedList(); tempList.add(server); - manager.removeServers(group, tempList, user); + manager.removeServers(group, tempList); } = // Remove custom data values (aka System->CustomInfo) diff --git a/java/code/src/com/redhat/rhn/manager/system/ServerGroupManager= .java b/java/code/src/com/redhat/rhn/manager/system/ServerGroupManager.java index 463147c..2c3c9d6 100644 --- a/java/code/src/com/redhat/rhn/manager/system/ServerGroupManager.java +++ b/java/code/src/com/redhat/rhn/manager/system/ServerGroupManager.java @@ -357,20 +357,29 @@ public class ServerGroupManager { /** * Dissociates a bunch of servers from a server group * @param sg the server group to process - * @param servers a collection of servers to deassociate = + * @param servers a collection of servers to dissociate * @param loggedInUser the loggedInUser needed for credentials */ public void removeServers(ServerGroup sg, Collection servers, = User loggedInUser)= { validateAccessCredentials(loggedInUser, sg, sg.getName()); validateAdminCredentials(loggedInUser); + removeServers(sg, servers); + } + + /** + * Dissociates a bunch of servers from a server group. + * **WARNING** This method does not validate the user's access or + * admin credentials; therefore, it should be used with caution. + * @param sg the server group to process + * @param servers a collection of servers to dissociate + */ + public void removeServers(ServerGroup sg, Collection servers) { for (Iterator itr =3D servers.iterator(); itr.hasNext();) { Server s =3D (Server) itr.next(); SystemManager.removeServerFromServerGroup(s, sg); = } - = } - = = /** * Returns the admins of a given servergroup. This list includes --===============0456303940369825267==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:19 2015 Content-Type: multipart/mixed; boundary="===============8197767690380159431==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: monitoring/nocpulse-common Date: Wed, 03 Jun 2009 14:10:57 +0000 Message-ID: <20090603141057.553A5120252@lists.fedorahosted.org> --===============8197767690380159431== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable monitoring/nocpulse-common/nocpulse-common.spec | 28 +++++++++++++++++++= +++++ 1 file changed, 28 insertions(+) New commits: commit b0601894ef93861b3a13288b754a7cae935f4079 Author: Milan Zazrivec Date: Wed Jun 3 16:06:50 2009 +0200 switch nocpulse to a system user if needed = Basically all nocpulse user accounts prior to Spacewalk were created as non-system. This needs to be changed for existing installations to be consistent. diff --git a/monitoring/nocpulse-common/nocpulse-common.spec b/monitoring/n= ocpulse-common/nocpulse-common.spec index 70c935d..75cb813 100644 --- a/monitoring/nocpulse-common/nocpulse-common.spec +++ b/monitoring/nocpulse-common/nocpulse-common.spec @@ -62,6 +62,34 @@ install -m644 perl-API/NOCpulse/test/TestConfig.pm $RPM_= BUILD_ROOT%{perl_vendorl install -m 755 npConfigValue $RPM_BUILD_ROOT%{_bindir}/ = %pre +# change nocpulse user & group to system user & group if needed +dirs=3D"/home/nocpulse /opt/notification /opt/nocpulse /var/log/nocpulse /= var/www/templates /var/tmp" + +if [ -d /home/nocpulse -a `id -u nocpulse 2> /dev/null` -ge 500 ]; then + if [ `id -g nocpulse` -ge 500 ]; then + groupmod -n nocpulse-old nocpulse + groupadd -r nocpulse + usermod -g nocpulse nocpulse + # chgrp of existing fs objects owned by previous nocpulse group + for i in $dirs; do + find $i -group nocpulse-old -exec chgrp nocpulse '{}' ';' + done + groupdel nocpulse-old + fi + + # find lowest unused system uid to change nocpulse uid to + old_uid=3D`id -u nocpulse` + useradd -r tempnoc + uid=3D`id -u tempnoc` + userdel tempnoc + usermod -u $uid nocpulse + + # chown of existing fs objects owned by previous nocpulse user + for i in $dirs; do + find $i -user $old_uid -exec chown nocpulse '{}' ';' + done +fi + getent group %{package_name} >/dev/null || groupadd -r %{package_name} getent passwd %{package_name} >/dev/null || \ useradd -r -g %{package_name} -G apache -d %{_var}/lib/%{package_name} -c = "NOCpulse user" %{package_name} --===============8197767690380159431==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:20 2015 Content-Type: multipart/mixed; boundary="===============4637500209167873122==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - monitoring/nocpulse-common Date: Wed, 03 Jun 2009 14:11:34 +0000 Message-ID: <20090603141134.E9D3B120252@lists.fedorahosted.org> --===============4637500209167873122== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable monitoring/nocpulse-common/nocpulse-common.spec | 28 +++++++++++++++++++= +++++ 1 file changed, 28 insertions(+) New commits: commit a3c7b110b276018d36a0e497fb98deab210d96a3 Author: Milan Zazrivec Date: Wed Jun 3 16:06:50 2009 +0200 switch nocpulse to a system user if needed = Basically all nocpulse user accounts prior to Spacewalk were created as non-system. This needs to be changed for existing installations to be consistent. diff --git a/monitoring/nocpulse-common/nocpulse-common.spec b/monitoring/n= ocpulse-common/nocpulse-common.spec index db15fdd..2a5085b 100644 --- a/monitoring/nocpulse-common/nocpulse-common.spec +++ b/monitoring/nocpulse-common/nocpulse-common.spec @@ -62,6 +62,34 @@ install -m644 perl-API/NOCpulse/test/TestConfig.pm $RPM_= BUILD_ROOT%{perl_vendorl install -m 755 npConfigValue $RPM_BUILD_ROOT%{_bindir}/ = %pre +# change nocpulse user & group to system user & group if needed +dirs=3D"/home/nocpulse /opt/notification /opt/nocpulse /var/log/nocpulse /= var/www/templates /var/tmp" + +if [ -d /home/nocpulse -a `id -u nocpulse 2> /dev/null` -ge 500 ]; then + if [ `id -g nocpulse` -ge 500 ]; then + groupmod -n nocpulse-old nocpulse + groupadd -r nocpulse + usermod -g nocpulse nocpulse + # chgrp of existing fs objects owned by previous nocpulse group + for i in $dirs; do + find $i -group nocpulse-old -exec chgrp nocpulse '{}' ';' + done + groupdel nocpulse-old + fi + + # find lowest unused system uid to change nocpulse uid to + old_uid=3D`id -u nocpulse` + useradd -r tempnoc + uid=3D`id -u tempnoc` + userdel tempnoc + usermod -u $uid nocpulse + + # chown of existing fs objects owned by previous nocpulse user + for i in $dirs; do + find $i -user $old_uid -exec chown nocpulse '{}' ';' + done +fi + getent group %{package_name} >/dev/null || groupadd -r %{package_name} getent passwd %{package_name} >/dev/null || \ useradd -r -g %{package_name} -G apache -d %{_var}/lib/%{package_name} -c = "NOCpulse user" %{package_name} --===============4637500209167873122==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:20 2015 Content-Type: multipart/mixed; boundary="===============2986523344464599228==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: monitoring/nocpulse-common rel-eng/packages Date: Wed, 03 Jun 2009 14:15:06 +0000 Message-ID: <20090603141506.13C8C12032E@lists.fedorahosted.org> --===============2986523344464599228== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable monitoring/nocpulse-common/nocpulse-common.spec | 5 ++++- rel-eng/packages/nocpulse-common | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 29b6856c85ba0d8b255c2af863176b7039dc1975 Author: Milan Zazrivec Date: Wed Jun 3 16:14:05 2009 +0200 Automatic commit of package [nocpulse-common] release [2.1.14-1]. diff --git a/monitoring/nocpulse-common/nocpulse-common.spec b/monitoring/n= ocpulse-common/nocpulse-common.spec index 75cb813..cccee8e 100644 --- a/monitoring/nocpulse-common/nocpulse-common.spec +++ b/monitoring/nocpulse-common/nocpulse-common.spec @@ -1,5 +1,5 @@ Name: nocpulse-common -Version: 2.1.13 +Version: 2.1.14 Release: 1%{?dist} Summary: NOCpulse common License: GPLv2 @@ -136,6 +136,9 @@ fi rm -rf $RPM_BUILD_ROOT = %changelog +* Wed Jun 03 2009 Milan Zazrivec 2.1.14-1 +- switch nocpulse to a system user if needed + * Mon May 11 2009 Milan Zazrivec 2.1.13-1 - 498257 - migrate existing files into new nocpulse homedir = diff --git a/rel-eng/packages/nocpulse-common b/rel-eng/packages/nocpulse-c= ommon index eb8b169..1edcc75 100644 --- a/rel-eng/packages/nocpulse-common +++ b/rel-eng/packages/nocpulse-common @@ -1 +1 @@ -2.1.13-1 monitoring/nocpulse-common/ +2.1.14-1 monitoring/nocpulse-common/ --===============2986523344464599228==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:20 2015 Content-Type: multipart/mixed; boundary="===============8735075718950526750==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/nocpulse-common-2.1.14-1' Date: Wed, 03 Jun 2009 14:15:17 +0000 Message-ID: <20090603141517.2E30B12032C@lists.fedorahosted.org> --===============8735075718950526750== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'nocpulse-common-2.1.14-1' created by Milan Zazrivec at 2009-06-03 14:14 +0000 Tagging package [nocpulse-common] version [2.1.14-1] in directory [monitori= ng/nocpulse-common/]. Changes since oracle-server-scripts-10.2.0-29-19: --- 0 files changed --- --===============8735075718950526750==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:20 2015 Content-Type: multipart/mixed; boundary="===============1322031992887997246==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: monitoring/NOCpulsePlugins Date: Wed, 03 Jun 2009 14:31:25 +0000 Message-ID: <20090603143125.390AB120252@lists.fedorahosted.org> --===============1322031992887997246== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable monitoring/NOCpulsePlugins/Oracle/TNSping.pm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) New commits: commit f04ed5d3cde75f9135beca831b4a5396ff78dadb Author: Miroslav Such=C3=BD Date: Wed Jun 3 16:30:30 2009 +0200 502595 - use ip instead of hostname diff --git a/monitoring/NOCpulsePlugins/Oracle/TNSping.pm b/monitoring/NOCp= ulsePlugins/Oracle/TNSping.pm index 4c21abf..7c2fc87 100644 --- a/monitoring/NOCpulsePlugins/Oracle/TNSping.pm +++ b/monitoring/NOCpulsePlugins/Oracle/TNSping.pm @@ -44,12 +44,13 @@ sub tnscmd { = my ($sendbuf) =3D pack("C*", @packet); = - my ($tns_sock) =3D IO::Socket::INET->new( + my $tns_sock =3D IO::Socket::INET->new( PeerAddr =3D> $hostname, PeerPort =3D> $port, Proto =3D> 'tcp', Type =3D> SOCK_STREAM, - Timeout =3D> $timeout) or return (-1, ''); + Timeout =3D> $timeout); + return (-1, '') unless $tns_sock; #could not connect $tns_sock->autoflush(1); = my $count =3D length($sendbuf); @@ -79,11 +80,11 @@ sub run { = my $start=3D Time::HiRes::time(); my ($code, $response)=3Dtnscmd("(CONNECT_DATA=3D(COMMAND=3Dping))", - $params{'hostname'}, $params{'port'}, $params{'timeout'}); + $params{'ip'}, $params{'port'}, $params{'timeout'}); my $time=3DTime::HiRes::time()-$start; = if ($code <=3D 0) { - $result->item_critical("Could not connect to host ", $params{'host= name'}); + $result->item_critical("Could not connect to host $params{'ip'} on= port $params{'port'}"); } elsif ($response =3D~ /\(ERR=3D\d+\)/) { $result->context("TNS Listener"); $result->metric_value('latency', $time, '%.3f'); --===============1322031992887997246==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:20 2015 Content-Type: multipart/mixed; boundary="===============1878934919718285369==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - monitoring/NOCpulsePlugins Date: Wed, 03 Jun 2009 14:32:58 +0000 Message-ID: <20090603143258.2853D120252@lists.fedorahosted.org> --===============1878934919718285369== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable monitoring/NOCpulsePlugins/Oracle/TNSping.pm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) New commits: commit 73256c087eb6aa5c1e0e0f9a7bb16d56eab1cd34 Author: Miroslav Such=C3=BD Date: Wed Jun 3 16:30:30 2009 +0200 502595 - use ip instead of hostname (cherry picked from commit f04ed5d3cde75f9135beca831b4a5396ff78dadb) diff --git a/monitoring/NOCpulsePlugins/Oracle/TNSping.pm b/monitoring/NOCp= ulsePlugins/Oracle/TNSping.pm index 4c21abf..7c2fc87 100644 --- a/monitoring/NOCpulsePlugins/Oracle/TNSping.pm +++ b/monitoring/NOCpulsePlugins/Oracle/TNSping.pm @@ -44,12 +44,13 @@ sub tnscmd { = my ($sendbuf) =3D pack("C*", @packet); = - my ($tns_sock) =3D IO::Socket::INET->new( + my $tns_sock =3D IO::Socket::INET->new( PeerAddr =3D> $hostname, PeerPort =3D> $port, Proto =3D> 'tcp', Type =3D> SOCK_STREAM, - Timeout =3D> $timeout) or return (-1, ''); + Timeout =3D> $timeout); + return (-1, '') unless $tns_sock; #could not connect $tns_sock->autoflush(1); = my $count =3D length($sendbuf); @@ -79,11 +80,11 @@ sub run { = my $start=3D Time::HiRes::time(); my ($code, $response)=3Dtnscmd("(CONNECT_DATA=3D(COMMAND=3Dping))", - $params{'hostname'}, $params{'port'}, $params{'timeout'}); + $params{'ip'}, $params{'port'}, $params{'timeout'}); my $time=3DTime::HiRes::time()-$start; = if ($code <=3D 0) { - $result->item_critical("Could not connect to host ", $params{'host= name'}); + $result->item_critical("Could not connect to host $params{'ip'} on= port $params{'port'}"); } elsif ($response =3D~ /\(ERR=3D\d+\)/) { $result->context("TNS Listener"); $result->metric_value('latency', $time, '%.3f'); --===============1878934919718285369==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:20 2015 Content-Type: multipart/mixed; boundary="===============7061639177459605548==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: backend/satellite_tools backend/spacewalk-backend.spec Date: Wed, 03 Jun 2009 14:50:54 +0000 Message-ID: <20090603145054.15CB0120252@lists.fedorahosted.org> --===============7061639177459605548== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/satellite_tools/rhn-db-stats.sgml | 81 +++++++++++++++++++++++++= +++++ backend/spacewalk-backend.spec | 1 = 2 files changed, 82 insertions(+) New commits: commit 86a2d74eba61652e9e1116354f7410eaa1d4132d Author: Milan Zazrivec Date: Wed Jun 3 16:48:16 2009 +0200 add rhn-db-stats manual page diff --git a/backend/satellite_tools/rhn-db-stats.sgml b/backend/satellite_= tools/rhn-db-stats.sgml new file mode 100644 index 0000000..ac07a3d --- /dev/null +++ b/backend/satellite_tools/rhn-db-stats.sgml @@ -0,0 +1,81 @@ + + + +]> + + + +&THECOMMAND;8 +Version 1.0.0 + + + +&THECOMMAND; + +utility for querying important database parameters used by + Satellite / Spacewalk. + + + + + + + &THECOMMAND; + output-file + db-conect-string + + + + +Description + + +rhn-db-stats retrieves important statistics and parameters from Oracle dat= abase +used by your Satellite / Spacewalk installation. It is used by spacewalk-d= ebug +(satellite-debug) or it can be used standalone. + + + + +Options + + + output-file + + File name to save the retrieved information to. + + + + db-connect-string + + Connection string to your Oracle database. + + + + + +Files + + /usr/bin/&THECOMMAND; + + + +Example + + &THECOMMAND; database.log + + + +See Also + + spacewalk-debug(8) + + + +Authors + + Milan Zazrivec mzazrivec(a)redhat.com + + + diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 3afe932..6982648 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -540,6 +540,7 @@ rm -f %{rhnconf}/rhnSecret.py* %{_mandir}/man8/rhn-satellite-activate.8* %{_mandir}/man8/rhn-schema-version.8* %{_mandir}/man8/rhn-ssl-dbstore.8* +%{_mandir}/man8/rhn-db-stats.8* %{_mandir}/man8/satellite-sync.8* %{_mandir}/man8/spacewalk-debug.8* %{_mandir}/man8/satpasswd.8* --===============7061639177459605548==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:20 2015 Content-Type: multipart/mixed; boundary="===============5827391004985754874==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - backend/satellite_tools backend/spacewalk-backend.spec Date: Wed, 03 Jun 2009 14:51:27 +0000 Message-ID: <20090603145127.32226120252@lists.fedorahosted.org> --===============5827391004985754874== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/satellite_tools/rhn-db-stats.sgml | 81 +++++++++++++++++++++++++= +++++ backend/spacewalk-backend.spec | 1 = 2 files changed, 82 insertions(+) New commits: commit 439fcb2f84ebdbb4d475c838f2be80dc43c53aeb Author: Milan Zazrivec Date: Wed Jun 3 16:48:16 2009 +0200 add rhn-db-stats manual page diff --git a/backend/satellite_tools/rhn-db-stats.sgml b/backend/satellite_= tools/rhn-db-stats.sgml new file mode 100644 index 0000000..ac07a3d --- /dev/null +++ b/backend/satellite_tools/rhn-db-stats.sgml @@ -0,0 +1,81 @@ + + + +]> + + + +&THECOMMAND;8 +Version 1.0.0 + + + +&THECOMMAND; + +utility for querying important database parameters used by + Satellite / Spacewalk. + + + + + + + &THECOMMAND; + output-file + db-conect-string + + + + +Description + + +rhn-db-stats retrieves important statistics and parameters from Oracle dat= abase +used by your Satellite / Spacewalk installation. It is used by spacewalk-d= ebug +(satellite-debug) or it can be used standalone. + + + + +Options + + + output-file + + File name to save the retrieved information to. + + + + db-connect-string + + Connection string to your Oracle database. + + + + + +Files + + /usr/bin/&THECOMMAND; + + + +Example + + &THECOMMAND; database.log + + + +See Also + + spacewalk-debug(8) + + + +Authors + + Milan Zazrivec mzazrivec(a)redhat.com + + + diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 2b70f74..630dfe0 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -540,6 +540,7 @@ rm -f %{rhnconf}/rhnSecret.py* %{_mandir}/man8/rhn-satellite-activate.8* %{_mandir}/man8/rhn-schema-version.8* %{_mandir}/man8/rhn-ssl-dbstore.8* +%{_mandir}/man8/rhn-db-stats.8* %{_mandir}/man8/satellite-sync.8* %{_mandir}/man8/spacewalk-debug.8* %{_mandir}/man8/satpasswd.8* --===============5827391004985754874==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:20 2015 Content-Type: multipart/mixed; boundary="===============7255393133616520474==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Wed, 03 Jun 2009 15:07:17 +0000 Message-ID: <20090603150717.814EF120252@lists.fedorahosted.org> --===============7255393133616520474== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java = | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 625d41b5361289639ef75654d2a36126772972fc Author: Justin Sherrill Date: Wed Jun 3 10:54:18 2009 -0400 checkstyle fix diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManag= erTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelMana= gerTest.java index 7818c97..35a4441 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java +++ b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java @@ -39,7 +39,6 @@ import com.redhat.rhn.domain.server.ServerFactory; import com.redhat.rhn.domain.server.VirtualInstance; import com.redhat.rhn.domain.server.test.ServerFactoryTest; import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.frontend.action.user.AdminUserEditAction; import com.redhat.rhn.frontend.dto.ChannelOverview; import com.redhat.rhn.frontend.dto.ErrataOverview; import com.redhat.rhn.frontend.dto.EssentialChannelDto; @@ -801,7 +800,8 @@ public class ChannelManagerTest extends BaseTestCaseWit= hUser { set.add(ce.getId()); RhnSetManager.store(set); = - List result =3D ChannelManager.listErrataPackage= sForResync(cchan, user, set.getLabel()); + List result =3D ChannelManager.listErrataPackage= sForResync( + cchan, user, set.getLabel= ()); assertTrue(result.size() =3D=3D 1); = assertEquals(result.get(0).getId(), testPackage.getId()); --===============7255393133616520474==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:20 2015 Content-Type: multipart/mixed; boundary="===============7944853103765270728==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Wed, 03 Jun 2009 15:07:32 +0000 Message-ID: <20090603150732.C165E120252@lists.fedorahosted.org> --===============7944853103765270728== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java = | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit d684613913bd6d9095905fec8c5faf9dfdcaeb98 Author: Justin Sherrill Date: Wed Jun 3 10:54:18 2009 -0400 checkstyle fix diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManag= erTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelMana= gerTest.java index 7818c97..35a4441 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java +++ b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java @@ -39,7 +39,6 @@ import com.redhat.rhn.domain.server.ServerFactory; import com.redhat.rhn.domain.server.VirtualInstance; import com.redhat.rhn.domain.server.test.ServerFactoryTest; import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.frontend.action.user.AdminUserEditAction; import com.redhat.rhn.frontend.dto.ChannelOverview; import com.redhat.rhn.frontend.dto.ErrataOverview; import com.redhat.rhn.frontend.dto.EssentialChannelDto; @@ -801,7 +800,8 @@ public class ChannelManagerTest extends BaseTestCaseWit= hUser { set.add(ce.getId()); RhnSetManager.store(set); = - List result =3D ChannelManager.listErrataPackage= sForResync(cchan, user, set.getLabel()); + List result =3D ChannelManager.listErrataPackage= sForResync( + cchan, user, set.getLabel= ()); assertTrue(result.size() =3D=3D 1); = assertEquals(result.get(0).getId(), testPackage.getId()); --===============7944853103765270728==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:20 2015 Content-Type: multipart/mixed; boundary="===============8863089896382249783==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: spacewalk/setup Date: Wed, 03 Jun 2009 15:22:20 +0000 Message-ID: <20090603152220.C372612032C@lists.fedorahosted.org> --===============8863089896382249783== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl | 8 -------- 1 file changed, 8 deletions(-) New commits: commit 4e442cd7edec5eb432a8d964bcfb11068d0cd4f8 Author: Milan Zazrivec Date: Wed Jun 3 17:17:55 2009 +0200 no need to enable Monitoring + MonitoringScout explicitly = Since Spacewalk 0.3, this is being done by spacewalk-setup during upgrade (Spacewalk::Setup::setup_services). diff --git a/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl b/space= walk/setup/share/upgrade/rhn-enable-monitoring.pl index dcebaab..61b1ef1 100644 --- a/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl +++ b/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl @@ -46,9 +46,6 @@ my $db_connect =3D RHN::SatInstall->test_db_connection(); die "Could not connect to the database" unless $db_connect; = -print "Setting up Monitoring backend\n"; -RHN::SatInstall->setup_monitoring_sysv_step('Monitoring'); - my $scout_shared_key =3D find_scout_key(); my $hostname =3D Sys::Hostname::hostname; = @@ -75,11 +72,6 @@ unless ($scout_shared_key) { } } = -if ($opts{"enable-scout"}) { - print "Setting up Monitoring scout\n"; - RHN::SatInstall->setup_monitoring_sysv_step('MonitoringScout'); -} - my ($db_user, $db_pass, $db_name) =3D split_dsn(PXT::Config->get('default_= db')); = my %config_opts; --===============8863089896382249783==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:20 2015 Content-Type: multipart/mixed; boundary="===============5225867653946814640==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - spacewalk/setup Date: Wed, 03 Jun 2009 15:23:01 +0000 Message-ID: <20090603152301.9FF89120252@lists.fedorahosted.org> --===============5225867653946814640== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl | 8 -------- 1 file changed, 8 deletions(-) New commits: commit 843583d37d9ebc2b21131d97a7b1b64856dabce8 Author: Milan Zazrivec Date: Wed Jun 3 17:17:55 2009 +0200 no need to enable Monitoring + MonitoringScout explicitly = Since Spacewalk 0.3, this is being done by spacewalk-setup during upgrade (Spacewalk::Setup::setup_services). diff --git a/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl b/space= walk/setup/share/upgrade/rhn-enable-monitoring.pl index dcebaab..61b1ef1 100644 --- a/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl +++ b/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl @@ -46,9 +46,6 @@ my $db_connect =3D RHN::SatInstall->test_db_connection(); die "Could not connect to the database" unless $db_connect; = -print "Setting up Monitoring backend\n"; -RHN::SatInstall->setup_monitoring_sysv_step('Monitoring'); - my $scout_shared_key =3D find_scout_key(); my $hostname =3D Sys::Hostname::hostname; = @@ -75,11 +72,6 @@ unless ($scout_shared_key) { } } = -if ($opts{"enable-scout"}) { - print "Setting up Monitoring scout\n"; - RHN::SatInstall->setup_monitoring_sysv_step('MonitoringScout'); -} - my ($db_user, $db_pass, $db_name) =3D split_dsn(PXT::Config->get('default_= db')); = my %config_opts; --===============5225867653946814640==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:20 2015 Content-Type: multipart/mixed; boundary="===============6772627677342048220==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Wed, 03 Jun 2009 15:32:17 +0000 Message-ID: <20090603153217.4CDD1120252@lists.fedorahosted.org> --===============6772627677342048220== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml = | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 686969bf42523a88fe79d58f31606e5ba461f18f Author: Justin Sherrill Date: Wed Jun 3 11:31:36 2009 -0400 502905 - fixing issue where non virt kickstarts would show up on virt p= rovisioning page diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_= queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General= _queries.xml index 827b90a..1c82147 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries= .xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries= .xml @@ -69,7 +69,7 @@ ORDER BY KS.label, KS.id AND KT.channel_id =3D C.id AND ( C.channel_arch_id =3D :prim_arch_id OR C.channel_arch_id =3D :s= ec_arch_id ) AND KSD.virtualization_type =3D KVT.id - AND KVT.label not in ('auto','para_host') + AND KVT.label not in ('none','para_host') ORDER BY KS.label, KS.id = --===============6772627677342048220==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:20 2015 Content-Type: multipart/mixed; boundary="===============1169704682836612253==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Wed, 03 Jun 2009 15:35:56 +0000 Message-ID: <20090603153556.56288120252@lists.fedorahosted.org> --===============1169704682836612253== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml = | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2bbe04a810087f247cbaaab4e83fce83dfd81eea Author: Justin Sherrill Date: Wed Jun 3 11:31:36 2009 -0400 502905 - fixing issue where non virt kickstarts would show up on virt p= rovisioning page diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_= queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General= _queries.xml index 827b90a..1c82147 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries= .xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries= .xml @@ -69,7 +69,7 @@ ORDER BY KS.label, KS.id AND KT.channel_id =3D C.id AND ( C.channel_arch_id =3D :prim_arch_id OR C.channel_arch_id =3D :s= ec_arch_id ) AND KSD.virtualization_type =3D KVT.id - AND KVT.label not in ('auto','para_host') + AND KVT.label not in ('none','para_host') ORDER BY KS.label, KS.id = --===============1169704682836612253==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:20 2015 Content-Type: multipart/mixed; boundary="===============0541289207317487304==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Wed, 03 Jun 2009 15:39:11 +0000 Message-ID: <20090603153911.D66CD120252@lists.fedorahosted.org> --===============0541289207317487304== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.ja= va | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) New commits: commit fd6fcd79e5efcd6401fad67c87a95e4b04e17e5c Author: Brad Buckingham Date: Wed Jun 3 11:38:23 2009 -0400 503642 - update KickstartScheduleCommand to store action id after the a= ction has been saved to the db = This change was needed to address a null pointer exception that occured whenever a user would execute the XMLRPC API system.provisionSystem. = In the past, the Action was saved immediately following scheduleKicksta= rtAction;however, in a commit earlier in the release, this save was moved f= urther down in the logic. This is Ok; however, the logic which stored the action i= d in the object (i.e. this.kickstartActionId) was not moved. As a result, t= he action id was stored as null, because the action id does not exist until the Action is saved to the database. diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSchedu= leCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSc= heduleCommand.java index 36a9a59..28bf6a5 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java @@ -573,10 +573,6 @@ public class KickstartScheduleCommand extends BaseSyst= emOperation { Action kickstartAction =3D this.scheduleKickstartAction(packageAct= ion); ActionFactory.save(packageAction); = - = - this.kickstartActionId =3D kickstartAction.getId(); - log.debug("** Created ksaction: " + kickstartAction.getId()); - = scheduleRebootAction(kickstartAction); = String host =3D this.getKickstartServerName(); @@ -613,7 +609,6 @@ public class KickstartScheduleCommand extends BaseSyste= mOperation { } = } = - SystemRecord rec =3D SystemRecord.lookupById(CobblerXMLRPCHelper.g= etConnection( this.getUser().getLogin()), this.getServer().getCobblerId(= )); = @@ -625,8 +620,10 @@ public class KickstartScheduleCommand extends BaseSyst= emOperation { setCobblerSystemName(r= ec.getName()); } = - = ActionFactory.save(kickstartAction); + log.debug("** Created ksaction: " + kickstartAction.getId()); + + this.kickstartActionId =3D kickstartAction.getId(); = log.debug("** Done scheduling kickstart session"); return null; --===============0541289207317487304==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:20 2015 Content-Type: multipart/mixed; boundary="===============6241366482123130244==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Wed, 03 Jun 2009 15:41:15 +0000 Message-ID: <20090603154115.9D9A6120252@lists.fedorahosted.org> --===============6241366482123130244== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.ja= va | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) New commits: commit 38ceef06c4f1180b4ded22a792e4e887427ed406 Author: Brad Buckingham Date: Wed Jun 3 11:38:23 2009 -0400 503642 - update KickstartScheduleCommand to store action id after the a= ction has been saved to the db = This change was needed to address a null pointer exception that occured whenever a user would execute the XMLRPC API system.provisionSystem. = In the past, the Action was saved immediately following scheduleKicksta= rtAction;however, in a commit earlier in the release, this save was moved f= urther down in the logic. This is Ok; however, the logic which stored the action i= d in the object (i.e. this.kickstartActionId) was not moved. As a result, t= he action id was stored as null, because the action id does not exist until the Action is saved to the database. diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSchedu= leCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSc= heduleCommand.java index 36a9a59..28bf6a5 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java @@ -573,10 +573,6 @@ public class KickstartScheduleCommand extends BaseSyst= emOperation { Action kickstartAction =3D this.scheduleKickstartAction(packageAct= ion); ActionFactory.save(packageAction); = - = - this.kickstartActionId =3D kickstartAction.getId(); - log.debug("** Created ksaction: " + kickstartAction.getId()); - = scheduleRebootAction(kickstartAction); = String host =3D this.getKickstartServerName(); @@ -613,7 +609,6 @@ public class KickstartScheduleCommand extends BaseSyste= mOperation { } = } = - SystemRecord rec =3D SystemRecord.lookupById(CobblerXMLRPCHelper.g= etConnection( this.getUser().getLogin()), this.getServer().getCobblerId(= )); = @@ -625,8 +620,10 @@ public class KickstartScheduleCommand extends BaseSyst= emOperation { setCobblerSystemName(r= ec.getName()); } = - = ActionFactory.save(kickstartAction); + log.debug("** Created ksaction: " + kickstartAction.getId()); + + this.kickstartActionId =3D kickstartAction.getId(); = log.debug("** Done scheduling kickstart session"); return null; --===============6241366482123130244==-- From shughes at fedoraproject.org Thu Aug 20 11:57:20 2015 Content-Type: multipart/mixed; boundary="===============8535763646905797397==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: web/html Date: Wed, 03 Jun 2009 17:54:47 +0000 Message-ID: <20090603175447.15229120252@lists.fedorahosted.org> --===============8535763646905797397== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable web/html/network/systems/details/hardware.pxt | 24 +++++++++++++++++++++= +++ 1 file changed, 24 insertions(+) New commits: commit bc4aa9ff57bf9943508b629004b5d8ad206ad426 Author: Shannon Hughes Date: Wed Jun 3 13:49:00 2009 -0400 197294 - add hardware report support for CAPTURE cards diff --git a/web/html/network/systems/details/hardware.pxt b/web/html/netwo= rk/systems/details/hardware.pxt index d944472..bf15eea 100644 --- a/web/html/network/systems/details/hardware.pxt +++ b/web/html/network/systems/details/hardware.pxt @@ -243,6 +243,30 @@ = + +

                                      CAPTURE

                                      + + + + + + + + + + + + + + + + + + + +
                                      DescriptionBusVendorDriver
                                      {capture_description}{capture_bus}{capture_vendorstring}{capture_driver}
                                      +
                                      +

                                      Misc

                                      = --===============8535763646905797397==-- From shughes at fedoraproject.org Thu Aug 20 11:57:21 2015 Content-Type: multipart/mixed; boundary="===============3127428260612405046==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - web/html Date: Wed, 03 Jun 2009 18:13:44 +0000 Message-ID: <20090603181344.5B10C120252@lists.fedorahosted.org> --===============3127428260612405046== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable web/html/network/systems/details/hardware.pxt | 24 +++++++++++++++++++++= +++ 1 file changed, 24 insertions(+) New commits: commit ee752edd279724c73fb16931f94bafb82c95d997 Author: Shannon Hughes Date: Wed Jun 3 13:49:00 2009 -0400 197294 - add hardware report support for CAPTURE cards diff --git a/web/html/network/systems/details/hardware.pxt b/web/html/netwo= rk/systems/details/hardware.pxt index d944472..bf15eea 100644 --- a/web/html/network/systems/details/hardware.pxt +++ b/web/html/network/systems/details/hardware.pxt @@ -243,6 +243,30 @@
                                      = + +

                                      CAPTURE

                                      + + + + + + + + + + + + + + + + + + + +
                                      DescriptionBusVendorDriver
                                      {capture_description}{capture_bus}{capture_vendorstring}{capture_driver}
                                      +
                                      +

                                      Misc

                                      = --===============3127428260612405046==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:21 2015 Content-Type: multipart/mixed; boundary="===============5723476489356267555==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: client/rhel Date: Wed, 03 Jun 2009 18:34:11 +0000 Message-ID: <20090603183411.62C00120252@lists.fedorahosted.org> --===============5723476489356267555== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/rhel/rhnsd/rhnsd.init | 2 +- client/rhel/rhnsd/rhnsd.spec | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) New commits: commit f38d9b72ed72e05a50c5c22b3441ffef334d0545 Author: Pradeep Kilambi Date: Wed Jun 3 14:34:04 2009 -0400 243699: fixing the error code when unknown command is used with rhnsd i= nit diff --git a/client/rhel/rhnsd/rhnsd.init b/client/rhel/rhnsd/rhnsd.init index e5143de..b98e004 100644 --- a/client/rhel/rhnsd/rhnsd.init +++ b/client/rhel/rhnsd/rhnsd.init @@ -78,6 +78,6 @@ case "$1" in ;; *) echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}" - ;; + exit 1 esac exit $RETVAL diff --git a/client/rhel/rhnsd/rhnsd.spec b/client/rhel/rhnsd/rhnsd.spec index e4fe44c..d3bab98 100644 --- a/client/rhel/rhnsd/rhnsd.spec +++ b/client/rhel/rhnsd/rhnsd.spec @@ -58,6 +58,9 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man8/rhnsd.8* = %changelog +* Wed Jun 3 2009 Pradeep Kilambi 4.7.0-3 +- Resolves: #243699 -fixing error code for unknown command to rhnsd init = script + * Mon May 11 2009 Pradeep Kilambi 4.7.0-2 - Updated translations. - Resolves: #243699 --===============5723476489356267555==-- From jdob at fedoraproject.org Thu Aug 20 11:57:21 2015 Content-Type: multipart/mixed; boundary="===============7888384714050100145==" MIME-Version: 1.0 From: jdob To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Wed, 03 Jun 2009 20:00:30 +0000 Message-ID: <20090603200030.B1128120252@lists.fedorahosted.org> --===============7888384714050100145== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupActi= on.java | 117 ++++------ 1 file changed, 49 insertions(+), 68 deletions(-) New commits: commit 81a911525f938b5599fcd7f38017d7ecae1b5d6b Author: Jason Dobies Date: Wed Jun 3 15:55:39 2009 -0400 495594, 504012 - Fixed issue where invert flag disappeared on paginatio= n; fixed ISE when search produces no results. = Also general clean up of the class. diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSea= rchSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/= SystemSearchSetupAction.java index 80f74b0..6c25cb5 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetu= pAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetu= pAction.java @@ -16,7 +16,6 @@ package com.redhat.rhn.frontend.action.systems; = import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.frontend.action.common.BadParameterException; import com.redhat.rhn.frontend.dto.SystemSearchResult; import com.redhat.rhn.frontend.struts.RequestContext; @@ -55,12 +54,10 @@ import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcFault; = /** - * SystemSearchAction extends RhnAction - Class representation of the tabl= e ###TABLE###. - * @version $Rev: 1 $ + * Action handling the advanced system search page. */ public class SystemSearchSetupAction extends RhnAction implements Listable= { - private static Logger log =3D Logger.getLogger(SystemSearchSetupAction= .class); - + = public static final String LIST_NAME =3D "pageList"; public static final String DATA_SET =3D "searchResults"; = @@ -133,6 +130,8 @@ public class SystemSearchSetupAction extends RhnAction = implements Listable { = private static final String FORM =3D "FORM"; private static final String MAPPING =3D "MAPPING"; + = + private final Logger log =3D Logger.getLogger(SystemSearchSetupAction.= class); = /** {@inheritDoc} */ public ActionForward execute(ActionMapping mapping, @@ -153,12 +152,26 @@ public class SystemSearchSetupAction extends RhnActio= n implements Listable { if (ListTagHelper.getListAction(getListName(), request) !=3D null = || = (!isSubmitted(daForm) && request.getParameter(VIEW_MODE) !=3D null)) { + + String whereToSearch =3D daForm.getString(WHERE_TO_SEARCH); + Boolean invertResults =3D (Boolean) daForm.get(INVERT_RESULTS); + + if (invertResults =3D=3D null) { + invertResults =3D Boolean.FALSE; + } = request.setAttribute(VIEW_MODE, request.getParameter(VIEW_MODE= )); request.setAttribute(SEARCH_STRING, request.getParameter(SEARC= H_STRING)); - setupForm(request, daForm, request.getParameter(VIEW_MODE)); - = + request.setAttribute(WHERE_TO_SEARCH, whereToSearch); + + if (invertResults) { + request.setAttribute(INVERT_RESULTS, "on"); + } + else { + request.setAttribute(INVERT_RESULTS, "off"); + } = = + setupForm(request, daForm, request.getParameter(VIEW_MODE)); = ListRhnSetHelper helper =3D new ListRhnSetHelper(this, = request, RhnSetDecl.SYSTEMS); @@ -168,7 +181,8 @@ public class SystemSearchSetupAction extends RhnAction = implements Listable { helper.execute(); = List results =3D (List)request.getAttribute(getDataSetName()); - log.info("SystemSearch results.size() =3D " + results.size()); + log.info("SystemSearch results.size() =3D " + + (results !=3D null ? results.size() : "null results")); if ((results !=3D null) && (results.size() =3D=3D 1)) { SystemSearchResult s =3D (SystemSearchResult) results.get= (0); Double score =3D s.getScore(); @@ -195,8 +209,7 @@ public class SystemSearchSetupAction extends RhnAction = implements Listable { } return getStrutsDelegate().forwardParams( mapping.findForward("default"), - request.getParameterMap()); - = + request.getParameterMap()); = } /** * Else the form was submitted, so we need to parse the form and t= urn it into = @@ -208,6 +221,10 @@ public class SystemSearchSetupAction extends RhnAction= implements Listable { String whereToSearch =3D daForm.getString(WHERE_TO_SEARCH); Boolean invertResults =3D (Boolean) daForm.get(INVERT_RESULTS); = + if (invertResults =3D=3D null) { + invertResults =3D Boolean.FALSE; + } + = setupForm(request, daForm, viewMode); if (whereToSearch =3D=3D null || viewMode =3D=3D null) { throw new BadParameterException("An expected form var was = null"); @@ -215,18 +232,25 @@ public class SystemSearchSetupAction extends RhnActio= n implements Listable { = request.setAttribute(SEARCH_STRING, searchString); request.setAttribute(VIEW_MODE, viewMode); - request.setAttribute(INVERT_RESULTS, invertResults); request.setAttribute(WHERE_TO_SEARCH, whereToSearch); + = + if (invertResults) { + request.setAttribute(INVERT_RESULTS, "on"); + } + else { + request.setAttribute(INVERT_RESULTS, "off"); + } + = ActionErrors errs =3D new ActionErrors(); if (viewMode.equals("systemsearch_id") || - viewMode.equals(SystemSearchHelper.CPU_MHZ_LT) || - viewMode.equals(SystemSearchHelper.CPU_MHZ_GT) || - viewMode.equals(SystemSearchHelper.RAM_LT) || - viewMode.equals(SystemSearchHelper.RAM_GT) || - viewMode.equals(SystemSearchHelper.NUM_CPUS_LT) || - viewMode.equals(SystemSearchHelper.NUM_CPUS_GT) || - viewMode.equals(SystemSearchHelper.CHECKIN) || - viewMode.equals(SystemSearchHelper.REGISTERED)) { + viewMode.equals(SystemSearchHelper.CPU_MHZ_LT) || + viewMode.equals(SystemSearchHelper.CPU_MHZ_GT) || + viewMode.equals(SystemSearchHelper.RAM_LT) || + viewMode.equals(SystemSearchHelper.RAM_GT) || + viewMode.equals(SystemSearchHelper.NUM_CPUS_LT) || + viewMode.equals(SystemSearchHelper.NUM_CPUS_GT) || + viewMode.equals(SystemSearchHelper.CHECKIN) || + viewMode.equals(SystemSearchHelper.REGISTERED)) { String regEx =3D "(\\d)*"; Pattern pattern =3D Pattern.compile(regEx); Matcher matcher =3D pattern.matcher(searchString); @@ -276,8 +300,6 @@ public class SystemSearchSetupAction extends RhnAction = implements Listable { } = } - - = protected void setupForm(HttpServletRequest request, = DynaActionForm form, = @@ -314,11 +336,9 @@ public class SystemSearchSetupAction extends RhnAction= implements Listable { request.setAttribute("optGroupsKeys", optGroupsMap.keySet()); } = - protected DataResult performSearch(RequestContext context) { = HttpServletRequest request =3D context.getRequest(); - ActionMapping mapping =3D (ActionMapping) request.getAttribute(MAP= PING); String searchString =3D context.getParam(SEARCH_STRING, false); String viewMode =3D context.getParam(VIEW_MODE, false); String whereToSearch =3D context.getParam(WHERE_TO_SEARCH, false); @@ -390,55 +410,30 @@ public class SystemSearchSetupAction extends RhnActio= n implements Listable { * @return Returns the map. */ private Map createDisplayMap(String display, String value) { - Map selection =3D new HashMap(); + Map selection =3D new HashMap(); selection.put("display", display); selection.put("value", value); return selection; } = - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ public String getListName() { return LIST_NAME; } = - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ public String getDataSetName() { return DATA_SET; } = - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ public String getDecl(RequestContext context) { return RhnSetDecl.SYSTEMS.getLabel(); } = - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ public List getResult(RequestContext context) { - /*String cachedName =3D makeKey(context); - List result =3D (List)context.getRequest().getSession().getAttribu= te(cachedName); - if (result !=3D null) { - return result; - }*/ - - /* - DynaActionForm daForm =3D (DynaActionForm) context.getRequest().ge= tAttribute(FORM); - String searchString =3D daForm.getString(SEARCH_STRING); - String viewMode =3D daForm.getString(VIEW_MODE); - String whereToSearch =3D daForm.getString(WHERE_TO_SEARCH); - Boolean invertResults =3D (Boolean) daForm.get(INVERT_RESULTS); */ - = String searchString =3D context.getParam(SEARCH_STRING, false); - String viewMode =3D context.getParam(VIEW_MODE, false); - String whereToSearch =3D context.getParam(WHERE_TO_SEARCH, false); - Boolean invertResults =3D StringUtils.defaultString( - context.getParam(INVERT_RESULTS, false)).equals("on"); = if (!StringUtils.isBlank(searchString)) { log.info("SystemSearchSetupAction.getResult() calling performS= earch()"); @@ -448,21 +443,7 @@ public class SystemSearchSetupAction extends RhnAction= implements Listable { return Collections.EMPTY_LIST; } = - private String makeKey(RequestContext context) { - DynaActionForm daForm =3D (DynaActionForm) context.getRequest().ge= tAttribute(FORM); - String searchString =3D daForm.getString(SEARCH_STRING); - String viewMode =3D daForm.getString(VIEW_MODE); - String whereToSearch =3D daForm.getString(WHERE_TO_SEARCH); - Boolean invertResults =3D (Boolean) daForm.get(INVERT_RESULTS); - - return StringUtil.toJson(new Object [] { - searchString, viewMode, whereToSearch, invertResults - }); - } - - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ public String getParentUrl(RequestContext context) { return context.getRequest().getRequestURI(); } --===============7888384714050100145==-- From jdob at fedoraproject.org Thu Aug 20 11:57:21 2015 Content-Type: multipart/mixed; boundary="===============2118239466198462874==" MIME-Version: 1.0 From: jdob To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Wed, 03 Jun 2009 20:01:12 +0000 Message-ID: <20090603200112.EDFE1120252@lists.fedorahosted.org> --===============2118239466198462874== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupActi= on.java | 117 ++++------ 1 file changed, 49 insertions(+), 68 deletions(-) New commits: commit 2707ef1ba06708257ac78eb3d5bc51a6a31e3a57 Author: Jason Dobies Date: Wed Jun 3 15:55:39 2009 -0400 495594, 504012 - Fixed issue where invert flag disappeared on paginatio= n; fixed ISE when search produces no results. = Also general clean up of the class. diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSea= rchSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/= SystemSearchSetupAction.java index 80f74b0..6c25cb5 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetu= pAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetu= pAction.java @@ -16,7 +16,6 @@ package com.redhat.rhn.frontend.action.systems; = import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.frontend.action.common.BadParameterException; import com.redhat.rhn.frontend.dto.SystemSearchResult; import com.redhat.rhn.frontend.struts.RequestContext; @@ -55,12 +54,10 @@ import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcFault; = /** - * SystemSearchAction extends RhnAction - Class representation of the tabl= e ###TABLE###. - * @version $Rev: 1 $ + * Action handling the advanced system search page. */ public class SystemSearchSetupAction extends RhnAction implements Listable= { - private static Logger log =3D Logger.getLogger(SystemSearchSetupAction= .class); - + = public static final String LIST_NAME =3D "pageList"; public static final String DATA_SET =3D "searchResults"; = @@ -133,6 +130,8 @@ public class SystemSearchSetupAction extends RhnAction = implements Listable { = private static final String FORM =3D "FORM"; private static final String MAPPING =3D "MAPPING"; + = + private final Logger log =3D Logger.getLogger(SystemSearchSetupAction.= class); = /** {@inheritDoc} */ public ActionForward execute(ActionMapping mapping, @@ -153,12 +152,26 @@ public class SystemSearchSetupAction extends RhnActio= n implements Listable { if (ListTagHelper.getListAction(getListName(), request) !=3D null = || = (!isSubmitted(daForm) && request.getParameter(VIEW_MODE) !=3D null)) { + + String whereToSearch =3D daForm.getString(WHERE_TO_SEARCH); + Boolean invertResults =3D (Boolean) daForm.get(INVERT_RESULTS); + + if (invertResults =3D=3D null) { + invertResults =3D Boolean.FALSE; + } = request.setAttribute(VIEW_MODE, request.getParameter(VIEW_MODE= )); request.setAttribute(SEARCH_STRING, request.getParameter(SEARC= H_STRING)); - setupForm(request, daForm, request.getParameter(VIEW_MODE)); - = + request.setAttribute(WHERE_TO_SEARCH, whereToSearch); + + if (invertResults) { + request.setAttribute(INVERT_RESULTS, "on"); + } + else { + request.setAttribute(INVERT_RESULTS, "off"); + } = = + setupForm(request, daForm, request.getParameter(VIEW_MODE)); = ListRhnSetHelper helper =3D new ListRhnSetHelper(this, = request, RhnSetDecl.SYSTEMS); @@ -168,7 +181,8 @@ public class SystemSearchSetupAction extends RhnAction = implements Listable { helper.execute(); = List results =3D (List)request.getAttribute(getDataSetName()); - log.info("SystemSearch results.size() =3D " + results.size()); + log.info("SystemSearch results.size() =3D " + + (results !=3D null ? results.size() : "null results")); if ((results !=3D null) && (results.size() =3D=3D 1)) { SystemSearchResult s =3D (SystemSearchResult) results.get= (0); Double score =3D s.getScore(); @@ -195,8 +209,7 @@ public class SystemSearchSetupAction extends RhnAction = implements Listable { } return getStrutsDelegate().forwardParams( mapping.findForward("default"), - request.getParameterMap()); - = + request.getParameterMap()); = } /** * Else the form was submitted, so we need to parse the form and t= urn it into = @@ -208,6 +221,10 @@ public class SystemSearchSetupAction extends RhnAction= implements Listable { String whereToSearch =3D daForm.getString(WHERE_TO_SEARCH); Boolean invertResults =3D (Boolean) daForm.get(INVERT_RESULTS); = + if (invertResults =3D=3D null) { + invertResults =3D Boolean.FALSE; + } + = setupForm(request, daForm, viewMode); if (whereToSearch =3D=3D null || viewMode =3D=3D null) { throw new BadParameterException("An expected form var was = null"); @@ -215,18 +232,25 @@ public class SystemSearchSetupAction extends RhnActio= n implements Listable { = request.setAttribute(SEARCH_STRING, searchString); request.setAttribute(VIEW_MODE, viewMode); - request.setAttribute(INVERT_RESULTS, invertResults); request.setAttribute(WHERE_TO_SEARCH, whereToSearch); + = + if (invertResults) { + request.setAttribute(INVERT_RESULTS, "on"); + } + else { + request.setAttribute(INVERT_RESULTS, "off"); + } + = ActionErrors errs =3D new ActionErrors(); if (viewMode.equals("systemsearch_id") || - viewMode.equals(SystemSearchHelper.CPU_MHZ_LT) || - viewMode.equals(SystemSearchHelper.CPU_MHZ_GT) || - viewMode.equals(SystemSearchHelper.RAM_LT) || - viewMode.equals(SystemSearchHelper.RAM_GT) || - viewMode.equals(SystemSearchHelper.NUM_CPUS_LT) || - viewMode.equals(SystemSearchHelper.NUM_CPUS_GT) || - viewMode.equals(SystemSearchHelper.CHECKIN) || - viewMode.equals(SystemSearchHelper.REGISTERED)) { + viewMode.equals(SystemSearchHelper.CPU_MHZ_LT) || + viewMode.equals(SystemSearchHelper.CPU_MHZ_GT) || + viewMode.equals(SystemSearchHelper.RAM_LT) || + viewMode.equals(SystemSearchHelper.RAM_GT) || + viewMode.equals(SystemSearchHelper.NUM_CPUS_LT) || + viewMode.equals(SystemSearchHelper.NUM_CPUS_GT) || + viewMode.equals(SystemSearchHelper.CHECKIN) || + viewMode.equals(SystemSearchHelper.REGISTERED)) { String regEx =3D "(\\d)*"; Pattern pattern =3D Pattern.compile(regEx); Matcher matcher =3D pattern.matcher(searchString); @@ -276,8 +300,6 @@ public class SystemSearchSetupAction extends RhnAction = implements Listable { } = } - - = protected void setupForm(HttpServletRequest request, = DynaActionForm form, = @@ -314,11 +336,9 @@ public class SystemSearchSetupAction extends RhnAction= implements Listable { request.setAttribute("optGroupsKeys", optGroupsMap.keySet()); } = - protected DataResult performSearch(RequestContext context) { = HttpServletRequest request =3D context.getRequest(); - ActionMapping mapping =3D (ActionMapping) request.getAttribute(MAP= PING); String searchString =3D context.getParam(SEARCH_STRING, false); String viewMode =3D context.getParam(VIEW_MODE, false); String whereToSearch =3D context.getParam(WHERE_TO_SEARCH, false); @@ -390,55 +410,30 @@ public class SystemSearchSetupAction extends RhnActio= n implements Listable { * @return Returns the map. */ private Map createDisplayMap(String display, String value) { - Map selection =3D new HashMap(); + Map selection =3D new HashMap(); selection.put("display", display); selection.put("value", value); return selection; } = - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ public String getListName() { return LIST_NAME; } = - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ public String getDataSetName() { return DATA_SET; } = - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ public String getDecl(RequestContext context) { return RhnSetDecl.SYSTEMS.getLabel(); } = - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ public List getResult(RequestContext context) { - /*String cachedName =3D makeKey(context); - List result =3D (List)context.getRequest().getSession().getAttribu= te(cachedName); - if (result !=3D null) { - return result; - }*/ - - /* - DynaActionForm daForm =3D (DynaActionForm) context.getRequest().ge= tAttribute(FORM); - String searchString =3D daForm.getString(SEARCH_STRING); - String viewMode =3D daForm.getString(VIEW_MODE); - String whereToSearch =3D daForm.getString(WHERE_TO_SEARCH); - Boolean invertResults =3D (Boolean) daForm.get(INVERT_RESULTS); */ - = String searchString =3D context.getParam(SEARCH_STRING, false); - String viewMode =3D context.getParam(VIEW_MODE, false); - String whereToSearch =3D context.getParam(WHERE_TO_SEARCH, false); - Boolean invertResults =3D StringUtils.defaultString( - context.getParam(INVERT_RESULTS, false)).equals("on"); = if (!StringUtils.isBlank(searchString)) { log.info("SystemSearchSetupAction.getResult() calling performS= earch()"); @@ -448,21 +443,7 @@ public class SystemSearchSetupAction extends RhnAction= implements Listable { return Collections.EMPTY_LIST; } = - private String makeKey(RequestContext context) { - DynaActionForm daForm =3D (DynaActionForm) context.getRequest().ge= tAttribute(FORM); - String searchString =3D daForm.getString(SEARCH_STRING); - String viewMode =3D daForm.getString(VIEW_MODE); - String whereToSearch =3D daForm.getString(WHERE_TO_SEARCH); - Boolean invertResults =3D (Boolean) daForm.get(INVERT_RESULTS); - - return StringUtil.toJson(new Object [] { - searchString, viewMode, whereToSearch, invertResults - }); - } - - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ public String getParentUrl(RequestContext context) { return context.getRequest().getRequestURI(); } --===============2118239466198462874==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:21 2015 Content-Type: multipart/mixed; boundary="===============6722807298434406618==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Wed, 03 Jun 2009 22:51:01 +0000 Message-ID: <20090603225102.1180B120252@lists.fedorahosted.org> --===============6722807298434406618== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/channel/Channel.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit b44703fd4ef7b6154c263bade8b4a9fd8f3ce8f8 Author: Pradeep Kilambi Date: Wed Jun 3 18:50:48 2009 -0400 504023 - fixing repodata generation to skip solaris custom channels diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.java b/jav= a/code/src/com/redhat/rhn/domain/channel/Channel.java index cef2312..57ffc57 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/Channel.java +++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.java @@ -54,6 +54,9 @@ public class Channel extends BaseDomainHelper implements = Comparable { private static List releaseToSkipRepodata =3D new ArrayList(Arrays .asList("2.1AS", "2.1ES", "2.1WS", "3AS", "3ES", "3WS", "3Desk= top", "4AS", "4ES", "4WS", "4Desktop")); + private static List archesToSkipRepodata =3D new ArrayList(Arrays + .asList("channel-sparc-sun-solaris", "channel-i386-sun-solaris= ", = + "channel-sparc")); private String baseDir; private ChannelArch channelArch; private String description; @@ -748,7 +751,9 @@ public class Channel extends BaseDomainHelper implement= s Comparable { */ public boolean isChannelRepodataRequired() { boolean repodataRequired =3D false; - if (this.isCustom()) { + // generate repodata for all custom channels except solaris + if (this.isCustom() && + !archesToSkipRepodata.contains(this.channelArch.getLabel()= )) { repodataRequired =3D true; log.debug("isChannelRepodataRequired for channel(" + this.id + ") set to true because it is a custom Channel"); --===============6722807298434406618==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:21 2015 Content-Type: multipart/mixed; boundary="===============9062454200979284398==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Wed, 03 Jun 2009 22:52:57 +0000 Message-ID: <20090603225257.891C6120252@lists.fedorahosted.org> --===============9062454200979284398== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/channel/Channel.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit a9a7ece2c1ab4f71be4fe5b1c31051f6caaaca6d Author: Pradeep Kilambi Date: Wed Jun 3 18:50:48 2009 -0400 504023 - fixing repodata generation to skip solaris custom channels diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.java b/jav= a/code/src/com/redhat/rhn/domain/channel/Channel.java index cef2312..57ffc57 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/Channel.java +++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.java @@ -54,6 +54,9 @@ public class Channel extends BaseDomainHelper implements = Comparable { private static List releaseToSkipRepodata =3D new ArrayList(Arrays .asList("2.1AS", "2.1ES", "2.1WS", "3AS", "3ES", "3WS", "3Desk= top", "4AS", "4ES", "4WS", "4Desktop")); + private static List archesToSkipRepodata =3D new ArrayList(Arrays + .asList("channel-sparc-sun-solaris", "channel-i386-sun-solaris= ", = + "channel-sparc")); private String baseDir; private ChannelArch channelArch; private String description; @@ -748,7 +751,9 @@ public class Channel extends BaseDomainHelper implement= s Comparable { */ public boolean isChannelRepodataRequired() { boolean repodataRequired =3D false; - if (this.isCustom()) { + // generate repodata for all custom channels except solaris + if (this.isCustom() && + !archesToSkipRepodata.contains(this.channelArch.getLabel()= )) { repodataRequired =3D true; log.debug("isChannelRepodataRequired for channel(" + this.id + ") set to true because it is a custom Channel"); --===============9062454200979284398==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:21 2015 Content-Type: multipart/mixed; boundary="===============8429528917319675845==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: projects/oracle-server-scripts Date: Thu, 04 Jun 2009 09:29:58 +0000 Message-ID: <20090604092958.B307612036C@lists.fedorahosted.org> --===============8429528917319675845== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable projects/oracle-server-scripts/init-params.ora | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1bbecd594b68ead93c744286a85b6dbcee5264b4 Author: Milan Zazrivec Date: Thu Jun 4 11:28:34 2009 +0200 We use 10.2.0.4 embedded db now diff --git a/projects/oracle-server-scripts/init-params.ora b/projects/orac= le-server-scripts/init-params.ora index c2754a5..cdefa27 100755 --- a/projects/oracle-server-scripts/init-params.ora +++ b/projects/oracle-server-scripts/init-params.ora @@ -27,7 +27,7 @@ job_queue_processes=3D10 ########################################### # Miscellaneous ########################################### -compatible=3D10.2.0.3.0 +compatible=3D10.2.0.4.0 = ########################################### # NLS --===============8429528917319675845==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:21 2015 Content-Type: multipart/mixed; boundary="===============4586004526093403200==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - projects/oracle-server-scripts Date: Thu, 04 Jun 2009 09:30:57 +0000 Message-ID: <20090604093057.EDC4712036C@lists.fedorahosted.org> --===============4586004526093403200== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable projects/oracle-server-scripts/init-params.ora | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7ad13e86847749a5511d821e563e943dffb06ecf Author: Milan Zazrivec Date: Thu Jun 4 11:28:34 2009 +0200 We use 10.2.0.4 embedded db now diff --git a/projects/oracle-server-scripts/init-params.ora b/projects/orac= le-server-scripts/init-params.ora index c2754a5..cdefa27 100755 --- a/projects/oracle-server-scripts/init-params.ora +++ b/projects/oracle-server-scripts/init-params.ora @@ -27,7 +27,7 @@ job_queue_processes=3D10 ########################################### # Miscellaneous ########################################### -compatible=3D10.2.0.3.0 +compatible=3D10.2.0.4.0 = ########################################### # NLS --===============4586004526093403200==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:21 2015 Content-Type: multipart/mixed; boundary="===============2412632505205226567==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: backend/server Date: Thu, 04 Jun 2009 14:13:16 +0000 Message-ID: <20090604141316.61254120312@lists.fedorahosted.org> --===============2412632505205226567== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/handlers/app/packages.py | 29 +++++++++++++++++++++++--= ---- backend/server/importlib/packageImport.py | 2 -- 2 files changed, 23 insertions(+), 8 deletions(-) New commits: commit 75b6c91adf12a585dec90bf695fa960358a3029b Author: Pradeep Kilambi Date: Thu Jun 4 10:13:03 2009 -0400 fixing duplicate entries in repogen tables and other clean aup diff --git a/backend/server/handlers/app/packages.py b/backend/server/handl= ers/app/packages.py index 372933f..f982b5b 100644 --- a/backend/server/handlers/app/packages.py +++ b/backend/server/handlers/app/packages.py @@ -427,10 +427,13 @@ class Packages(RPC_Base): = if orgid =3D=3D 'null': org_id, force =3D rhnPackageUpload.authenticate(username, pass= word, - channels=3Dchann= els, null_org=3D1, force=3Dforce) + channels=3Dchann= els, + null_org=3D1, + force=3Dforce) else: org_id, force =3D rhnPackageUpload.authenticate(username, pass= word, - channels=3Dchann= els, force=3Dforce) + channels=3Dchann= els, + force=3Dforce) return self._getPackageMD5sum(org_id, pkg_infos, info) = def getPackageMD5sumBySession(self, session_string, info): @@ -500,9 +503,20 @@ class Packages(RPC_Base): pkg_epoch =3D pkg_info['epoch'] = if md5sum_exists: - h.execute(pkg_name=3Dpkg_info['name'], pkg_epoch=3Dpkg_epo= ch, pkg_version=3Dpkg_info['version'], pkg_rel=3Dpkg_info['release'],pkg_ar= ch=3Dpkg_info['arch'], orgid =3D org_id,md5sum =3D pkg_info['md5sum'] ) + h.execute(pkg_name=3Dpkg_info['name'], + pkg_epoch=3Dpkg_epoch, + pkg_version=3Dpkg_info['version'], + pkg_rel=3Dpkg_info['release'], + pkg_arch=3Dpkg_info['arch'], + orgid =3D org_id, + md5sum =3D pkg_info['md5sum'] ) else: - h.execute(pkg_name=3Dpkg_info['name'], pkg_epoch=3Dpkg_epo= ch, pkg_version=3Dpkg_info['version'], pkg_rel=3Dpkg_info['release'],pkg_ar= ch=3Dpkg_info['arch'], orgid =3D org_id) + h.execute(pkg_name=3Dpkg_info['name'], + pkg_epoch=3Dpkg_epoch, + pkg_version=3Dpkg_info['version'], + pkg_rel=3Dpkg_info['release'], + pkg_arch=3Dpkg_info['arch'], + orgid =3D org_id ) = row =3D h.fetchone_dict() if not row: @@ -538,10 +552,13 @@ class Packages(RPC_Base): = if orgid =3D=3D 'null': org_id, force =3D rhnPackageUpload.authenticate(username, pass= word, - channels=3Dchann= els, null_org=3D1, force=3Dforce) + channels=3Dchann= els, + null_org=3D1, + force=3Dforce) else: org_id, force =3D rhnPackageUpload.authenticate(username, pass= word, - channels=3Dchann= els, force=3Dforce) + channels=3Dchann= els, + force=3Dforce) = return self._getSourcePackageMD5sum(org_id, pkg_infos, info) = diff --git a/backend/server/importlib/packageImport.py b/backend/server/imp= ortlib/packageImport.py index 6b359b2..22a7d1e 100644 --- a/backend/server/importlib/packageImport.py +++ b/backend/server/importlib/packageImport.py @@ -111,8 +111,6 @@ class ChannelPackageSubscription(GenericPackageImport): self.compute_affected_channels(affected_channels) self.backend.update_newest_package_cache(caller=3Dself.caller, = affected_channels=3Dself.affected_channel_packages) - taskomatic.add_to_repodata_queue_for_channel_package_subscription( - self.affected_channels, self.batch, self.caller) self.backend.commit() = def compute_affected_channels(self, affected_channels): --===============2412632505205226567==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:21 2015 Content-Type: multipart/mixed; boundary="===============2741725590182841818==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: 5 commits - java/code proxy/installer Date: Thu, 04 Jun 2009 14:19:23 +0000 Message-ID: <20090604141923.B8F20120312@lists.fedorahosted.org> --===============2741725590182841818== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java | = 7 - proxy/installer/configure-proxy.sh | 1= 0 + proxy/installer/configure-proxy.sh.sgml | 4= 6 +++++++++ proxy/installer/rhn-proxy-activate.sgml | 2= 0 +++ proxy/installer/rhn_proxy_activate.py | 5= 1 ++++++++++ 5 files changed, 128 insertions(+), 6 deletions(-) New commits: commit e7fad78e3d10b577134f3ceb04e089334e684397 Author: Miroslav Such=C3=BD Date: Thu Jun 4 16:18:25 2009 +0200 enable services diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure= -proxy.sh index 509fcab..c96d841 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -464,9 +464,7 @@ if [ $ENABLE_SCOUT -ne 0 ]; then fi for service in squid httpd jabberd $MonitoringScout; do /sbin/chkconfig --add $service = - if [ "$1" =3D "1" ] ; then # first install - /sbin/chkconfig --level 345 $service on = - fi + /sbin/chkconfig --level 345 $service on = done /usr/sbin/rhn-proxy restart = commit 492fd8eeef79cf0e3e451f50767c5a28dea945c9 Author: Miroslav Such=C3=BD Date: Thu Jun 4 15:27:12 2009 +0200 499399 - update rhn-proxy-activate man page = add --enable-monitoring option add --list-available-version option diff --git a/proxy/installer/rhn-proxy-activate.sgml b/proxy/installer/rhn-= proxy-activate.sgml index da638b2..1d68882 100644 --- a/proxy/installer/rhn-proxy-activate.sgml +++ b/proxy/installer/rhn-proxy-activate.sgml @@ -25,6 +25,7 @@ &SCRIPTCOMMAND; = + command options ... -sHOSTNAME --server=3DHOSTNAME @@ -61,6 +62,25 @@ utility that will activate an &RHNPROXY; from the commandline of the RHN Proxy itself. + + Without any command specified, this script will activate Spacewalk Pro= xy. + For other possibility see COMMANDS section. + + +COMMANDS + + + -m, --enable-monitoring + + Will enable Monitoring Scout on this Proxy. Proxy should= be already activated before this command. + + + + -l, --list-available-versions + + List available versions of RHN Proxy on parent. + + = Options commit 14f7faaaf80c1f7937016e35c0f6c00dea1dcb62 Author: Miroslav Such=C3=BD Date: Thu Jun 4 15:18:33 2009 +0200 fix docbook warnings diff --git a/proxy/installer/configure-proxy.sh.sgml b/proxy/installer/conf= igure-proxy.sh.sgml index 0fe6435..3d0e7fc 100644 --- a/proxy/installer/configure-proxy.sh.sgml +++ b/proxy/installer/configure-proxy.sh.sgml @@ -219,94 +219,140 @@ provide a required response, default answer is used.= Version of &RHNPROXY; you want to activate. + + RHN_PARENT Your parent Spacewalk server. + + TRACEBACK_EMAIL Email to which tracebacks should be sent. + + USE_SSL 1 if &RHNPROXY; should communicate with parent over SSL. = 0 otherwise. Even if disabled, client can still use SSL to connect to &RHNP= ROXY; + + CA_CHAIN The CA cert used to verify the ssl connection to parent.<= /para> + + FORCE_OWN_CA Do not use parent CA and force to create your own. + + HTTP_PROXY HTTP proxy in host:port format, e.g. squid.redhat.com:312= 8 + + HTTP_USERNAME The username for an authenticated proxy. + + HTTP_PASSWORD The password to use for an authenticated proxy. + + SSL_BUILD_DIR The directory where we build SSL certificate. Default is = /root/ssl-build. + + SSL_ORG Organization name to be used in SSL certificate. + + SSL_ORGUNIT Organization unit name to be used in SSL certificate. + + SSL_COMMON Common name to be used in SSL certificate. + + SSL_CITY City to be used in SSL certificate. + + SSL_STATE State to be used in SSL certificate. + + SSL_COUNTRY Two letters country code to be used in SSL certificate. + + SSL_EMAIL Email to be used in SSL certificate. + + SSL_PASSWORD Password to be used for SSL CA certificate. + + INSTALL_MONITORING Y if monitoring should be installed. Any other value mean= s that monitoring will not be installed. + + ENABLE_SCOUT 1 to enable monitoring scout, 0 otherwise. + + MONITORING_PARENT Name of the parent for your scout. Usually the same value= as in RHN_PARENT. + + MONITORING_PARENT_IP IP address of MONITORING_PARENT + + SCOUT_SHARED_KEY Your scout shared key (can be found on the parent in /etc= /rhn/cluster.ini as key scoutsharedkey). + + POPULATE_CONFIG_CHANNEL Y if config chanel should be created and configuration fi= les in that channel updated. commit 474f62180e295dd2bc302fbcd03f3515eb5a5615 Author: Miroslav Such=C3=BD Date: Thu Jun 4 15:14:41 2009 +0200 499399 - call proxy.createMonitoringScout during proxy activation diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure= -proxy.sh index 043bd79..509fcab 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -455,6 +455,12 @@ fi echo "Enabling Spacewalk Proxy." if [ $ENABLE_SCOUT -ne 0 ]; then MonitoringScout=3D"MonitoringScout" + /usr/bin/rhn-proxy-activate --enable-monitoring \ + --server=3D"$RHN_PARENT" \ + --http-proxy=3D"$HTTP_PROXY" \ + --http-proxy-username=3D"$HTTP_USERNAME" \ + --http-proxy-password=3D"$HTTP_PASSWORD" \ + --ca-cert=3D"$CA_CHAIN" fi for service in squid httpd jabberd $MonitoringScout; do /sbin/chkconfig --add $service = diff --git a/proxy/installer/rhn_proxy_activate.py b/proxy/installer/rhn_pr= oxy_activate.py index 69ccccb..af5fe3c 100644 --- a/proxy/installer/rhn_proxy_activate.py +++ b/proxy/installer/rhn_proxy_activate.py @@ -367,6 +367,8 @@ def _activateProxy_api_v3_x(options, apiVersion): errorCode, errorString =3D 0, '' try: s.proxy.activate_proxy(systemid, str(options.version)) + if options.enable_monitoring: + s.proxy.create_monitoring_scout(systemid) except: errorCode, errorString =3D _errorHandler() try: @@ -390,6 +392,40 @@ def _activateProxy_api_v3_x(options, apiVersion): sys.stdout.write("RHN Proxy successfully activated.\n") return (errorCode, errorString) = +def createMonitoringScout(options): + """ Activate MonitoringScout. = + Just create record on parent. + use activateProxy_api_v3_x method instead. + """ + + getServer(options, DEFAULT_WEBRPC_HANDLER_v3_x) + systemid =3D getSystemId() + + errorCode, errorString =3D 0, '' + try: + s.proxy.create_monitoring_scout(systemid) + except: + errorCode, errorString =3D _errorHandler() + try: + raise + except SSL.SSL.Error: + # let's force a system exit for this one. + sys.stderr.write(errorString + '\n') + sys.exit(errorCode) + except (rpclib.Fault, Exception): + # let's force a slight change in messaging for this one. + errorString =3D "ERROR: upon entitlement/activation attempt: %= s" % errorString + except (rpclib.ProtocolError, socket.error): + sys.stderr.write(errorString + '\n') + sys.exit(errorCode) + except: + errorString =3D "ERROR: upon activation attempt (something une= xpected): %s" % errorString + return errorCode, errorString + else: + errorCode =3D 0 + if not options.quiet: + sys.stdout.write("Monitoring Scout successfully created.\n") + return (errorCode, errorString) = def activateProxy(options, apiVersion): """ Activate proxy. Decide how to do it upon apiVersion. Currently we = @@ -450,6 +486,8 @@ def processCommandline(): Option('--ca-cert', action=3D'store', help=3D"alternati= ve SSL certificate to use, default is %s" % repr(ca_cert), default=3Dca_cer= t), Option('--no-ssl', action=3D'store_true', help=3D'turn off = SSL (not advisable), default is on.'), Option('--version', action=3D'store', help=3D'which X.Y= version of the RHN Proxy are you upgrading to? Default is your current pro= xy version ('+defaultVersion+')', default=3DdefaultVersion), + Option('-m', '--enable-monitoring', = + action=3D'store_true', help=3D'enable = MonitoringScout on this proxy.'), Option('--deactivate', action=3D'store_true', help=3D'deactiv= ate proxy, if already activated'), Option('-l','--list-available-versions', action=3D'store_true', he= lp=3D'print list of versions available to this system'), Option('--non-interactive', action=3D'store_true', help=3D'non-int= eractive mode'), @@ -527,6 +565,19 @@ def main(): listAvailableProxyChannels(options) sys.exit(0) = + if options.enable_monitoring: + resolveHostnamePort(options.http_proxy) + if not options.http_proxy: + resolveHostnamePort(options.server) + errorCode, errorString =3D createMonitoringScout(options) + if errorCode !=3D 0: + if not errorString: + errorString =3D ("An unknown error occured. Consult with y= our Red Hat representative.\n") + sys.stderr.write("\nThere was a problem activating Monitoring = Scout:\n%s\n" % errorString) + sys.exit(abs(errorCode)) + else: + sys.exit(0) + noSslString =3D 'false' if options.no_ssl: noSslString =3D 'true' commit 061bab2e20f7806f8fdbff8269d93d9ed7543f86 Author: Miroslav Such=C3=BD Date: Thu Jun 4 15:08:43 2009 +0200 499399 - save scout to db diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandle= r.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.ja= va index a4b7d49..57daf18 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java @@ -17,7 +17,6 @@ package com.redhat.rhn.frontend.xmlrpc.proxy; import com.redhat.rhn.common.client.ClientCertificate; import com.redhat.rhn.common.client.ClientCertificateDigester; import com.redhat.rhn.common.client.InvalidCertificateException; -import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelFamily; import com.redhat.rhn.domain.channel.ChannelFamilyFactory; @@ -96,8 +95,7 @@ public class ProxyHandler extends BaseHandler { User owner =3D server.getCreator(); = SatCluster scout =3D SatClusterFactory.createSatCluster(owner); - scout.setDescription(LocalizationService.getInstance(). - getMessage("RHN Proxy") + " " + + scout.setDescription("RHN Proxy" + " " + server.getHostname() + " (" + server.getId() + ")"); scout.setVip(server.getIpAddress()); @@ -107,6 +105,9 @@ public class ProxyHandler extends BaseHandler { node.setLastUpdateUser(owner.getLogin()); node.setLastUpdateDate(new Date()); = + SatClusterFactory.saveSatCluster(scout); + SatClusterFactory.saveSatNode(node); + return 1; } else { --===============2741725590182841818==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:21 2015 Content-Type: multipart/mixed; boundary="===============0305233153283027302==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - backend/server Date: Thu, 04 Jun 2009 14:20:03 +0000 Message-ID: <20090604142003.DC4E0120312@lists.fedorahosted.org> --===============0305233153283027302== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/handlers/app/packages.py | 29 +++++++++++++++++++++++--= ---- backend/server/importlib/packageImport.py | 2 -- 2 files changed, 23 insertions(+), 8 deletions(-) New commits: commit 1bc92f17083c1c3be2149cf14e3df8c2602c4ba7 Author: Pradeep Kilambi Date: Thu Jun 4 10:13:03 2009 -0400 fixing duplicate entries in repogen tables and other clean aup diff --git a/backend/server/handlers/app/packages.py b/backend/server/handl= ers/app/packages.py index 372933f..f982b5b 100644 --- a/backend/server/handlers/app/packages.py +++ b/backend/server/handlers/app/packages.py @@ -427,10 +427,13 @@ class Packages(RPC_Base): = if orgid =3D=3D 'null': org_id, force =3D rhnPackageUpload.authenticate(username, pass= word, - channels=3Dchann= els, null_org=3D1, force=3Dforce) + channels=3Dchann= els, + null_org=3D1, + force=3Dforce) else: org_id, force =3D rhnPackageUpload.authenticate(username, pass= word, - channels=3Dchann= els, force=3Dforce) + channels=3Dchann= els, + force=3Dforce) return self._getPackageMD5sum(org_id, pkg_infos, info) = def getPackageMD5sumBySession(self, session_string, info): @@ -500,9 +503,20 @@ class Packages(RPC_Base): pkg_epoch =3D pkg_info['epoch'] = if md5sum_exists: - h.execute(pkg_name=3Dpkg_info['name'], pkg_epoch=3Dpkg_epo= ch, pkg_version=3Dpkg_info['version'], pkg_rel=3Dpkg_info['release'],pkg_ar= ch=3Dpkg_info['arch'], orgid =3D org_id,md5sum =3D pkg_info['md5sum'] ) + h.execute(pkg_name=3Dpkg_info['name'], + pkg_epoch=3Dpkg_epoch, + pkg_version=3Dpkg_info['version'], + pkg_rel=3Dpkg_info['release'], + pkg_arch=3Dpkg_info['arch'], + orgid =3D org_id, + md5sum =3D pkg_info['md5sum'] ) else: - h.execute(pkg_name=3Dpkg_info['name'], pkg_epoch=3Dpkg_epo= ch, pkg_version=3Dpkg_info['version'], pkg_rel=3Dpkg_info['release'],pkg_ar= ch=3Dpkg_info['arch'], orgid =3D org_id) + h.execute(pkg_name=3Dpkg_info['name'], + pkg_epoch=3Dpkg_epoch, + pkg_version=3Dpkg_info['version'], + pkg_rel=3Dpkg_info['release'], + pkg_arch=3Dpkg_info['arch'], + orgid =3D org_id ) = row =3D h.fetchone_dict() if not row: @@ -538,10 +552,13 @@ class Packages(RPC_Base): = if orgid =3D=3D 'null': org_id, force =3D rhnPackageUpload.authenticate(username, pass= word, - channels=3Dchann= els, null_org=3D1, force=3Dforce) + channels=3Dchann= els, + null_org=3D1, + force=3Dforce) else: org_id, force =3D rhnPackageUpload.authenticate(username, pass= word, - channels=3Dchann= els, force=3Dforce) + channels=3Dchann= els, + force=3Dforce) = return self._getSourcePackageMD5sum(org_id, pkg_infos, info) = diff --git a/backend/server/importlib/packageImport.py b/backend/server/imp= ortlib/packageImport.py index 6b359b2..22a7d1e 100644 --- a/backend/server/importlib/packageImport.py +++ b/backend/server/importlib/packageImport.py @@ -111,8 +111,6 @@ class ChannelPackageSubscription(GenericPackageImport): self.compute_affected_channels(affected_channels) self.backend.update_newest_package_cache(caller=3Dself.caller, = affected_channels=3Dself.affected_channel_packages) - taskomatic.add_to_repodata_queue_for_channel_package_subscription( - self.affected_channels, self.batch, self.caller) self.backend.commit() = def compute_affected_channels(self, affected_channels): --===============0305233153283027302==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:21 2015 Content-Type: multipart/mixed; boundary="===============2937172452352861773==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 5 commits - java/code proxy/installer Date: Thu, 04 Jun 2009 14:21:32 +0000 Message-ID: <20090604142132.6B8B2120312@lists.fedorahosted.org> --===============2937172452352861773== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java | = 7 - proxy/installer/configure-proxy.sh | 1= 0 + proxy/installer/configure-proxy.sh.sgml | 4= 6 +++++++++ proxy/installer/rhn-proxy-activate.sgml | 2= 0 +++ proxy/installer/rhn_proxy_activate.py | 5= 1 ++++++++++ 5 files changed, 128 insertions(+), 6 deletions(-) New commits: commit 0d72257f5df8bcac9f003fff651f8f82922c2d16 Author: Miroslav Such=C3=BD Date: Thu Jun 4 16:18:25 2009 +0200 enable services (cherry picked from commit e7fad78e3d10b577134f3ceb04e089334e684397) diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure= -proxy.sh index 1dfa137..2e3ce5e 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -461,9 +461,7 @@ if [ $ENABLE_SCOUT -ne 0 ]; then fi for service in squid httpd jabberd $MonitoringScout; do /sbin/chkconfig --add $service = - if [ "$1" =3D "1" ] ; then # first install - /sbin/chkconfig --level 345 $service on = - fi + /sbin/chkconfig --level 345 $service on = done /usr/sbin/rhn-proxy restart = commit 6d4ad92dd2cae2149dce48864c9480fb16f1b452 Author: Miroslav Such=C3=BD Date: Thu Jun 4 15:27:12 2009 +0200 499399 - update rhn-proxy-activate man page = add --enable-monitoring option add --list-available-version option (cherry picked from commit 492fd8eeef79cf0e3e451f50767c5a28dea945c9) diff --git a/proxy/installer/rhn-proxy-activate.sgml b/proxy/installer/rhn-= proxy-activate.sgml index da638b2..1d68882 100644 --- a/proxy/installer/rhn-proxy-activate.sgml +++ b/proxy/installer/rhn-proxy-activate.sgml @@ -25,6 +25,7 @@ &SCRIPTCOMMAND; = + command options ... -sHOSTNAME --server=3DHOSTNAME @@ -61,6 +62,25 @@ utility that will activate an &RHNPROXY; from the commandline of the RHN Proxy itself. + + Without any command specified, this script will activate Spacewalk Pro= xy. + For other possibility see COMMANDS section. + + +COMMANDS + + + -m, --enable-monitoring + + Will enable Monitoring Scout on this Proxy. Proxy should= be already activated before this command. + + + + -l, --list-available-versions + + List available versions of RHN Proxy on parent. + + = Options commit f325fdde299eeb6c056c221570d3f473ec548f0f Author: Miroslav Such=C3=BD Date: Thu Jun 4 15:18:33 2009 +0200 fix docbook warnings (cherry picked from commit 14f7faaaf80c1f7937016e35c0f6c00dea1dcb62) diff --git a/proxy/installer/configure-proxy.sh.sgml b/proxy/installer/conf= igure-proxy.sh.sgml index 0fe6435..3d0e7fc 100644 --- a/proxy/installer/configure-proxy.sh.sgml +++ b/proxy/installer/configure-proxy.sh.sgml @@ -219,94 +219,140 @@ provide a required response, default answer is used.= Version of &RHNPROXY; you want to activate. + + RHN_PARENT Your parent Spacewalk server. + + TRACEBACK_EMAIL Email to which tracebacks should be sent. + + USE_SSL 1 if &RHNPROXY; should communicate with parent over SSL. = 0 otherwise. Even if disabled, client can still use SSL to connect to &RHNP= ROXY; + + CA_CHAIN The CA cert used to verify the ssl connection to parent.<= /para> + + FORCE_OWN_CA Do not use parent CA and force to create your own. + + HTTP_PROXY HTTP proxy in host:port format, e.g. squid.redhat.com:312= 8 + + HTTP_USERNAME The username for an authenticated proxy. + + HTTP_PASSWORD The password to use for an authenticated proxy. + + SSL_BUILD_DIR The directory where we build SSL certificate. Default is = /root/ssl-build. + + SSL_ORG Organization name to be used in SSL certificate. + + SSL_ORGUNIT Organization unit name to be used in SSL certificate. + + SSL_COMMON Common name to be used in SSL certificate. + + SSL_CITY City to be used in SSL certificate. + + SSL_STATE State to be used in SSL certificate. + + SSL_COUNTRY Two letters country code to be used in SSL certificate. + + SSL_EMAIL Email to be used in SSL certificate. + + SSL_PASSWORD Password to be used for SSL CA certificate. + + INSTALL_MONITORING Y if monitoring should be installed. Any other value mean= s that monitoring will not be installed. + + ENABLE_SCOUT 1 to enable monitoring scout, 0 otherwise. + + MONITORING_PARENT Name of the parent for your scout. Usually the same value= as in RHN_PARENT. + + MONITORING_PARENT_IP IP address of MONITORING_PARENT + + SCOUT_SHARED_KEY Your scout shared key (can be found on the parent in /etc= /rhn/cluster.ini as key scoutsharedkey). + + POPULATE_CONFIG_CHANNEL Y if config chanel should be created and configuration fi= les in that channel updated. commit b00e047e7cf61f087945be2a53638c7f0e7614a3 Author: Miroslav Such=C3=BD Date: Thu Jun 4 15:14:41 2009 +0200 499399 - call proxy.createMonitoringScout during proxy activation (cherry picked from commit 474f62180e295dd2bc302fbcd03f3515eb5a5615) diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure= -proxy.sh index bf56977..1dfa137 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -452,6 +452,12 @@ fi echo "Enabling Spacewalk Proxy." if [ $ENABLE_SCOUT -ne 0 ]; then MonitoringScout=3D"MonitoringScout" + /usr/bin/rhn-proxy-activate --enable-monitoring \ + --server=3D"$RHN_PARENT" \ + --http-proxy=3D"$HTTP_PROXY" \ + --http-proxy-username=3D"$HTTP_USERNAME" \ + --http-proxy-password=3D"$HTTP_PASSWORD" \ + --ca-cert=3D"$CA_CHAIN" fi for service in squid httpd jabberd $MonitoringScout; do /sbin/chkconfig --add $service = diff --git a/proxy/installer/rhn_proxy_activate.py b/proxy/installer/rhn_pr= oxy_activate.py index bb12fe2..ca620e1 100644 --- a/proxy/installer/rhn_proxy_activate.py +++ b/proxy/installer/rhn_proxy_activate.py @@ -363,6 +363,8 @@ def _activateProxy_api_v3_x(options, apiVersion): errorCode, errorString =3D 0, '' try: s.proxy.activate_proxy(systemid, str(options.version)) + if options.enable_monitoring: + s.proxy.create_monitoring_scout(systemid) except: errorCode, errorString =3D _errorHandler() try: @@ -386,6 +388,40 @@ def _activateProxy_api_v3_x(options, apiVersion): sys.stdout.write("RHN Proxy successfully activated.\n") return (errorCode, errorString) = +def createMonitoringScout(options): + """ Activate MonitoringScout. = + Just create record on parent. + use activateProxy_api_v3_x method instead. + """ + + getServer(options, DEFAULT_WEBRPC_HANDLER_v3_x) + systemid =3D getSystemId() + + errorCode, errorString =3D 0, '' + try: + s.proxy.create_monitoring_scout(systemid) + except: + errorCode, errorString =3D _errorHandler() + try: + raise + except SSL.SSL.Error: + # let's force a system exit for this one. + sys.stderr.write(errorString + '\n') + sys.exit(errorCode) + except (rpclib.Fault, Exception): + # let's force a slight change in messaging for this one. + errorString =3D "ERROR: upon entitlement/activation attempt: %= s" % errorString + except (rpclib.ProtocolError, socket.error): + sys.stderr.write(errorString + '\n') + sys.exit(errorCode) + except: + errorString =3D "ERROR: upon activation attempt (something une= xpected): %s" % errorString + return errorCode, errorString + else: + errorCode =3D 0 + if not options.quiet: + sys.stdout.write("Monitoring Scout successfully created.\n") + return (errorCode, errorString) = def activateProxy(options, apiVersion): """ Activate proxy. Decide how to do it upon apiVersion. Currently we = @@ -446,6 +482,8 @@ def processCommandline(): Option('--ca-cert', action=3D'store', help=3D"alternati= ve SSL certificate to use, default is %s" % repr(ca_cert), default=3Dca_cer= t), Option('--no-ssl', action=3D'store_true', help=3D'turn off = SSL (not advisable), default is on.'), Option('--version', action=3D'store', help=3D'which X.Y= version of the RHN Proxy are you upgrading to? Default is your current pro= xy version ('+defaultVersion+')', default=3DdefaultVersion), + Option('-m', '--enable-monitoring', = + action=3D'store_true', help=3D'enable = MonitoringScout on this proxy.'), Option('--deactivate', action=3D'store_true', help=3D'deactiv= ate proxy, if already activated'), Option('-l','--list-available-versions', action=3D'store_true', he= lp=3D'print list of versions available to this system'), Option('--non-interactive', action=3D'store_true', help=3D'non-int= eractive mode'), @@ -523,6 +561,19 @@ def main(): listAvailableProxyChannels(options) sys.exit(0) = + if options.enable_monitoring: + resolveHostnamePort(options.http_proxy) + if not options.http_proxy: + resolveHostnamePort(options.server) + errorCode, errorString =3D createMonitoringScout(options) + if errorCode !=3D 0: + if not errorString: + errorString =3D ("An unknown error occured. Consult with y= our Red Hat representative.\n") + sys.stderr.write("\nThere was a problem activating Monitoring = Scout:\n%s\n" % errorString) + sys.exit(abs(errorCode)) + else: + sys.exit(0) + noSslString =3D 'false' if options.no_ssl: noSslString =3D 'true' commit 52a9a0caa50d0b323b11de5bb9cc52641e49bf48 Author: Miroslav Such=C3=BD Date: Thu Jun 4 15:08:43 2009 +0200 499399 - save scout to db diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandle= r.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.ja= va index a4b7d49..57daf18 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java @@ -17,7 +17,6 @@ package com.redhat.rhn.frontend.xmlrpc.proxy; import com.redhat.rhn.common.client.ClientCertificate; import com.redhat.rhn.common.client.ClientCertificateDigester; import com.redhat.rhn.common.client.InvalidCertificateException; -import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelFamily; import com.redhat.rhn.domain.channel.ChannelFamilyFactory; @@ -96,8 +95,7 @@ public class ProxyHandler extends BaseHandler { User owner =3D server.getCreator(); = SatCluster scout =3D SatClusterFactory.createSatCluster(owner); - scout.setDescription(LocalizationService.getInstance(). - getMessage("RHN Proxy") + " " + + scout.setDescription("RHN Proxy" + " " + server.getHostname() + " (" + server.getId() + ")"); scout.setVip(server.getIpAddress()); @@ -107,6 +105,9 @@ public class ProxyHandler extends BaseHandler { node.setLastUpdateUser(owner.getLogin()); node.setLastUpdateDate(new Date()); = + SatClusterFactory.saveSatCluster(scout); + SatClusterFactory.saveSatNode(node); + return 1; } else { --===============2937172452352861773==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:21 2015 Content-Type: multipart/mixed; boundary="===============6878639263202636573==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Thu, 04 Jun 2009 16:03:05 +0000 Message-ID: <20090604160305.46A96120326@lists.fedorahosted.org> --===============6878639263202636573== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml = | 16 ------ java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java = | 23 ---------- java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java = | 9 --- 3 files changed, 2 insertions(+), 46 deletions(-) New commits: commit 06b89603b02bc4f2ce0b28f484eb02835dd84c43 Author: Devan Goodwin Date: Thu Jun 4 13:00:44 2009 -0300 Revert "adding better support for kickstart cent, whereby we install/ud= pate the client packages on all distros and not just RHEL-2,3,4" = This reverts commit f5376cb97e47c0a917b2234636013a5d96f99cfb. = This change conflicts with the fix for bugzilla #448697, and we're not entirely sure this is the correct way to proceed for CentOS in any case. (it rapidly gets unmaintainable with different versions of CentOS/Fedora/etc). = Conflicts: = java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.= xml java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_= queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel= _queries.xml index eaea5a0..92fbc33 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml @@ -1028,22 +1028,6 @@ SELECT CP.package_id, CP.name_id, CP.evr_id, CP.pack= age_arch_id = - - -SELECT CP.package_id, CP.name_id, CP.evr_id, CP.package_arch_id - FROM rhnPackageName PN inner join - rhnChannelNewestPackage CP on CP.name_id =3D PN.id inner join - rhnChannel C on C.id =3D Cp.channel_id inner join - rhnPackage P on P.id =3D CP.package_id inner join - rhnPackageEvr EVR on P.evr_id =3D EVR.id - WHERE ( C.id =3D :cid or C.parent_channel =3D :cid) - AND PN.name =3D :name - AND C.label not like '%beta%' - order by EVR.evr DESC - - - - SELECT CP.package_id, CP.name_id, CP.evr_id diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.ja= va b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java index 41433a2..6add7da 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -1381,29 +1381,6 @@ public class ChannelManager extends BaseManager { } = /** - * Get the id of latest packages located in the channel tree - * where channelId is a parent - * - * @param channelId to lookup package against - * @param packageName to check - * @return List containing Maps of "CP.package_id, CP.name_id, CP.evr_= id" - */ - public static Long getLatestPackageEqualInTree(Long channelId, String = packageName) { - SelectMode m =3D ModeFactory.getMode("Channel_queries", - "latest_package_equal_in_tree"); - Map params =3D new HashMap(); - params.put("cid", channelId); - params.put("name", packageName); - List results =3D m.execute(params); - if (results !=3D null && results.size() > 0) { - Map row =3D (Map) results.get(0); - return (Long) row.get("package_id"); - } - return null; - } - - - /** * List the latest packages equal in the passed in Channel and name * = * @param channelId to lookup package against diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormat= ter.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatte= r.java index 5c8d3c1..6d54832 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java @@ -101,15 +101,13 @@ public class KickstartFormatter { NEWLINE; public static final String[] UPDATE_PKG_NAMES =3D = {"pyOpenSSL", "rhnlib", "libxml2-python"}; - public static final String[] FRESH_PKG_NAMES_RHEL5 =3D - {"rhn-setup", "yum-rhn-plugin", "rhnsd", "rhn-client-tools", "rhn-che= ck"}; public static final String[] FRESH_PKG_NAMES_RHEL34 =3D = {"up2date", "up2date-gnome"}; public static final String[] FRESH_PKG_NAMES_RHEL2 =3D {"rhn_register", "up2date", "rhn_register-gnome", "up2date-gnome"}; private static final String UPDATE_OPT_PATH =3D "/tmp/rhn_rpms/optiona= l/"; private static final String UPDATE_CMD =3D "rpm -Uvh --replacepkgs --r= eplacefiles "; - private static final String FRESH_CMD =3D "rpm -Uvh /tmp/rhn_rpms/*rpm= "; + private static final String FRESH_CMD =3D "rpm -Fvh /tmp/rhn_rpms/*rpm= "; private static final String IMPORT_RHN_KEY5 =3D = "rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release"; private static final String IMPORT_RHN_KEY34 =3D = @@ -816,12 +814,9 @@ public class KickstartFormatter { else if (ksdata.isRhel3() || ksdata.isRhel4()) { pkglist =3D FRESH_PKG_NAMES_RHEL34; } - else { - pkglist =3D FRESH_PKG_NAMES_RHEL5; - } HashSet retval =3D new HashSet(); for (int i =3D 0; i < pkglist.length; i++) { - Long packageId =3D ChannelManager.getLatestPackageEqualInT= ree(c.getId(), + Long packageId =3D ChannelManager.getLatestPackageEqual(c.= getId(), pkglist[i]); if (packageId !=3D null) { Package p =3D PackageFactory.lookupByIdAndUser(package= Id, user); --===============6878639263202636573==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:21 2015 Content-Type: multipart/mixed; boundary="===============7621352000150326242==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Thu, 04 Jun 2009 16:05:36 +0000 Message-ID: <20090604160536.2F7DE120312@lists.fedorahosted.org> --===============7621352000150326242== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml = | 15 ------ java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java = | 23 ---------- java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java = | 9 --- 3 files changed, 2 insertions(+), 45 deletions(-) New commits: commit 7558a5fd901633f0457fbfb7644bbc86d5cdb9eb Author: Devan Goodwin Date: Thu Jun 4 13:04:58 2009 -0300 Revert "adding better support for kickstart cent, whereby we install/ud= pate the client packages on all distros and not just RHEL-2,3,4" = This reverts commit f5376cb97e47c0a917b2234636013a5d96f99cfb. = This change conflicts with the fix for bugzilla #448697, and we're not entirely sure this is the correct way to proceed for CentOS in any case. (it rapidly gets unmaintainable with different versions of CentOS/Fedora/etc). = Conflicts: = java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.= xml java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_= queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel= _queries.xml index 4d860a8..92fbc33 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml @@ -1028,21 +1028,6 @@ SELECT CP.package_id, CP.name_id, CP.evr_id, CP.pack= age_arch_id = - - -SELECT CP.package_id, CP.name_id, CP.evr_id, CP.package_arch_id - FROM rhnPackageName PN inner join - rhnChannelNewestPackage CP on CP.name_id =3D PN.id inner join - rhnChannel C on C.id =3D Cp.channel_id inner join - rhnPackage P on P.id =3D CP.package_id inner join - rhnPackageEvr EVR on P.evr_id =3D EVR.id - WHERE ( C.id =3D :cid or C.parent_channel =3D :cid) - AND PN.name =3D :name - order by EVR.evr DESC - - - - SELECT CP.package_id, CP.name_id, CP.evr_id diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.ja= va b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java index 41433a2..6add7da 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -1381,29 +1381,6 @@ public class ChannelManager extends BaseManager { } = /** - * Get the id of latest packages located in the channel tree - * where channelId is a parent - * - * @param channelId to lookup package against - * @param packageName to check - * @return List containing Maps of "CP.package_id, CP.name_id, CP.evr_= id" - */ - public static Long getLatestPackageEqualInTree(Long channelId, String = packageName) { - SelectMode m =3D ModeFactory.getMode("Channel_queries", - "latest_package_equal_in_tree"); - Map params =3D new HashMap(); - params.put("cid", channelId); - params.put("name", packageName); - List results =3D m.execute(params); - if (results !=3D null && results.size() > 0) { - Map row =3D (Map) results.get(0); - return (Long) row.get("package_id"); - } - return null; - } - - - /** * List the latest packages equal in the passed in Channel and name * = * @param channelId to lookup package against diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormat= ter.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatte= r.java index 1dcf2e5..d63af24 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java @@ -101,15 +101,13 @@ public class KickstartFormatter { NEWLINE; public static final String[] UPDATE_PKG_NAMES =3D = {"pyOpenSSL", "rhnlib", "libxml2-python"}; - public static final String[] FRESH_PKG_NAMES_RHEL5 =3D - {"rhn-setup", "yum-rhn-plugin", "rhnsd", "rhn-client-tools", "rhnlib"= , "rhn-check"}; public static final String[] FRESH_PKG_NAMES_RHEL34 =3D = {"up2date", "up2date-gnome"}; public static final String[] FRESH_PKG_NAMES_RHEL2 =3D {"rhn_register", "up2date", "rhn_register-gnome", "up2date-gnome"}; private static final String UPDATE_OPT_PATH =3D "/tmp/rhn_rpms/optiona= l/"; private static final String UPDATE_CMD =3D "rpm -Uvh --replacepkgs --r= eplacefiles "; - private static final String FRESH_CMD =3D "rpm -Uvh /tmp/rhn_rpms/*rpm= "; + private static final String FRESH_CMD =3D "rpm -Fvh /tmp/rhn_rpms/*rpm= "; private static final String IMPORT_RHN_KEY5 =3D = "rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release"; private static final String IMPORT_RHN_KEY34 =3D = @@ -816,12 +814,9 @@ public class KickstartFormatter { else if (ksdata.isRhel3() || ksdata.isRhel4()) { pkglist =3D FRESH_PKG_NAMES_RHEL34; } - else { - pkglist =3D FRESH_PKG_NAMES_RHEL5; - } HashSet retval =3D new HashSet(); for (int i =3D 0; i < pkglist.length; i++) { - Long packageId =3D ChannelManager.getLatestPackageEqualInT= ree(c.getId(), + Long packageId =3D ChannelManager.getLatestPackageEqual(c.= getId(), pkglist[i]); if (packageId !=3D null) { Package p =3D PackageFactory.lookupByIdAndUser(package= Id, user); --===============7621352000150326242==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:21 2015 Content-Type: multipart/mixed; boundary="===============8564631050512646455==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Thu, 04 Jun 2009 16:07:34 +0000 Message-ID: <20090604160734.298FE120312@lists.fedorahosted.org> --===============8564631050512646455== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java | 1= 1 +++++----- 1 file changed, 6 insertions(+), 5 deletions(-) New commits: commit a30e8abde70f098f732ca8736cc51cd9171e5e65 Author: Miroslav Such=C3=BD Date: Thu Jun 4 18:06:54 2009 +0200 499399 - api call proxy.createMonitoringScout now return scout shared k= ey diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandle= r.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.ja= va index 57daf18..081b813 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java @@ -57,15 +57,16 @@ public class ProxyHandler extends BaseHandler { /** * Create Monitoring Scout for proxy. * @param clientcert client certificate of the system. - * @return 1 on success, 0 if system is not proxy (scout is not create= d) + * @return string - scout shared key on success, = + * empty string if system is not proxy (scout is not created) * @throws MethodInvalidParamException thrown if certificate is invali= d. * @since 10.7 * * @xmlrpc.doc Create Monitoring Scout for proxy. * @xmlrpc.param #param_desc("string", "systemid", "systemid file") - * @xmlrpc.returntype #return_int_success() + * @xmlrpc.returntype string */ - public int createMonitoringScout(String clientcert) + public String createMonitoringScout(String clientcert) throws MethodInvalidParamException { = StringReader rdr =3D new StringReader(clientcert); @@ -108,10 +109,10 @@ public class ProxyHandler extends BaseHandler { SatClusterFactory.saveSatCluster(scout); SatClusterFactory.saveSatNode(node); = - return 1; + return node.getScoutSharedKey(); } else { - return 0; + return ""; } } = --===============8564631050512646455==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:21 2015 Content-Type: multipart/mixed; boundary="===============0066827275588735226==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Thu, 04 Jun 2009 16:08:16 +0000 Message-ID: <20090604160816.36A8F120312@lists.fedorahosted.org> --===============0066827275588735226== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java | 1= 1 +++++----- 1 file changed, 6 insertions(+), 5 deletions(-) New commits: commit 9bd443586e56a63c61fa96739d2799e62cfd17af Author: Miroslav Such=C3=BD Date: Thu Jun 4 18:06:54 2009 +0200 499399 - api call proxy.createMonitoringScout now return scout shared k= ey (cherry picked from commit a30e8abde70f098f732ca8736cc51cd9171e5e65) diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandle= r.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.ja= va index 57daf18..081b813 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java @@ -57,15 +57,16 @@ public class ProxyHandler extends BaseHandler { /** * Create Monitoring Scout for proxy. * @param clientcert client certificate of the system. - * @return 1 on success, 0 if system is not proxy (scout is not create= d) + * @return string - scout shared key on success, = + * empty string if system is not proxy (scout is not created) * @throws MethodInvalidParamException thrown if certificate is invali= d. * @since 10.7 * * @xmlrpc.doc Create Monitoring Scout for proxy. * @xmlrpc.param #param_desc("string", "systemid", "systemid file") - * @xmlrpc.returntype #return_int_success() + * @xmlrpc.returntype string */ - public int createMonitoringScout(String clientcert) + public String createMonitoringScout(String clientcert) throws MethodInvalidParamException { = StringReader rdr =3D new StringReader(clientcert); @@ -108,10 +109,10 @@ public class ProxyHandler extends BaseHandler { SatClusterFactory.saveSatCluster(scout); SatClusterFactory.saveSatNode(node); = - return 1; + return node.getScoutSharedKey(); } else { - return 0; + return ""; } } = --===============0066827275588735226==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:21 2015 Content-Type: multipart/mixed; boundary="===============8887621036714435078==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: proxy/installer Date: Thu, 04 Jun 2009 16:32:22 +0000 Message-ID: <20090604163222.F34EC120312@lists.fedorahosted.org> --===============8887621036714435078== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/installer/configure-proxy.sh | 21 ++++++++------------- proxy/installer/configure-proxy.sh.sgml | 12 ------------ 2 files changed, 8 insertions(+), 25 deletions(-) New commits: commit 613aa85cd7bbcb89f6df4e2f6ad5da4791204b1e Author: Miroslav Such=C3=BD Date: Thu Jun 4 18:27:03 2009 +0200 499399 - read SCOUT_SHARED_KEY value from api call proxy.createMonitori= ngScout diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure= -proxy.sh index c96d841..f5efff2 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -68,9 +68,6 @@ options: RHN_PARENT. --monitoring-parent-ip=3DMONITORING_PARENT_IP IP address of MONITORING_PARENT - --scout-shared-key=3DSCOUT_SHARED_KEY - Your scout shared key (can be found on the parent in = - /etc/rhn/cluster.ini as key scoutsharedkey). --populate-config-channel=3DY Y if config chanel should be created and configuration files in that ch= annel updated. Configuration channel will be named rhn_proxy_config_\${SYSTEM= _ID}. = @@ -108,7 +105,6 @@ while [ $# -ge 1 ]; do --enable-scout=3D*) ENABLE_SCOUT=3D$(echo $1 | cut -d=3D -f2-);; --monitoring-parent=3D*) MONITORING_PARENT_IP=3D$(echo $1 | cut -d=3D -= f2-);; --monitoring-parent-ip=3D*) MONITORING_PARENT_IP=3D$(echo $1 | cut -d= =3D -f2-);; - --scout-shared-key=3D*) SCOUT_SHARED_KEY=3D$(echo $1 | cut -d=3D -f2-);; --populate-config-channel=3D*) POPULATE_CONFIG_CHANNEL=3D$(echo $1 | cu= t -d=3D -f2-);; *) echo Error: Invalid option $1 esac @@ -312,9 +308,14 @@ if [ $MONITORING -eq 0 ]; then default_or_input "Monitoring parent IP" MONITORING_PARENT_IP "$RES= OLVED_IP" default_or_input "Enable monitoring scout" ENABLE_SCOUT "Y/n" ENABLE_SCOUT=3D$(yes_no $ENABLE_SCOUT) - MSG=3D$(echo -n "Your scout shared key (can be found on parent -in $RHNCONF_DIR/cluster.ini as key scoutsharedkey)") - default_or_input "$MSG" SCOUT_SHARED_KEY '' + SCOUT_SHARED_KEY=3D`/usr/bin/rhn-proxy-activate --enable-monitoring \ + --quiet \ + --server=3D"$RHN_PARENT" \ + --http-proxy=3D"$HTTP_PROXY" \ + --http-proxy-username=3D"$HTTP_USERNAME" \ + --http-proxy-password=3D"$HTTP_PASSWORD" \ + --ca-cert=3D"$CA_CHAIN" | \ + awk '/\: [0-9a-f]+/ { print $4 }' ` else ENABLE_SCOUT=3D0 fi @@ -455,12 +456,6 @@ fi echo "Enabling Spacewalk Proxy." if [ $ENABLE_SCOUT -ne 0 ]; then MonitoringScout=3D"MonitoringScout" - /usr/bin/rhn-proxy-activate --enable-monitoring \ - --server=3D"$RHN_PARENT" \ - --http-proxy=3D"$HTTP_PROXY" \ - --http-proxy-username=3D"$HTTP_USERNAME" \ - --http-proxy-password=3D"$HTTP_PASSWORD" \ - --ca-cert=3D"$CA_CHAIN" fi for service in squid httpd jabberd $MonitoringScout; do /sbin/chkconfig --add $service = diff --git a/proxy/installer/configure-proxy.sh.sgml b/proxy/installer/conf= igure-proxy.sh.sgml index 3d0e7fc..26b7b56 100644 --- a/proxy/installer/configure-proxy.sh.sgml +++ b/proxy/installer/configure-proxy.sh.sgml @@ -197,12 +197,6 @@ provide a required response, default answer is used. - --scout-shared-key=3DSCOUT_SHARED_KEY - - Your scout shared key (can be found on the parent in /et= c/rhn/cluster.ini as key scoutsharedkey). - - - --populate-config-channel=3DY Y if config chanel should be created and configuration f= iles in that channel updated. Configuration channel will be named rhn_proxy= _config_${SYSTEM_ID} @@ -347,12 +341,6 @@ provide a required response, default answer is used. - SCOUT_SHARED_KEY - - Your scout shared key (can be found on the parent in /etc= /rhn/cluster.ini as key scoutsharedkey). - - - POPULATE_CONFIG_CHANNEL Y if config chanel should be created and configuration fi= les in that channel updated. --===============8887621036714435078==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:21 2015 Content-Type: multipart/mixed; boundary="===============9061072353256363971==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - proxy/installer Date: Thu, 04 Jun 2009 16:33:14 +0000 Message-ID: <20090604163314.8D109120312@lists.fedorahosted.org> --===============9061072353256363971== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/installer/configure-proxy.sh | 21 ++++++++------------- proxy/installer/configure-proxy.sh.sgml | 12 ------------ 2 files changed, 8 insertions(+), 25 deletions(-) New commits: commit 906cb7232b1eb6ce4e65bf2843a63ae4198f220b Author: Miroslav Such=C3=BD Date: Thu Jun 4 18:27:03 2009 +0200 499399 - read SCOUT_SHARED_KEY value from api call proxy.createMonitori= ngScout (cherry picked from commit 613aa85cd7bbcb89f6df4e2f6ad5da4791204b1e) diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure= -proxy.sh index 2e3ce5e..9819436 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -68,9 +68,6 @@ options: RHN_PARENT. --monitoring-parent-ip=3DMONITORING_PARENT_IP IP address of MONITORING_PARENT - --scout-shared-key=3DSCOUT_SHARED_KEY - Your scout shared key (can be found on the parent in = - /etc/rhn/cluster.ini as key scoutsharedkey). --populate-config-channel=3DY Y if config chanel should be created and configuration files in that ch= annel updated. Configuration channel will be named rhn_proxy_config_\${SYSTEM= _ID}. = @@ -108,7 +105,6 @@ while [ $# -ge 1 ]; do --enable-scout=3D*) ENABLE_SCOUT=3D$(echo $1 | cut -d=3D -f2-);; --monitoring-parent=3D*) MONITORING_PARENT_IP=3D$(echo $1 | cut -d=3D -= f2-);; --monitoring-parent-ip=3D*) MONITORING_PARENT_IP=3D$(echo $1 | cut -d= =3D -f2-);; - --scout-shared-key=3D*) SCOUT_SHARED_KEY=3D$(echo $1 | cut -d=3D -f2-);; --populate-config-channel=3D*) POPULATE_CONFIG_CHANNEL=3D$(echo $1 | cu= t -d=3D -f2-);; *) echo Error: Invalid option $1 esac @@ -311,9 +307,14 @@ if [ $MONITORING -eq 0 ]; then default_or_input "Monitoring parent IP" MONITORING_PARENT_IP "$RES= OLVED_IP" default_or_input "Enable monitoring scout" ENABLE_SCOUT "Y/n" ENABLE_SCOUT=3D$(yes_no $ENABLE_SCOUT) - MSG=3D$(echo -n "Your scout shared key (can be found on parent -in $RHNCONF_DIR/cluster.ini as key scoutsharedkey)") - default_or_input "$MSG" SCOUT_SHARED_KEY '' + SCOUT_SHARED_KEY=3D`/usr/bin/rhn-proxy-activate --enable-monitoring \ + --quiet \ + --server=3D"$RHN_PARENT" \ + --http-proxy=3D"$HTTP_PROXY" \ + --http-proxy-username=3D"$HTTP_USERNAME" \ + --http-proxy-password=3D"$HTTP_PASSWORD" \ + --ca-cert=3D"$CA_CHAIN" | \ + awk '/\: [0-9a-f]+/ { print $4 }' ` else ENABLE_SCOUT=3D0 fi @@ -452,12 +453,6 @@ fi echo "Enabling Spacewalk Proxy." if [ $ENABLE_SCOUT -ne 0 ]; then MonitoringScout=3D"MonitoringScout" - /usr/bin/rhn-proxy-activate --enable-monitoring \ - --server=3D"$RHN_PARENT" \ - --http-proxy=3D"$HTTP_PROXY" \ - --http-proxy-username=3D"$HTTP_USERNAME" \ - --http-proxy-password=3D"$HTTP_PASSWORD" \ - --ca-cert=3D"$CA_CHAIN" fi for service in squid httpd jabberd $MonitoringScout; do /sbin/chkconfig --add $service = diff --git a/proxy/installer/configure-proxy.sh.sgml b/proxy/installer/conf= igure-proxy.sh.sgml index 3d0e7fc..26b7b56 100644 --- a/proxy/installer/configure-proxy.sh.sgml +++ b/proxy/installer/configure-proxy.sh.sgml @@ -197,12 +197,6 @@ provide a required response, default answer is used. - --scout-shared-key=3DSCOUT_SHARED_KEY - - Your scout shared key (can be found on the parent in /et= c/rhn/cluster.ini as key scoutsharedkey). - - - --populate-config-channel=3DY Y if config chanel should be created and configuration f= iles in that channel updated. Configuration channel will be named rhn_proxy= _config_${SYSTEM_ID} @@ -347,12 +341,6 @@ provide a required response, default answer is used. - SCOUT_SHARED_KEY - - Your scout shared key (can be found on the parent in /etc= /rhn/cluster.ini as key scoutsharedkey). - - - POPULATE_CONFIG_CHANNEL Y if config chanel should be created and configuration fi= les in that channel updated. --===============9061072353256363971==-- From partha at fedoraproject.org Thu Aug 20 11:57:21 2015 Content-Type: multipart/mixed; boundary="===============8363764674404060496==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Thu, 04 Jun 2009 18:11:15 +0000 Message-ID: <20090604181115.86DF5120312@lists.fedorahosted.org> --===============8363764674404060496== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/channel/Channel.java = | 7 ++++ java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java = | 15 +++++++++ java/code/src/com/redhat/rhn/frontend/action/channel/manage/DeleteChannelA= ction.java | 16 +++++++++- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xm= l | 3 + java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java = | 6 +++ java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp = | 10 ++++++ 6 files changed, 56 insertions(+), 1 deletion(-) New commits: commit f500062e0b1e9f92670979740a0dc401ba57b106 Author: Partha Aji Date: Thu Jun 4 14:13:20 2009 -0400 484294 - Fix to complain a channel with distros cant be deleted. diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.java b/jav= a/code/src/com/redhat/rhn/domain/channel/Channel.java index 57ffc57..b45d739 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/Channel.java +++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.java @@ -784,4 +784,11 @@ public class Channel extends BaseDomainHelper implemen= ts Comparable { return repodataRequired; } = + /** + * true if the channel contains any kickstartstartable distros + * @return true if the channel contains any distros. + */ + public boolean containsDistributions() { + return ChannelFactory.containsDistributions(this); + } } diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.jav= a b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java index 8d9f3ec..de9462a 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java +++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java @@ -27,6 +27,7 @@ import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.criterion.CriteriaSpecification; +import org.hibernate.criterion.Projections; import org.hibernate.criterion.Restrictions; = import com.redhat.rhn.common.db.datasource.CallableMode; @@ -36,6 +37,7 @@ import com.redhat.rhn.common.db.datasource.SelectMode; import com.redhat.rhn.common.db.datasource.WriteMode; import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.common.hibernate.HibernateRuntimeException; +import com.redhat.rhn.domain.kickstart.KickstartableTree; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.rhnpackage.Package; import com.redhat.rhn.domain.user.User; @@ -800,4 +802,17 @@ public class ChannelFactory extends HibernateFactory { = return retval; } + = + /** + * Method to check if the channel contains any kickstart distributions + * associated to it. + * @param ch the channel to check distros on = + * @return true of the channels contains any distros + */ + public static boolean containsDistributions(Channel ch) { + Criteria criteria =3D getSession().createCriteria(KickstartableTre= e.class); + criteria.setProjection(Projections.rowCount()); + criteria.add(Restrictions.eq("channel", ch)); + return (Integer)criteria.uniqueResult() > 0; + } } diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/De= leteChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/chann= el/manage/DeleteChannelAction.java index 24df388..0332303 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DeleteCha= nnelAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DeleteCha= nnelAction.java @@ -16,10 +16,13 @@ package com.redhat.rhn.frontend.action.channel.manage; = import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; + import com.redhat.rhn.common.security.PermissionException; +import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; @@ -33,7 +36,8 @@ import com.redhat.rhn.manager.system.SystemManager; * @version $Revision$ = */ public class DeleteChannelAction extends RhnAction { - + private static final String DISABLE_DELETE =3D "disableDelete"; + = /** {@inheritDoc} */ public ActionForward execute(ActionMapping actionMapping, ActionForm actionForm, @@ -77,6 +81,11 @@ public class DeleteChannelAction extends RhnAction { addMessage(request, e.getMessage()); return actionMapping.findForward("default"); } + catch (ValidatorException ve) { + getStrutsDelegate().saveMessages(request, ve.getResult= ()); + request.setAttribute(DISABLE_DELETE, Boolean.TRUE); + return actionMapping.findForward("default"); + } = createSuccessMessage(request, "message.channeldeleted", ch= annel.getName()); return actionMapping.findForward("success"); @@ -86,6 +95,11 @@ public class DeleteChannelAction extends RhnAction { return actionMapping.findForward("default"); } } + else if (channel.containsDistributions()) { + createErrorMessage(request, = + "message.channel.cannot-be-deleted.has-distros", null); + request.setAttribute(DISABLE_DELETE, Boolean.TRUE); + } = return actionMapping.findForward("default"); } diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResou= rce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringRe= source_en_US.xml index eefc958..d3ea29c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml @@ -8195,6 +8195,9 @@ Follow this url to see the full list of inactive syst= ems: There are currently systems subscribed to this channel. Pl= ease confirm system channel removal by selecting the unsubscribe checkbox.<= /source> + + There are currently kickstart distributions associated to = this channel. Please disassociate or delete the kickstart distributions bef= ore proceeding to delete the channel. + = Channel <strong>{0}</strong> updated. diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.ja= va b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java index 6add7da..2f05f7f 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -26,6 +26,7 @@ import com.redhat.rhn.common.hibernate.LookupException; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.security.PermissionException; import com.redhat.rhn.common.util.MethodUtil; +import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelArch; import com.redhat.rhn.domain.channel.ChannelFactory; @@ -906,6 +907,11 @@ public class ChannelManager extends BaseManager { LocalizationService.getInstance().getMessage( "api.channel.delete.haschild")); = = } + if (toRemove.containsDistributions()) { + ValidatorException.raiseException( + "message.channel.cannot-be-deleted.has-distros"); + = + } ChannelManager.queueChannelChange(label, = user.getLogin(), "java::deleteChannel"); ChannelFactory.remove(toRemove); = diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp b/jav= a/code/webapp/WEB-INF/pages/channel/manage/delete.jsp index d82d477..3219202 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp @@ -179,9 +179,19 @@ =

                                      + + + + + + + = + + = +
                                      --===============8363764674404060496==-- From partha at fedoraproject.org Thu Aug 20 11:57:21 2015 Content-Type: multipart/mixed; boundary="===============8833598198559520516==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Thu, 04 Jun 2009 18:11:59 +0000 Message-ID: <20090604181159.D1C6E120312@lists.fedorahosted.org> --===============8833598198559520516== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/channel/Channel.java = | 7 ++++ java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java = | 15 +++++++++ java/code/src/com/redhat/rhn/frontend/action/channel/manage/DeleteChannelA= ction.java | 16 +++++++++- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xm= l | 3 + java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java = | 6 +++ java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp = | 10 ++++++ 6 files changed, 56 insertions(+), 1 deletion(-) New commits: commit 0c19db0aaf5e77d7958b970710a099095f58d10a Author: Partha Aji Date: Thu Jun 4 14:13:20 2009 -0400 484294 - Fix to complain a channel with distros cant be deleted. diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.java b/jav= a/code/src/com/redhat/rhn/domain/channel/Channel.java index 57ffc57..b45d739 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/Channel.java +++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.java @@ -784,4 +784,11 @@ public class Channel extends BaseDomainHelper implemen= ts Comparable { return repodataRequired; } = + /** + * true if the channel contains any kickstartstartable distros + * @return true if the channel contains any distros. + */ + public boolean containsDistributions() { + return ChannelFactory.containsDistributions(this); + } } diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.jav= a b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java index 8d9f3ec..de9462a 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java +++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java @@ -27,6 +27,7 @@ import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.criterion.CriteriaSpecification; +import org.hibernate.criterion.Projections; import org.hibernate.criterion.Restrictions; = import com.redhat.rhn.common.db.datasource.CallableMode; @@ -36,6 +37,7 @@ import com.redhat.rhn.common.db.datasource.SelectMode; import com.redhat.rhn.common.db.datasource.WriteMode; import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.common.hibernate.HibernateRuntimeException; +import com.redhat.rhn.domain.kickstart.KickstartableTree; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.rhnpackage.Package; import com.redhat.rhn.domain.user.User; @@ -800,4 +802,17 @@ public class ChannelFactory extends HibernateFactory { = return retval; } + = + /** + * Method to check if the channel contains any kickstart distributions + * associated to it. + * @param ch the channel to check distros on = + * @return true of the channels contains any distros + */ + public static boolean containsDistributions(Channel ch) { + Criteria criteria =3D getSession().createCriteria(KickstartableTre= e.class); + criteria.setProjection(Projections.rowCount()); + criteria.add(Restrictions.eq("channel", ch)); + return (Integer)criteria.uniqueResult() > 0; + } } diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/De= leteChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/chann= el/manage/DeleteChannelAction.java index 24df388..0332303 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DeleteCha= nnelAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DeleteCha= nnelAction.java @@ -16,10 +16,13 @@ package com.redhat.rhn.frontend.action.channel.manage; = import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; + import com.redhat.rhn.common.security.PermissionException; +import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; @@ -33,7 +36,8 @@ import com.redhat.rhn.manager.system.SystemManager; * @version $Revision$ = */ public class DeleteChannelAction extends RhnAction { - + private static final String DISABLE_DELETE =3D "disableDelete"; + = /** {@inheritDoc} */ public ActionForward execute(ActionMapping actionMapping, ActionForm actionForm, @@ -77,6 +81,11 @@ public class DeleteChannelAction extends RhnAction { addMessage(request, e.getMessage()); return actionMapping.findForward("default"); } + catch (ValidatorException ve) { + getStrutsDelegate().saveMessages(request, ve.getResult= ()); + request.setAttribute(DISABLE_DELETE, Boolean.TRUE); + return actionMapping.findForward("default"); + } = createSuccessMessage(request, "message.channeldeleted", ch= annel.getName()); return actionMapping.findForward("success"); @@ -86,6 +95,11 @@ public class DeleteChannelAction extends RhnAction { return actionMapping.findForward("default"); } } + else if (channel.containsDistributions()) { + createErrorMessage(request, = + "message.channel.cannot-be-deleted.has-distros", null); + request.setAttribute(DISABLE_DELETE, Boolean.TRUE); + } = return actionMapping.findForward("default"); } diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResou= rce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringRe= source_en_US.xml index eefc958..d3ea29c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml @@ -8195,6 +8195,9 @@ Follow this url to see the full list of inactive syst= ems: There are currently systems subscribed to this channel. Pl= ease confirm system channel removal by selecting the unsubscribe checkbox.<= /source> + + There are currently kickstart distributions associated to = this channel. Please disassociate or delete the kickstart distributions bef= ore proceeding to delete the channel. + = Channel <strong>{0}</strong> updated. diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.ja= va b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java index 6add7da..2f05f7f 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -26,6 +26,7 @@ import com.redhat.rhn.common.hibernate.LookupException; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.security.PermissionException; import com.redhat.rhn.common.util.MethodUtil; +import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelArch; import com.redhat.rhn.domain.channel.ChannelFactory; @@ -906,6 +907,11 @@ public class ChannelManager extends BaseManager { LocalizationService.getInstance().getMessage( "api.channel.delete.haschild")); = = } + if (toRemove.containsDistributions()) { + ValidatorException.raiseException( + "message.channel.cannot-be-deleted.has-distros"); + = + } ChannelManager.queueChannelChange(label, = user.getLogin(), "java::deleteChannel"); ChannelFactory.remove(toRemove); = diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp b/jav= a/code/webapp/WEB-INF/pages/channel/manage/delete.jsp index d82d477..3219202 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp @@ -179,9 +179,19 @@ =

                                      + + + + + + + = + + = +
                                      --===============8833598198559520516==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:21 2015 Content-Type: multipart/mixed; boundary="===============6399203973176324504==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Thu, 04 Jun 2009 19:44:55 +0000 Message-ID: <20090604194455.74A84120312@lists.fedorahosted.org> --===============6399203973176324504== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml = | 15 ++++++ java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java = | 23 ++++++++++ java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java = | 2 = 3 files changed, 39 insertions(+), 1 deletion(-) New commits: commit 43be7a6e1c0efe2f777b1fd706a2748e710d0f54 Author: Devan Goodwin Date: Thu Jun 4 16:04:31 2009 -0300 Restore ChannelManager.getLatestPackageEqualInTree. = Un-revert part of the revert from 06b89603b02bc4f2ce0b28f484eb02835dd84c43. Going to keep this method as there was another spot still using it in master. diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_= queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel= _queries.xml index 92fbc33..1596c68 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml @@ -1028,6 +1028,21 @@ SELECT CP.package_id, CP.name_id, CP.evr_id, CP.pack= age_arch_id = + + +SELECT CP.package_id, CP.name_id, CP.evr_id, CP.package_arch_id + FROM rhnPackageName PN inner join + rhnChannelNewestPackage CP on CP.name_id =3D PN.id inner jo= in + rhnChannel C on C.id =3D Cp.channel_id inner join + rhnPackage P on P.id =3D CP.package_id inner join + rhnPackageEvr EVR on P.evr_id =3D EVR.id + WHERE ( C.id =3D :cid or C.parent_channel =3D :cid) + AND PN.name =3D :name + AND C.label not like '%beta%' + order by EVR.evr DESC + + + SELECT CP.package_id, CP.name_id, CP.evr_id diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.ja= va b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java index 2f05f7f..2c323d6 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -1387,6 +1387,29 @@ public class ChannelManager extends BaseManager { } = /** + * Get the id of latest packages located in the channel tree where cha= nnelId + * is a parent + * + * @param channelId to lookup package against + * @param packageName to check + * @return List containing Maps of "CP.package_id, CP.name_id, CP.evr_= id" + */ + public static Long getLatestPackageEqualInTree(Long channelId, + String packageName) { + SelectMode m =3D ModeFactory.getMode("Channel_queries", + "latest_package_equal_in_tree"); + Map params =3D new HashMap(); + params.put("cid", channelId); + params.put("name", packageName); + List results =3D m.execute(params); + if (results !=3D null && results.size() > 0) { + Map row =3D (Map) results.get(0); + return (Long) row.get("package_id"); + } + return null; + } + + /** * List the latest packages equal in the passed in Channel and name * = * @param channelId to lookup package against diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormat= ter.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatte= r.java index 6d54832..d93c3d5 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java @@ -816,7 +816,7 @@ public class KickstartFormatter { } HashSet retval =3D new HashSet(); for (int i =3D 0; i < pkglist.length; i++) { - Long packageId =3D ChannelManager.getLatestPackageEqual(c.= getId(), + Long packageId =3D ChannelManager.getLatestPackageEqualInT= ree(c.getId(), pkglist[i]); if (packageId !=3D null) { Package p =3D PackageFactory.lookupByIdAndUser(package= Id, user); --===============6399203973176324504==-- From jdob at fedoraproject.org Thu Aug 20 11:57:21 2015 Content-Type: multipart/mixed; boundary="===============1561054992754393380==" MIME-Version: 1.0 From: jdob To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Thu, 04 Jun 2009 19:58:52 +0000 Message-ID: <20090604195852.130CE120312@lists.fedorahosted.org> --===============1561054992754393380== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/security/acl/PackageAclHandler.java | = 19 ---------- 1 file changed, 19 deletions(-) New commits: commit 9615d5b149c356f1395556753cf69b2b1bf5559a Author: Jason Dobies Date: Thu Jun 4 15:54:08 2009 -0400 502941 - Now that 495506 is verified, removing the log message spam. diff --git a/java/code/src/com/redhat/rhn/common/security/acl/PackageAclHan= dler.java b/java/code/src/com/redhat/rhn/common/security/acl/PackageAclHand= ler.java index f8d3a81..be32e45 100644 --- a/java/code/src/com/redhat/rhn/common/security/acl/PackageAclHandler.ja= va +++ b/java/code/src/com/redhat/rhn/common/security/acl/PackageAclHandler.ja= va @@ -69,14 +69,7 @@ public class PackageAclHandler extends BaseHandler imple= ments AclHandler { */ public boolean aclPackageTypeCapable(Object ctx, String[] params) { = - /* 495506 - Increased the logging since I can't reliably reproduce= the issue. - I'll make this quiet again when we figure out why this incorrec= tly returns - false on the Satellite 5.3 builds. - jdobies, May 12, 2009 - */ - = if (params.length =3D=3D 0) { - log.warn("Incorrect number of parameters specified to ACL chec= k"); return false; } = @@ -88,7 +81,6 @@ public class PackageAclHandler extends BaseHandler implem= ents AclHandler { Package pack =3D PackageManager.lookupByIdAndUser(pid, user); = if (user =3D=3D null || pid =3D=3D null || pack =3D=3D null) { - log.warn("Check for capability [" + cap + "] is false. Package= : " + pack); return false; } = @@ -96,21 +88,10 @@ public class PackageAclHandler extends BaseHandler impl= ements AclHandler { Map> capMap =3D PackageFactory.getPackageCa= pabilityMap(); = if (capMap.get(type) =3D=3D null) { - log.warn("Check for capability [" + cap + "] on type [" + type= + - "] is false. Type not found in map. Map contents:"); - for (ArchType typeKey : capMap.keySet()) { - log.warn("Type key: " + typeKey); - } return false; } = boolean capFound =3D capMap.get(type).contains(cap); - = - if (!capFound) { - log.warn("Check for capability [" + cap + "] on type [" + type= + = - "] is false. Capability not found in map."); - } - = return capFound; } = --===============1561054992754393380==-- From jdob at fedoraproject.org Thu Aug 20 11:57:21 2015 Content-Type: multipart/mixed; boundary="===============5757011126618179818==" MIME-Version: 1.0 From: jdob To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Thu, 04 Jun 2009 19:59:32 +0000 Message-ID: <20090604195932.8ABE3120312@lists.fedorahosted.org> --===============5757011126618179818== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/security/acl/PackageAclHandler.java | = 19 ---------- 1 file changed, 19 deletions(-) New commits: commit 28beabf992fd4f88f39fd9486c0032c5b10dafef Author: Jason Dobies Date: Thu Jun 4 15:54:08 2009 -0400 502941 - Now that 495506 is verified, removing the log message spam. diff --git a/java/code/src/com/redhat/rhn/common/security/acl/PackageAclHan= dler.java b/java/code/src/com/redhat/rhn/common/security/acl/PackageAclHand= ler.java index f8d3a81..be32e45 100644 --- a/java/code/src/com/redhat/rhn/common/security/acl/PackageAclHandler.ja= va +++ b/java/code/src/com/redhat/rhn/common/security/acl/PackageAclHandler.ja= va @@ -69,14 +69,7 @@ public class PackageAclHandler extends BaseHandler imple= ments AclHandler { */ public boolean aclPackageTypeCapable(Object ctx, String[] params) { = - /* 495506 - Increased the logging since I can't reliably reproduce= the issue. - I'll make this quiet again when we figure out why this incorrec= tly returns - false on the Satellite 5.3 builds. - jdobies, May 12, 2009 - */ - = if (params.length =3D=3D 0) { - log.warn("Incorrect number of parameters specified to ACL chec= k"); return false; } = @@ -88,7 +81,6 @@ public class PackageAclHandler extends BaseHandler implem= ents AclHandler { Package pack =3D PackageManager.lookupByIdAndUser(pid, user); = if (user =3D=3D null || pid =3D=3D null || pack =3D=3D null) { - log.warn("Check for capability [" + cap + "] is false. Package= : " + pack); return false; } = @@ -96,21 +88,10 @@ public class PackageAclHandler extends BaseHandler impl= ements AclHandler { Map> capMap =3D PackageFactory.getPackageCa= pabilityMap(); = if (capMap.get(type) =3D=3D null) { - log.warn("Check for capability [" + cap + "] on type [" + type= + - "] is false. Type not found in map. Map contents:"); - for (ArchType typeKey : capMap.keySet()) { - log.warn("Type key: " + typeKey); - } return false; } = boolean capFound =3D capMap.get(type).contains(cap); - = - if (!capFound) { - log.warn("Check for capability [" + cap + "] on type [" + type= + = - "] is false. Capability not found in map."); - } - = return capFound; } = --===============5757011126618179818==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:21 2015 Content-Type: multipart/mixed; boundary="===============2891387136796886888==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Thu, 04 Jun 2009 20:49:21 +0000 Message-ID: <20090604204921.87BA3120312@lists.fedorahosted.org> --===============2891387136796886888== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | = 88 +++++----- 1 file changed, 45 insertions(+), 43 deletions(-) New commits: commit 9253eeb7301a6df8cf6588d8c99bcb6d940ace09 Author: Brad Buckingham Date: Thu Jun 4 16:49:06 2009 -0400 504054 - api - errata.getOval - commenting out api = The functionality to support OVAL is not fully available/supported. As= a result, this API is not useful; however, since OVAL functionality is desirable in the future, the API is being commented out for the moment. diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHand= ler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandle= r.java index bd82c0c..ae4002b 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java @@ -18,7 +18,6 @@ import com.redhat.rhn.FaultException; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.common.util.OvalFileAggregator; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelFactory; import com.redhat.rhn.domain.channel.InvalidChannelRoleException; @@ -48,21 +47,13 @@ import com.redhat.rhn.manager.errata.cache.ErrataCacheM= anager; import com.redhat.rhn.manager.rhnpackage.PackageManager; = import org.apache.commons.collections.IteratorUtils; -import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; -import org.jdom.JDOMException; = -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; @@ -91,6 +82,16 @@ public class ErrataHandler extends BaseHandler { * (RHSA-2006:011) can be submitted as they are.") * @xmlrpc.returntype string - The OVAL metadata document in escaped X= ML form. */ + /** + * The getOval method is being commented out due to bugzilla 504054. = This bug + * raises an issue of a null exception being generated on execution. = The method + * has been updated to address that exception; however, there is a lar= ger issue at + * hand in that the OVAL functionality is not fully supported by the a= pplication. + * For example, the OVAL meta data is not synced to the database; ther= efore, there + * will never be data to return by the method. So it is better to com= ment it out + * than to have the method that cannot return any data. :) It is, how= ever, + * desirable to support this in the future, so we don't want to lose t= he logic. + * public String getOval(String sessionKey, String identifier) throws IOE= xception, FaultException { User loggedInUser =3D getLoggedInUser(sessionKey); @@ -103,7 +104,6 @@ public class ErrataHandler extends BaseHandler { erratas.remove(errata); } } - = = if (erratas =3D=3D null) { throw new FaultException(-1, "errataNotFound", = @@ -122,50 +122,52 @@ public class ErrataHandler extends BaseHandler { } } files =3D ErrataManager.resolveOvalFiles(files); - if (files.size() =3D=3D 0) { - throw new FaultException(-1, "ovalNotFound", - "No OVAL files found for given errata"); - } - else if (files.size() =3D=3D 1) { - File f =3D (File) files.get(0); - if (f !=3D null) { - InputStream in =3D null; - byte[] buf =3D new byte[4096]; - int readsize =3D 0; - ByteArrayOutputStream accum =3D new ByteArrayOutputSt= ream(); - try { - in =3D new FileInputStream(f); - while ((readsize =3D in.read(buf)) > -1) { - accum.write(buf, 0, readsize); + if (files !=3D null) { + if (files.size() =3D=3D 0) { + throw new FaultException(-1, "ovalNotFound", + "No OVAL files found for given errata"); + } + else if (files.size() =3D=3D 1) { + File f =3D (File) files.get(0); + if (f !=3D null) { + InputStream in =3D null; + byte[] buf =3D new byte[4096]; + int readsize =3D 0; + ByteArrayOutputStream accum =3D new ByteArrayOutp= utStream(); + try { + in =3D new FileInputStream(f); + while ((readsize =3D in.read(buf)) > -1) { + accum.write(buf, 0, readsize); + } + retval =3D new String(accum.toByteArray(), "UT= F-8"); } - retval =3D new String(accum.toByteArray(), "UTF-8"= ); - } - finally { - if (in !=3D null) { - in.close(); + finally { + if (in !=3D null) { + in.close(); + } } } } - } - else if (files.size() > 1) { - try { - OvalFileAggregator agg =3D new OvalFileAggregator(); - for (Iterator iter =3D files.iterator(); iter.hasNext(= );) { - File f =3D (File) iter.next(); - if (f !=3D null && !f.getPath().endsWith("test-5.x= ml")) { - agg.add(f); + else if (files.size() > 1) { + try { + OvalFileAggregator agg =3D new OvalFileAggregator(= ); + for (Iterator iter =3D files.iterator(); iter.hasN= ext();) { + File f =3D (File) iter.next(); + if (f !=3D null && !f.getPath().endsWith("test= -5.xml")) { + agg.add(f); + } } + retval =3D StringEscapeUtils.escapeXml(agg.finish(= false)); + } + catch (JDOMException e) { + throw new FaultException(-1, "err_building_oval", = e.getMessage()); } - retval =3D StringEscapeUtils.escapeXml(agg.finish(fals= e)); - } - catch (JDOMException e) { - throw new FaultException(-1, "err_building_oval", e.ge= tMessage()); } - = } } return retval; } + */ = /** * GetDetails - Retrieves the details for a given errata. = --===============2891387136796886888==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:21 2015 Content-Type: multipart/mixed; boundary="===============4587857601942373134==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Thu, 04 Jun 2009 20:50:21 +0000 Message-ID: <20090604205021.E222C120312@lists.fedorahosted.org> --===============4587857601942373134== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | = 88 +++++----- 1 file changed, 45 insertions(+), 43 deletions(-) New commits: commit 90164bccadaca3e2199f3fb42a6a69608a6f4bdf Author: Brad Buckingham Date: Thu Jun 4 16:49:06 2009 -0400 504054 - api - errata.getOval - commenting out api = The functionality to support OVAL is not fully available/supported. As= a result, this API is not useful; however, since OVAL functionality is desirable in the future, the API is being commented out for the moment. diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHand= ler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandle= r.java index bd82c0c..ae4002b 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java @@ -18,7 +18,6 @@ import com.redhat.rhn.FaultException; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.common.util.OvalFileAggregator; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelFactory; import com.redhat.rhn.domain.channel.InvalidChannelRoleException; @@ -48,21 +47,13 @@ import com.redhat.rhn.manager.errata.cache.ErrataCacheM= anager; import com.redhat.rhn.manager.rhnpackage.PackageManager; = import org.apache.commons.collections.IteratorUtils; -import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; -import org.jdom.JDOMException; = -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; @@ -91,6 +82,16 @@ public class ErrataHandler extends BaseHandler { * (RHSA-2006:011) can be submitted as they are.") * @xmlrpc.returntype string - The OVAL metadata document in escaped X= ML form. */ + /** + * The getOval method is being commented out due to bugzilla 504054. = This bug + * raises an issue of a null exception being generated on execution. = The method + * has been updated to address that exception; however, there is a lar= ger issue at + * hand in that the OVAL functionality is not fully supported by the a= pplication. + * For example, the OVAL meta data is not synced to the database; ther= efore, there + * will never be data to return by the method. So it is better to com= ment it out + * than to have the method that cannot return any data. :) It is, how= ever, + * desirable to support this in the future, so we don't want to lose t= he logic. + * public String getOval(String sessionKey, String identifier) throws IOE= xception, FaultException { User loggedInUser =3D getLoggedInUser(sessionKey); @@ -103,7 +104,6 @@ public class ErrataHandler extends BaseHandler { erratas.remove(errata); } } - = = if (erratas =3D=3D null) { throw new FaultException(-1, "errataNotFound", = @@ -122,50 +122,52 @@ public class ErrataHandler extends BaseHandler { } } files =3D ErrataManager.resolveOvalFiles(files); - if (files.size() =3D=3D 0) { - throw new FaultException(-1, "ovalNotFound", - "No OVAL files found for given errata"); - } - else if (files.size() =3D=3D 1) { - File f =3D (File) files.get(0); - if (f !=3D null) { - InputStream in =3D null; - byte[] buf =3D new byte[4096]; - int readsize =3D 0; - ByteArrayOutputStream accum =3D new ByteArrayOutputSt= ream(); - try { - in =3D new FileInputStream(f); - while ((readsize =3D in.read(buf)) > -1) { - accum.write(buf, 0, readsize); + if (files !=3D null) { + if (files.size() =3D=3D 0) { + throw new FaultException(-1, "ovalNotFound", + "No OVAL files found for given errata"); + } + else if (files.size() =3D=3D 1) { + File f =3D (File) files.get(0); + if (f !=3D null) { + InputStream in =3D null; + byte[] buf =3D new byte[4096]; + int readsize =3D 0; + ByteArrayOutputStream accum =3D new ByteArrayOutp= utStream(); + try { + in =3D new FileInputStream(f); + while ((readsize =3D in.read(buf)) > -1) { + accum.write(buf, 0, readsize); + } + retval =3D new String(accum.toByteArray(), "UT= F-8"); } - retval =3D new String(accum.toByteArray(), "UTF-8"= ); - } - finally { - if (in !=3D null) { - in.close(); + finally { + if (in !=3D null) { + in.close(); + } } } } - } - else if (files.size() > 1) { - try { - OvalFileAggregator agg =3D new OvalFileAggregator(); - for (Iterator iter =3D files.iterator(); iter.hasNext(= );) { - File f =3D (File) iter.next(); - if (f !=3D null && !f.getPath().endsWith("test-5.x= ml")) { - agg.add(f); + else if (files.size() > 1) { + try { + OvalFileAggregator agg =3D new OvalFileAggregator(= ); + for (Iterator iter =3D files.iterator(); iter.hasN= ext();) { + File f =3D (File) iter.next(); + if (f !=3D null && !f.getPath().endsWith("test= -5.xml")) { + agg.add(f); + } } + retval =3D StringEscapeUtils.escapeXml(agg.finish(= false)); + } + catch (JDOMException e) { + throw new FaultException(-1, "err_building_oval", = e.getMessage()); } - retval =3D StringEscapeUtils.escapeXml(agg.finish(fals= e)); - } - catch (JDOMException e) { - throw new FaultException(-1, "err_building_oval", e.ge= tMessage()); } - = } } return retval; } + */ = /** * GetDetails - Retrieves the details for a given errata. = --===============4587857601942373134==-- From partha at fedoraproject.org Thu Aug 20 11:57:22 2015 Content-Type: multipart/mixed; boundary="===============8290667348982331893==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Thu, 04 Jun 2009 21:02:06 +0000 Message-ID: <20090604210206.A833D120312@lists.fedorahosted.org> --===============8290667348982331893== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegateImpl.java | 1= 2 +++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) New commits: commit 99a218aa106f3a078f2e7a7743b2a3c678af312f Author: Partha Aji Date: Thu Jun 4 17:04:12 2009 -0400 Fixed code that would show up even error messages as good messages in t= he UI diff --git a/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegateImp= l.java b/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegateImpl.ja= va index cab18e4..5a4c36f 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegateImpl.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegateImpl.java @@ -126,22 +126,28 @@ public class StrutsDelegateImpl implements StrutsDele= gate { HttpSession session =3D request.getSession(); = if ((messages =3D=3D null) || messages.isEmpty()) { + session.removeAttribute(Globals.ERROR_KEY); session.removeAttribute(Globals.MESSAGE_KEY); return; } + String key =3D Globals.MESSAGE_KEY; + if (messages instanceof ActionErrors) { + key =3D Globals.ERROR_KEY; + } + = ActionMessages newMessages =3D new ActionMessages(); = // Check for existing messages ActionMessages sessionExisting =3D = - (ActionMessages) session.getAttribute(Globals.MESSAGE_KEY); + (ActionMessages) session.getAttribute(key); = if (sessionExisting !=3D null) { newMessages.add(sessionExisting); } newMessages.add(messages); = - session.setAttribute(Globals.MESSAGE_KEY, newMessages); - request.setAttribute(Globals.MESSAGE_KEY, newMessages); + session.setAttribute(key, newMessages); + request.setAttribute(key, newMessages); } = /** --===============8290667348982331893==-- From partha at fedoraproject.org Thu Aug 20 11:57:22 2015 Content-Type: multipart/mixed; boundary="===============3378568553717477451==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Thu, 04 Jun 2009 21:04:39 +0000 Message-ID: <20090604210439.92402120312@lists.fedorahosted.org> --===============3378568553717477451== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegateImpl.java | 1= 2 +++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) New commits: commit f97cc9fc27a96ef0d6c1b0c078ce600752fa7ff5 Author: Partha Aji Date: Thu Jun 4 17:04:12 2009 -0400 Fixed code that would show up even error messages as good messages in t= he UI diff --git a/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegateImp= l.java b/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegateImpl.ja= va index cab18e4..5a4c36f 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegateImpl.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegateImpl.java @@ -126,22 +126,28 @@ public class StrutsDelegateImpl implements StrutsDele= gate { HttpSession session =3D request.getSession(); = if ((messages =3D=3D null) || messages.isEmpty()) { + session.removeAttribute(Globals.ERROR_KEY); session.removeAttribute(Globals.MESSAGE_KEY); return; } + String key =3D Globals.MESSAGE_KEY; + if (messages instanceof ActionErrors) { + key =3D Globals.ERROR_KEY; + } + = ActionMessages newMessages =3D new ActionMessages(); = // Check for existing messages ActionMessages sessionExisting =3D = - (ActionMessages) session.getAttribute(Globals.MESSAGE_KEY); + (ActionMessages) session.getAttribute(key); = if (sessionExisting !=3D null) { newMessages.add(sessionExisting); } newMessages.add(messages); = - session.setAttribute(Globals.MESSAGE_KEY, newMessages); - request.setAttribute(Globals.MESSAGE_KEY, newMessages); + session.setAttribute(key, newMessages); + request.setAttribute(key, newMessages); } = /** --===============3378568553717477451==-- From shughes at fedoraproject.org Thu Aug 20 11:57:22 2015 Content-Type: multipart/mixed; boundary="===============0327270750593453330==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Thu, 04 Jun 2009 21:34:05 +0000 Message-ID: <20090604213405.72C01120312@lists.fedorahosted.org> --===============0327270750593453330== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/satellite/TaskStatusAction.ja= va | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 7057d477fb9036e4f364f17bad77917746290604 Author: Shannon Hughes Date: Thu Jun 4 17:27:30 2009 -0400 502959 - skip null date values for taskomatic status diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/TaskSta= tusAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/Tas= kStatusAction.java index fcf28b4..0fe07fb 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/satellite/TaskStatusActi= on.java +++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/TaskStatusActi= on.java @@ -65,7 +65,9 @@ public class TaskStatusAction extends RhnAction { = for (Map map : toDisplay) { Date date =3D TaskManager.getTaskExecutionTime((String) map.ge= t(LABEL)); - map.put(DATE, LocalizationService.getInstance().formatDate(dat= e)); + if (date !=3D null) { + map.put(DATE, LocalizationService.getInstance().formatDate= (date)); + } } = = --===============0327270750593453330==-- From shughes at fedoraproject.org Thu Aug 20 11:57:22 2015 Content-Type: multipart/mixed; boundary="===============5811559270698033741==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Thu, 04 Jun 2009 21:34:48 +0000 Message-ID: <20090604213448.B72FA120312@lists.fedorahosted.org> --===============5811559270698033741== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/satellite/TaskStatusAction.ja= va | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 73e250c00beb289ed1f5e8a9cc73ccafcd22670f Author: Shannon Hughes Date: Thu Jun 4 17:27:30 2009 -0400 502959 - skip null date values for taskomatic status diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/TaskSta= tusAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/Tas= kStatusAction.java index fcf28b4..0fe07fb 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/satellite/TaskStatusActi= on.java +++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/TaskStatusActi= on.java @@ -65,7 +65,9 @@ public class TaskStatusAction extends RhnAction { = for (Map map : toDisplay) { Date date =3D TaskManager.getTaskExecutionTime((String) map.ge= t(LABEL)); - map.put(DATE, LocalizationService.getInstance().formatDate(dat= e)); + if (date !=3D null) { + map.put(DATE, LocalizationService.getInstance().formatDate= (date)); + } } = = --===============5811559270698033741==-- From partha at fedoraproject.org Thu Aug 20 11:57:22 2015 Content-Type: multipart/mixed; boundary="===============1797729295733058169==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Thu, 04 Jun 2009 22:18:17 +0000 Message-ID: <20090604221817.3F327120312@lists.fedorahosted.org> --===============1797729295733058169== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigFileForm.= java | 20 = java/code/src/com/redhat/rhn/frontend/action/errata/DeleteErratumAction.ja= va | 22 = java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java = | 46 - java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPatchSetAct= ion.java | 30 = java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageIndexAction= .java | 30 = java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfi= rmAction.java | 32 - java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfi= rmInstallAction.java | 30 = java/code/src/com/redhat/rhn/frontend/action/user/UserListAction.java = | 20 = java/code/src/com/redhat/rhn/frontend/servlets/EnvironmentFilter.java = | 23 = java/code/src/com/redhat/rhn/frontend/struts/RhnAction.java = | 12 = java/code/src/com/redhat/rhn/frontend/struts/RhnHelper.java = | 7 = java/code/src/com/redhat/rhn/frontend/struts/RhnLookupDispatchAction.java = | 11 = java/code/src/com/redhat/rhn/frontend/struts/RhnSetHelper.java = | 2 = java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java = | 260 +++++++- java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegateFactory.java = | 52 - java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegateImpl.java = | 320 ---------- java/code/src/com/redhat/rhn/frontend/struts/test/RhnUnpagedListActionTest= .java | 19 = java/code/src/com/redhat/rhn/frontend/struts/test/StrutsDelegateImplTest.j= ava | 8 = 18 files changed, 370 insertions(+), 574 deletions(-) New commits: commit 7005eeb550adff204857efa8f24a69886009f020 Author: Partha Aji Date: Thu Jun 4 18:20:20 2009 -0400 good bye StrutsDelegateImpl and StrutsDelegateFactory diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/Con= figFileForm.java b/java/code/src/com/redhat/rhn/frontend/action/configurati= on/ConfigFileForm.java index 0efe595..bb49df8 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigFile= Form.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigFile= Form.java @@ -14,6 +14,14 @@ */ package com.redhat.rhn.frontend.action.configuration; = +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.text.DecimalFormat; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.struts.upload.FormFile; + import com.redhat.rhn.common.conf.Config; import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.common.validator.ValidatorError; @@ -27,7 +35,6 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm; import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.frontend.struts.StrutsDelegateFactory; import com.redhat.rhn.manager.configuration.ConfigurationManager; import com.redhat.rhn.manager.configuration.ConfigurationValidation; import com.redhat.rhn.manager.configuration.file.BinaryFileData; @@ -35,14 +42,6 @@ import com.redhat.rhn.manager.configuration.file.ConfigF= ileData; import com.redhat.rhn.manager.configuration.file.DirectoryData; import com.redhat.rhn.manager.configuration.file.TextFileData; = -import org.apache.struts.upload.FormFile; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.text.DecimalFormat; - -import javax.servlet.http.HttpServletRequest; - /** * ConfigFileForm * @version $Rev$ @@ -298,8 +297,7 @@ public class ConfigFileForm extends ScrubbingDynaAction= Form { else { if (isUpload()) { FormFile file =3D (FormFile) get(REV_UPLOAD); - StrutsDelegate del =3D StrutsDelegateFactory. - getInstance().getStrutsDelegat= e(); + StrutsDelegate del =3D StrutsDelegate.getInstance(); data =3D new TextFileData(del.extractString(file)); = = } else { diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/DeleteErra= tumAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/Delete= ErratumAction.java index 92fc342..fb7c2fe 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/errata/DeleteErratumActi= on.java +++ b/java/code/src/com/redhat/rhn/frontend/action/errata/DeleteErratumActi= on.java @@ -14,11 +14,11 @@ */ package com.redhat.rhn.frontend.action.errata; = -import com.redhat.rhn.domain.errata.Errata; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.frontend.struts.StrutsDelegateFactory; -import com.redhat.rhn.manager.errata.ErrataManager; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; = import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; @@ -27,11 +27,10 @@ import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.apache.struts.actions.LookupDispatchAction; = -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import com.redhat.rhn.domain.errata.Errata; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.StrutsDelegate; +import com.redhat.rhn.manager.errata.ErrataManager; = /** * DeleteErratumAction @@ -40,8 +39,7 @@ import javax.servlet.http.HttpServletResponse; public class DeleteErratumAction extends LookupDispatchAction { = private StrutsDelegate getStrutsDelegate() { - StrutsDelegateFactory factory =3D StrutsDelegateFactory.getInstanc= e(); - return factory.getStrutsDelegate(); + return StrutsDelegate.getInstance(); } = /** diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction= .java b/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java index b2cb4b4..271e044 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java @@ -14,17 +14,17 @@ */ package com.redhat.rhn.frontend.action.errata; = -import com.redhat.rhn.common.hibernate.HibernateFactory; -import com.redhat.rhn.common.hibernate.HibernateRuntimeException; -import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.common.util.StringUtil; -import com.redhat.rhn.domain.errata.Errata; -import com.redhat.rhn.frontend.action.common.BadParameterException; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.struts.RhnValidationHelper; -import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.frontend.struts.StrutsDelegateFactory; -import com.redhat.rhn.manager.errata.ErrataManager; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; = import org.apache.commons.collections.IteratorUtils; import org.apache.commons.lang.StringUtils; @@ -38,17 +38,16 @@ import org.apache.struts.action.DynaActionForm; import org.apache.struts.actions.LookupDispatchAction; import org.hibernate.HibernateException; = -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import com.redhat.rhn.common.hibernate.HibernateFactory; +import com.redhat.rhn.common.hibernate.HibernateRuntimeException; +import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.common.util.StringUtil; +import com.redhat.rhn.domain.errata.Errata; +import com.redhat.rhn.frontend.action.common.BadParameterException; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnValidationHelper; +import com.redhat.rhn.frontend.struts.StrutsDelegate; +import com.redhat.rhn.manager.errata.ErrataManager; = /** * EditAction @@ -57,8 +56,7 @@ import javax.servlet.http.HttpServletResponse; public class EditAction extends LookupDispatchAction { = private StrutsDelegate getStrutsDelegate() { - StrutsDelegateFactory factory =3D StrutsDelegateFactory.getInstanc= e(); - return factory.getStrutsDelegate(); + return StrutsDelegate.getInstance(); } = /** diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/Instal= lPatchSetAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpack= age/InstallPatchSetAction.java index 791ba81..def9f47 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPatchS= etAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPatchS= etAction.java @@ -14,6 +14,19 @@ */ package com.redhat.rhn.frontend.action.rhnpackage; = +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.actions.LookupDispatchAction; + import com.redhat.rhn.domain.action.Action; import com.redhat.rhn.domain.rhnpackage.Package; import com.redhat.rhn.domain.rhnpackage.PatchSet; @@ -22,24 +35,10 @@ import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.frontend.struts.StrutsDelegateFactory; import com.redhat.rhn.manager.action.ActionManager; import com.redhat.rhn.manager.rhnpackage.PackageManager; 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.ActionMessage; -import org.apache.struts.action.ActionMessages; -import org.apache.struts.actions.LookupDispatchAction; - -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** * InstallPatchSetAction * @version $Rev$ @@ -47,8 +46,7 @@ import javax.servlet.http.HttpServletResponse; public class InstallPatchSetAction extends LookupDispatchAction { = private StrutsDelegate getStrutsDelegate() { - StrutsDelegateFactory factory =3D StrutsDelegateFactory.getInstanc= e(); - return factory.getStrutsDelegate(); + return StrutsDelegate.getInstance(); } = /** diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/Packag= eIndexAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage= /PackageIndexAction.java index 273a7e9..b5a54cb 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageIndexA= ction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageIndexA= ction.java @@ -14,15 +14,11 @@ */ package com.redhat.rhn.frontend.action.rhnpackage; = -import com.redhat.rhn.domain.action.rhnpackage.PackageAction; -import com.redhat.rhn.domain.server.Server; -import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.frontend.action.systems.sdc.SdcHelper; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.frontend.struts.StrutsDelegateFactory; -import com.redhat.rhn.manager.action.ActionManager; -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; = import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; @@ -31,11 +27,14 @@ import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.apache.struts.actions.LookupDispatchAction; = -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import com.redhat.rhn.domain.action.rhnpackage.PackageAction; +import com.redhat.rhn.domain.server.Server; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.action.systems.sdc.SdcHelper; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.StrutsDelegate; +import com.redhat.rhn.manager.action.ActionManager; +import com.redhat.rhn.manager.system.SystemManager; = /** * PackageIndexAction @@ -44,8 +43,7 @@ import javax.servlet.http.HttpServletResponse; public class PackageIndexAction extends LookupDispatchAction { = private StrutsDelegate getStrutsDelegate() { - StrutsDelegateFactory factory =3D StrutsDelegateFactory.getInstanc= e(); - return factory.getStrutsDelegate(); + return StrutsDelegate.getInstance(); } = /** diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patche= s/PatchConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/rh= npackage/patches/PatchConfirmAction.java index 9dd94ed..60933c4 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/Patch= ConfirmAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/Patch= ConfirmAction.java @@ -14,6 +14,19 @@ */ package com.redhat.rhn.frontend.action.rhnpackage.patches; = +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.actions.LookupDispatchAction; + import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.domain.action.Action; import com.redhat.rhn.domain.rhnset.RhnSet; @@ -21,33 +34,18 @@ import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.frontend.struts.StrutsDelegateFactory; import com.redhat.rhn.manager.action.ActionManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; 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.ActionMessage; -import org.apache.struts.action.ActionMessages; -import org.apache.struts.actions.LookupDispatchAction; - -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** * ErrataConfirmAction * @version $Rev: 53116 $ */ public class PatchConfirmAction extends LookupDispatchAction { = - private StrutsDelegate getStrutsDelegate() { - StrutsDelegateFactory factory =3D StrutsDelegateFactory.getInstanc= e(); - return factory.getStrutsDelegate(); + private StrutsDelegate getStrutsDelegate() { = + return StrutsDelegate.getInstance(); } = /** diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patche= s/PatchConfirmInstallAction.java b/java/code/src/com/redhat/rhn/frontend/ac= tion/rhnpackage/patches/PatchConfirmInstallAction.java index 7b6ddd7..7914da4 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/Patch= ConfirmInstallAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/Patch= ConfirmInstallAction.java @@ -14,6 +14,19 @@ */ package com.redhat.rhn.frontend.action.rhnpackage.patches; = +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.actions.LookupDispatchAction; + import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.domain.action.Action; import com.redhat.rhn.domain.rhnset.RhnSet; @@ -21,24 +34,10 @@ import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.frontend.struts.StrutsDelegateFactory; import com.redhat.rhn.manager.action.ActionManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; 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.ActionMessage; -import org.apache.struts.action.ActionMessages; -import org.apache.struts.actions.LookupDispatchAction; - -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** * ErrataConfirmAction * @version $Rev: 53116 $ @@ -46,8 +45,7 @@ import javax.servlet.http.HttpServletResponse; public class PatchConfirmInstallAction extends LookupDispatchAction { = private StrutsDelegate getStrutsDelegate() { - StrutsDelegateFactory factory =3D StrutsDelegateFactory.getInstanc= e(); - return factory.getStrutsDelegate(); + return StrutsDelegate.getInstance(); } = /** diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/UserListActi= on.java b/java/code/src/com/redhat/rhn/frontend/action/user/UserListAction.= java index 08be660..93abcbf 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/UserListAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/user/UserListAction.java @@ -14,21 +14,20 @@ */ package com.redhat.rhn.frontend.action.user; = -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.frontend.struts.StrutsDelegateFactory; -import com.redhat.rhn.frontend.taglibs.ListDisplayTag; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; = import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.struts.actions.LookupDispatchAction; = -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.StrutsDelegate; +import com.redhat.rhn.frontend.taglibs.ListDisplayTag; = /** * UserListAction @@ -37,8 +36,7 @@ import javax.servlet.http.HttpServletResponse; public class UserListAction extends LookupDispatchAction { = private StrutsDelegate getStrutsDelegate() { - StrutsDelegateFactory factory =3D StrutsDelegateFactory.getInstanc= e(); - return factory.getStrutsDelegate(); + return StrutsDelegate.getInstance(); } = /** {@inheritDoc} */ diff --git a/java/code/src/com/redhat/rhn/frontend/servlets/EnvironmentFilt= er.java b/java/code/src/com/redhat/rhn/frontend/servlets/EnvironmentFilter.= java index 73cefc8..302e60a 100644 --- a/java/code/src/com/redhat/rhn/frontend/servlets/EnvironmentFilter.java +++ b/java/code/src/com/redhat/rhn/frontend/servlets/EnvironmentFilter.java @@ -14,16 +14,6 @@ */ package com.redhat.rhn.frontend.servlets; = -import com.redhat.rhn.common.conf.Config; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.struts.RhnHelper; -import com.redhat.rhn.frontend.struts.StrutsDelegateFactory; - -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.log4j.Logger; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; - import java.io.IOException; = import javax.servlet.Filter; @@ -35,6 +25,16 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; = +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.log4j.Logger; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; + +import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnHelper; +import com.redhat.rhn.frontend.struts.StrutsDelegate; + /** * EnvironmentFilter * @version $Rev$ @@ -122,8 +122,7 @@ public class EnvironmentFilter implements Filter { args[2] =3D StringEscapeUtils.escapeHtml(param3); = msg.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(messa= geKey, args)); - StrutsDelegateFactory.getInstance(). - getStrutsDelegate().saveMessages(req, msg); + StrutsDelegate.getInstance().saveMessages(req, msg); } } = diff --git a/java/code/src/com/redhat/rhn/frontend/struts/RhnAction.java b/= java/code/src/com/redhat/rhn/frontend/struts/RhnAction.java index b89edba..ef40831 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/RhnAction.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/RhnAction.java @@ -59,16 +59,6 @@ import javax.servlet.http.HttpServletRequest; public abstract class RhnAction extends Action { = public static final String SUBMITTED =3D "submitted"; - = - private StrutsDelegate strutsDelegate; - = - /** - * Performs default initialization. - */ - public RhnAction() { - strutsDelegate =3D StrutsDelegateFactory.getInstance().getStrutsDe= legate(); - } - = /** * Returns a StrutsDelegate object. * = @@ -77,7 +67,7 @@ public abstract class RhnAction extends Action { * @see StrutsDelegateFactory */ protected StrutsDelegate getStrutsDelegate() { - return strutsDelegate; + return StrutsDelegate.getInstance(); } = /** diff --git a/java/code/src/com/redhat/rhn/frontend/struts/RhnHelper.java b/= java/code/src/com/redhat/rhn/frontend/struts/RhnHelper.java index 9d7c632..7fff556 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/RhnHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/RhnHelper.java @@ -15,13 +15,13 @@ = package com.redhat.rhn.frontend.struts; = +import javax.servlet.http.HttpServletRequest; + import org.apache.commons.lang.StringUtils; import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.apache.struts.action.DynaActionForm; = -import javax.servlet.http.HttpServletRequest; - = /** * RhnHelper contains helpful methods usable by our presentation layers. @@ -108,8 +108,7 @@ public class RhnHelper { msg.add(ActionMessages.GLOBAL_MESSAGE, = new ActionMessage(messageKey)); = - StrutsDelegate delegate =3D StrutsDelegateFactory.getInstance(= ). - getStrutsDeleg= ate(); + StrutsDelegate delegate =3D StrutsDelegate.getInstance(); delegate.saveMessages(request, msg); } = diff --git a/java/code/src/com/redhat/rhn/frontend/struts/RhnLookupDispatch= Action.java b/java/code/src/com/redhat/rhn/frontend/struts/RhnLookupDispatc= hAction.java index ecc74c1..cf3efbb 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/RhnLookupDispatchAction.= java +++ b/java/code/src/com/redhat/rhn/frontend/struts/RhnLookupDispatchAction.= java @@ -38,15 +38,6 @@ import javax.servlet.http.HttpServletResponse; public abstract class RhnLookupDispatchAction extends LookupDispatchAction= { = public static final String SUBMITTED =3D "submitted"; - - private StrutsDelegate strutsDelegate; - = - /** - * Performs default initialization. - */ - public RhnLookupDispatchAction() { - strutsDelegate =3D StrutsDelegateFactory.getInstance().getStrutsDe= legate(); - } = /** * Returns a StrutsDelegate object. @@ -56,7 +47,7 @@ public abstract class RhnLookupDispatchAction extends Loo= kupDispatchAction { * @see StrutsDelegateFactory */ protected StrutsDelegate getStrutsDelegate() { - return strutsDelegate; + return StrutsDelegate.getInstance(); } = /** diff --git a/java/code/src/com/redhat/rhn/frontend/struts/RhnSetHelper.java= b/java/code/src/com/redhat/rhn/frontend/struts/RhnSetHelper.java index 0efcfd1..4b92749 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/RhnSetHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/RhnSetHelper.java @@ -59,7 +59,7 @@ public class RhnSetHelper { this.mapping =3D mappingIn; this.forward =3D RhnHelper.DEFAULT_FORWARD; requestContext =3D new RequestContext(requestIn); - strutsDelegate =3D StrutsDelegateFactory.getInstance().getStrutsDe= legate(); + strutsDelegate =3D StrutsDelegate.getInstance(); } = /** diff --git a/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.ja= va b/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java index 390e447..c1eb7d3 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java @@ -13,23 +13,38 @@ * in this software or its documentation. */ package com.redhat.rhn.frontend.struts; - + = +import com.redhat.rhn.common.util.Asserts; import com.redhat.rhn.common.util.DatePicker; +import com.redhat.rhn.common.util.ServletUtils; +import com.redhat.rhn.common.validator.ValidationMessage; import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.common.validator.ValidatorResult; import com.redhat.rhn.common.validator.ValidatorWarning; +import com.redhat.rhn.frontend.context.Context; = +import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; +import org.apache.struts.Globals; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.apache.struts.action.DynaActionForm; import org.apache.struts.upload.FormFile; = +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.UnsupportedEncodingException; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map; +import java.util.TimeZone; = import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; = /** * StrutsDelegate defines a set of helper operations for working with the = Struts API. @@ -38,10 +53,24 @@ import javax.servlet.http.HttpServletRequest; * = * @version $Rev$ */ -public interface StrutsDelegate { +public class StrutsDelegate { + = + private static final Logger LOG =3D Logger.getLogger(StrutsDelegate.c= lass); + private static final StrutsDelegate INSTANCE =3D new StrutsDelegate(); + = /** - * Take an action forward and toss on a form variable. + * Retuns an instance of the struts delegate factory + * @return an instance + */ + public static StrutsDelegate getInstance() { = + return INSTANCE; + } + = + protected StrutsDelegate() { + } = + /** + * Take an action forward and toss on a form variable. * @param base Base ActionForward * = * @param param Parameter to be added to the ActionForward url. @@ -51,8 +80,12 @@ public interface StrutsDelegate { * @return a new ActionForward with the path of the base appended with= the * param and value. */ - ActionForward forwardParam(ActionForward base, String param, String va= lue); - = + public ActionForward forwardParam(ActionForward base, String param, St= ring value) { + Map params =3D new HashMap(); + params.put(param, value); + return forwardParams(base, params); + } + /** * Take an action forward and toss on a set of form variables. * = @@ -63,7 +96,14 @@ public interface StrutsDelegate { * @return a new ActionForward with the path of the base appended with= the * param and value. */ - ActionForward forwardParams(ActionForward base, Map params); + public ActionForward forwardParams(ActionForward base, Map params) { + Asserts.assertNotNull(base, "base"); + String newPath =3D ServletUtils.pathWithParams(base.getPath(), par= ams); + + ActionForward af =3D new ActionForward(newPath, base.getRedirect()= ); + af.setName(base.getName()); + return af; + } = /** * Add a message to an existing set of ActionErrors. Useful to add stu= ff to @@ -71,7 +111,10 @@ public interface StrutsDelegate { * @param msgKey to add * @param errors to add too */ - void addError(String msgKey, ActionErrors errors); + // TODO Write unit tests for addError(String, ActionErrors) + public void addError(String msgKey, ActionErrors errors) { + addError(errors, msgKey, new Object[0]); + } = /** * Add a message to an existing set of ActionErrors. Useful to add stu= ff to @@ -80,14 +123,22 @@ public interface StrutsDelegate { * @param msgKey to add * @param params key params */ - void addError(ActionErrors errors, String msgKey, Object... params); = = + // TODO Write unit tests for addError(String, ActionErrors) + public void addError(ActionErrors errors, String msgKey, Object...para= ms) { + ActionMessages msg =3D new ActionMessages(); + msg.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(msgKey, + params)); + errors.add(msg); + } = = /** * Add a UI message to the Request. * @param msgKey of the string you want to display * @param req used to store the message in. */ - void saveMessage(String msgKey, HttpServletRequest req); + public void saveMessage(String msgKey, HttpServletRequest req) { + saveMessage(msgKey, null, req); = + } = /** * Add a UI message to the Request. @@ -95,32 +146,74 @@ public interface StrutsDelegate { * @param params formatted params for the localized message * @param req used to store the message in. */ - void saveMessage(String msgKey, String[] params, HttpServletRequest re= q); + // TODO Write unit tests for saveMessage(String, String[], HttpServlet= Request) + public void saveMessage(String msgKey, String[] params, HttpServletReq= uest req) { + if (params =3D=3D null) { + params =3D new String[0]; + } + ActionMessages msg =3D new ActionMessages(); + msg.add(ActionMessages.GLOBAL_MESSAGE, + new ActionMessage(msgKey, params)); + saveMessages(req, msg); + } = /** * Add messages to the request * @param request Request where messages will be saved. * @param messages Messages to be saved. */ - void saveMessages(HttpServletRequest request, ActionMessages messages); - = + // TODO Write unit tests for saveMessages(HttpServletRequest, ActionMe= ssages) + public void saveMessages(HttpServletRequest request, ActionMessages me= ssages) { + HttpSession session =3D request.getSession(); + + if ((messages =3D=3D null) || messages.isEmpty()) { + session.removeAttribute(Globals.ERROR_KEY); + session.removeAttribute(Globals.MESSAGE_KEY); + return; + } + String key =3D Globals.MESSAGE_KEY; + if (messages instanceof ActionErrors) { + key =3D Globals.ERROR_KEY; + } + = + ActionMessages newMessages =3D new ActionMessages(); + = + // Check for existing messages + ActionMessages sessionExisting =3D = + (ActionMessages) session.getAttribute(key); + = + if (sessionExisting !=3D null) { + newMessages.add(sessionExisting); + } + newMessages.add(messages); + = + session.setAttribute(key, newMessages); + request.setAttribute(key, newMessages); + } + /** * Add messages to the request * @param request Request where messages will be saved. * @param errors List of ValidatorError objects. * @param warnings List of ValidatorWarning objects. */ - void saveMessages(HttpServletRequest request, = - List errors, - List warnings); + public void saveMessages(HttpServletRequest request, + List errors, = + List warnings) { + = + bindMessage(request, Globals.ERROR_KEY, errors, new ActionErrors()= ); + bindMessage(request, Globals.MESSAGE_KEY, warnings, new ActionMess= ages()); + } = /** * Add messages to the request * @param request Request where messages will bed saved. * @param result the validator result object.. */ - void saveMessages(HttpServletRequest request, = - ValidatorResult result); = + public void saveMessages(HttpServletRequest request, ValidatorResult r= esult) { + saveMessages(request, result.getErrors(), result.getWarnings()); + } = + = /** * Util to get the String version of a file upload form. Not useful if= the * upload is binary. @@ -129,15 +222,47 @@ public interface StrutsDelegate { * @param paramName of the FormFile * @return String version of the upload. */ - String getFormFileString(DynaActionForm form, String paramName); - = + // TODO Write unit tests for getFormFileString(DynaActionForm, String) + public String getFormFileString(DynaActionForm form, String paramName)= { + if (form.getDynaClass().getDynaProperty(paramName) =3D=3D null) { + return ""; + } + + FormFile f =3D (FormFile)form.get(paramName); + return extractString(f); + } + + /** * Util to get the String version of a file upload form. Not useful if= the * upload is binary. * @param f the formfile to extract data off.... * @return String version of the upload. */ - String extractString(FormFile f); + public String extractString(FormFile f) { + String retval =3D null; + try { + if (f !=3D null && f.getFileData() !=3D null) { + String fileString =3D new String(f.getFileData(), "UTF-8"); + if (!StringUtils.isEmpty(fileString)) { + retval =3D fileString; + } + } + } + catch (UnsupportedEncodingException e) { + LOG.error(e); + throw new RuntimeException(e); + } + catch (FileNotFoundException e) { + LOG.error(e); + throw new RuntimeException(e); + } + catch (IOException e) { + LOG.error(e); + throw new RuntimeException(e); + } + return retval; + } = /** * Use this for every textarea that we use in our UI. Otherwise you w= ill get ^M = @@ -146,7 +271,10 @@ public interface StrutsDelegate { * @param name of value in form * @return String without CR in them. = */ - String getTextAreaValue(DynaActionForm form, String name); + public String getTextAreaValue(DynaActionForm form, String name) { + String value =3D form.getString(name); + return StringUtils.replaceChars(value, "\r", ""); + } = /** * Reads the earliest date from a form populated by a datepicker. @@ -158,7 +286,21 @@ public interface StrutsDelegate { * @return The earliest date to schedule actions. * @see com.redhat.rhn.common.util.DatePicker */ - Date readDatePicker(DynaActionForm form, String name, int yearDirectio= n); + public Date readDatePicker(DynaActionForm form, String name, int yearD= irection) { + //use date is not required for date picker forms. + //if it is not there, then that means we should always evaluate the + //date picker. Otherwise, we evaluate if it tells us to do so. + if (!form.getMap().containsKey(DatePicker.USE_DATE) || + form.get(DatePicker.USE_DATE) =3D=3D null || = + ((Boolean)form.get(DatePicker.USE_DATE)).booleanValue()) { + DatePicker p =3D getDatePicker(name, yearDirection); + p.readForm(form); + return p.getDate(); + } + else { + return new Date(); + } + } = /** * Writes the values of a date picker form to the requestParams<= /code> @@ -171,8 +313,19 @@ public interface StrutsDelegate { * @param yearDirection One of DatePicker's year range static variable= s. * @see com.redhat.rhn.common.util.DatePicker */ - void rememberDatePicker(Map requestParams, DynaActionForm form, String= name, = - int yearDirection); + public void rememberDatePicker(Map requestParams, + DynaActionForm form, String name, int yearDirection) { + //Write the option use_date field if it is there. + if (form.get(DatePicker.USE_DATE) !=3D null) { + requestParams.put(DatePicker.USE_DATE, + form.get(DatePicker.USE_DATE)); + } + = + //The datepicker itself can write the rest. + DatePicker p =3D getDatePicker(name, yearDirection); + p.readForm(form); + p.writeToMap(requestParams); + } = /** * Creates a date picker object with the given name and prepopulates t= he date @@ -187,6 +340,61 @@ public interface StrutsDelegate { * @return The created and prepopulated date picker object * @see com.redhat.rhn.common.util.DatePicker */ - DatePicker prepopulateDatePicker(HttpServletRequest request, DynaActio= nForm form, - String name, int yearDirection); + public DatePicker prepopulateDatePicker(HttpServletRequest request, Dy= naActionForm form, + String name, int yearDirection) { + //Create the date picker. + DatePicker p =3D getDatePicker(name, yearDirection); + = + //prepopulate the date for this picker + p.readMap(request.getParameterMap()); + = + //prepopulate the form for this picker + p.writeToForm(form); + if (!StringUtils.isEmpty(request.getParameter(DatePicker.USE_DATE)= )) { + Boolean preset =3D Boolean.valueOf(request.getParameter(DatePi= cker.USE_DATE)); + form.set(DatePicker.USE_DATE, preset); + } + else if (form.getMap().containsKey(DatePicker.USE_DATE)) { + form.set(DatePicker.USE_DATE, Boolean.FALSE); + } + //give back the date picker + return p; + } + = + private DatePicker getDatePicker(String name, int yearDirection) { + Context ctx =3D Context.getCurrentContext(); + if (ctx =3D=3D null) { + return new DatePicker(name, TimeZone.getDefault(), Locale.getD= efault(), + yearDirection); + } + else { + return new DatePicker(name, ctx.getTimezone(), ctx.getLocale()= , yearDirection); + } + } + + = + private void bindMessage(HttpServletRequest request, String key, = + List messages, = + ActionMessages actMsgs) { + if (!messages.isEmpty()) { + for (ValidationMessage msg : messages) { + actMsgs.add(ActionMessages.GLOBAL_MESSAGE, = + new ActionMessage(msg.getKey(), msg.getValues())); + } + + ActionMessages requestMsg =3D (ActionMessages)request. + getAttribute(key); + if (requestMsg =3D=3D null) { + requestMsg =3D new ActionMessages(); + } + requestMsg.add(actMsgs); + if (requestMsg.isEmpty()) { + request.removeAttribute(key); + } + else { + request.setAttribute(key, requestMsg); = + } = + } + = + } } diff --git a/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegateFac= tory.java b/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegateFact= ory.java deleted file mode 100644 index 8fcc760..0000000 --- a/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegateFactory.ja= va +++ /dev/null @@ -1,52 +0,0 @@ -/** - * Copyright (c) 2009 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.struts; - - -/** - * StrutsDelegateFactory is a factory for StrutsDelegate objects. - * = - * @see StrutsDelegate - * @version $Rev$ - */ -public class StrutsDelegateFactory { - = - private static StrutsDelegateFactory instance =3D new StrutsDelegateFa= ctory(); - = - /** - * Returns a StrutsDelegateFactory object. - * = - * @return A StrutsDelegateFactory object. - */ - public static StrutsDelegateFactory getInstance() { - return instance; - } - - /** - * Creates a new factory. Note that by restricting access to the - * constructor, we gain the flexibility to plug in different factory - * implementation should the need arise. - */ - protected StrutsDelegateFactory() { - } - = - /** - * = - * @return A StrutsDelegate instance - */ - public StrutsDelegate getStrutsDelegate() { - return new StrutsDelegateImpl(); - } -} diff --git a/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegateImp= l.java b/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegateImpl.ja= va deleted file mode 100644 index 5a4c36f..0000000 --- a/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegateImpl.java +++ /dev/null @@ -1,320 +0,0 @@ -/** - * Copyright (c) 2009 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.struts; - = -import com.redhat.rhn.common.util.Asserts; -import com.redhat.rhn.common.util.DatePicker; -import com.redhat.rhn.common.util.ServletUtils; -import com.redhat.rhn.common.validator.ValidationMessage; -import com.redhat.rhn.common.validator.ValidatorError; -import com.redhat.rhn.common.validator.ValidatorResult; -import com.redhat.rhn.common.validator.ValidatorWarning; -import com.redhat.rhn.frontend.context.Context; - -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -import org.apache.struts.Globals; -import org.apache.struts.action.ActionErrors; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; -import org.apache.struts.action.DynaActionForm; -import org.apache.struts.upload.FormFile; - -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.TimeZone; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -/** - * StrutsDelegateImpl - * @version $Rev$ - */ -public class StrutsDelegateImpl implements StrutsDelegate { - = - private static final Logger LOG =3D Logger.getLogger(StrutsDelegateIm= pl.class); - = - protected StrutsDelegateImpl() { - } - - /** - * {@inheritDoc} - */ - public ActionForward forwardParam(ActionForward base, String param, St= ring value) { - Map params =3D new HashMap(); - params.put(param, value); - return forwardParams(base, params); - } - - /** - * {@inheritDoc} - */ - public ActionForward forwardParams(ActionForward base, Map params) { - Asserts.assertNotNull(base, "base"); - String newPath =3D ServletUtils.pathWithParams(base.getPath(), par= ams); - - ActionForward af =3D new ActionForward(newPath, base.getRedirect()= ); - af.setName(base.getName()); - return af; - } - = - /** - * {@inheritDoc} - */ - // TODO Write unit tests for addError(String, ActionErrors) - public void addError(String msgKey, ActionErrors errors) { - addError(errors, msgKey, new Object[0]); - } - = - /** - * {@inheritDoc} - */ - // TODO Write unit tests for addError(String, ActionErrors) - public void addError(ActionErrors errors, String msgKey, Object...para= ms) { - ActionMessages msg =3D new ActionMessages(); - msg.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(msgKey, - params)); - errors.add(msg); - } = - = - /** - * {@inheritDoc} - */ - public void saveMessage(String msgKey, HttpServletRequest req) { - saveMessage(msgKey, null, req); = - } - = - /** - * {@inheritDoc} - */ - // TODO Write unit tests for saveMessage(String, String[], HttpServlet= Request) - public void saveMessage(String msgKey, String[] params, HttpServletReq= uest req) { - if (params =3D=3D null) { - params =3D new String[0]; - } - ActionMessages msg =3D new ActionMessages(); - msg.add(ActionMessages.GLOBAL_MESSAGE, - new ActionMessage(msgKey, params)); - saveMessages(req, msg); - } - = - /** - * {@inheritDoc} - */ - // TODO Write unit tests for saveMessages(HttpServletRequest, ActionMe= ssages) - public void saveMessages(HttpServletRequest request, ActionMessages me= ssages) { - HttpSession session =3D request.getSession(); - - if ((messages =3D=3D null) || messages.isEmpty()) { - session.removeAttribute(Globals.ERROR_KEY); - session.removeAttribute(Globals.MESSAGE_KEY); - return; - } - String key =3D Globals.MESSAGE_KEY; - if (messages instanceof ActionErrors) { - key =3D Globals.ERROR_KEY; - } - = - ActionMessages newMessages =3D new ActionMessages(); - = - // Check for existing messages - ActionMessages sessionExisting =3D = - (ActionMessages) session.getAttribute(key); - = - if (sessionExisting !=3D null) { - newMessages.add(sessionExisting); - } - newMessages.add(messages); - = - session.setAttribute(key, newMessages); - request.setAttribute(key, newMessages); - } - - /** - * = - * {@inheritDoc} - */ - public void saveMessages(HttpServletRequest request, - List errors, = - List warnings) { - = - bindMessage(request, Globals.ERROR_KEY, errors, new ActionErrors()= ); - bindMessage(request, Globals.MESSAGE_KEY, warnings, new ActionMess= ages()); - } - - /** - * = - * {@inheritDoc} - */ - public void saveMessages(HttpServletRequest request, ValidatorResult r= esult) { - saveMessages(request, result.getErrors(), result.getWarnings()); - } = - = - /** - * {@inheritDoc} - */ - // TODO Write unit tests for getFormFileString(DynaActionForm, String) - public String getFormFileString(DynaActionForm form, String paramName)= { - if (form.getDynaClass().getDynaProperty(paramName) =3D=3D null) { - return ""; - } - - FormFile f =3D (FormFile)form.get(paramName); - return extractString(f); - } - - - /** - * = - * {@inheritDoc} - */ - public String extractString(FormFile f) { - String retval =3D null; - try { - if (f !=3D null && f.getFileData() !=3D null) { - String fileString =3D new String(f.getFileData(), "UTF-8"); - if (!StringUtils.isEmpty(fileString)) { - retval =3D fileString; - } - } - } - catch (UnsupportedEncodingException e) { - LOG.error(e); - throw new RuntimeException(e); - } - catch (FileNotFoundException e) { - LOG.error(e); - throw new RuntimeException(e); - } - catch (IOException e) { - LOG.error(e); - throw new RuntimeException(e); - } - return retval; - } - = - /** - * {@inheritDoc} - */ - public String getTextAreaValue(DynaActionForm form, String name) { - String value =3D form.getString(name); - return StringUtils.replaceChars(value, "\r", ""); - } - = - /** - * {@inheritDoc} - */ - public Date readDatePicker(DynaActionForm form, String name, int yearD= irection) { - //use date is not required for date picker forms. - //if it is not there, then that means we should always evaluate the - //date picker. Otherwise, we evaluate if it tells us to do so. - if (!form.getMap().containsKey(DatePicker.USE_DATE) || - form.get(DatePicker.USE_DATE) =3D=3D null || = - ((Boolean)form.get(DatePicker.USE_DATE)).booleanValue()) { - DatePicker p =3D getDatePicker(name, yearDirection); - p.readForm(form); - return p.getDate(); - } - else { - return new Date(); - } - } - = - /** - * {@inheritDoc} - */ - public void rememberDatePicker(Map requestParams, - DynaActionForm form, String name, int yearDirection) { - //Write the option use_date field if it is there. - if (form.get(DatePicker.USE_DATE) !=3D null) { - requestParams.put(DatePicker.USE_DATE, - form.get(DatePicker.USE_DATE)); - } - = - //The datepicker itself can write the rest. - DatePicker p =3D getDatePicker(name, yearDirection); - p.readForm(form); - p.writeToMap(requestParams); - } - = - /** - * {@inheritDoc} - */ - public DatePicker prepopulateDatePicker(HttpServletRequest request, Dy= naActionForm form, - String name, int yearDirection) { - //Create the date picker. - DatePicker p =3D getDatePicker(name, yearDirection); - = - //prepopulate the date for this picker - p.readMap(request.getParameterMap()); - = - //prepopulate the form for this picker - p.writeToForm(form); - if (!StringUtils.isEmpty(request.getParameter(DatePicker.USE_DATE)= )) { - Boolean preset =3D Boolean.valueOf(request.getParameter(DatePi= cker.USE_DATE)); - form.set(DatePicker.USE_DATE, preset); - } - else if (form.getMap().containsKey(DatePicker.USE_DATE)) { - form.set(DatePicker.USE_DATE, Boolean.FALSE); - } - //give back the date picker - return p; - } - = - private DatePicker getDatePicker(String name, int yearDirection) { - Context ctx =3D Context.getCurrentContext(); - if (ctx =3D=3D null) { - return new DatePicker(name, TimeZone.getDefault(), Locale.getD= efault(), - yearDirection); - } - else { - return new DatePicker(name, ctx.getTimezone(), ctx.getLocale()= , yearDirection); - } - } - - = - private void bindMessage(HttpServletRequest request, String key, = - List messages, = - ActionMessages actMsgs) { - if (!messages.isEmpty()) { - for (ValidationMessage msg : messages) { - actMsgs.add(ActionMessages.GLOBAL_MESSAGE, = - new ActionMessage(msg.getKey(), msg.getValues())); - } - - ActionMessages requestMsg =3D (ActionMessages)request. - getAttribute(key); - if (requestMsg =3D=3D null) { - requestMsg =3D new ActionMessages(); - } - requestMsg.add(actMsgs); - if (requestMsg.isEmpty()) { - request.removeAttribute(key); - } - else { - request.setAttribute(key, requestMsg); = - } = - } - = - } -} diff --git a/java/code/src/com/redhat/rhn/frontend/struts/test/RhnUnpagedLi= stActionTest.java b/java/code/src/com/redhat/rhn/frontend/struts/test/RhnUn= pagedListActionTest.java index 4b29bdc..e77f6e2 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/test/RhnUnpagedListActio= nTest.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/test/RhnUnpagedListActio= nTest.java @@ -14,23 +14,22 @@ */ package com.redhat.rhn.frontend.struts.test; = +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.action.common.BadParameterException; import com.redhat.rhn.frontend.listview.ListControl; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnUnpagedListAction; import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.frontend.struts.StrutsDelegateFactory; import com.redhat.rhn.testing.ActionHelper; import com.redhat.rhn.testing.RhnBaseTestCase; = -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** * RhnUnpagedListActionTest * @version $Rev$ @@ -59,9 +58,7 @@ public class RhnUnpagedListActionTest extends RhnBaseTest= Case { HttpServletResponse response) { = RequestContext requestContext =3D new RequestContext(request); - = - StrutsDelegateFactory factory =3D StrutsDelegateFactory.getIns= tance(); - StrutsDelegate strutsDelegate =3D factory.getStrutsDelegate(); + StrutsDelegate strutsDelegate =3D StrutsDelegate.getInstance(); = User user =3D requestContext.getLoggedInUser(); lc =3D new ListControl(); diff --git a/java/code/src/com/redhat/rhn/frontend/struts/test/StrutsDelega= teImplTest.java b/java/code/src/com/redhat/rhn/frontend/struts/test/StrutsD= elegateImplTest.java index 943a056..4b2b983 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/test/StrutsDelegateImplT= est.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/test/StrutsDelegateImplT= est.java @@ -14,7 +14,7 @@ */ package com.redhat.rhn.frontend.struts.test; = -import com.redhat.rhn.frontend.struts.StrutsDelegateImpl; +import com.redhat.rhn.frontend.struts.StrutsDelegate; import com.redhat.rhn.testing.RhnMockDynaActionForm; = import org.apache.struts.action.ActionForward; @@ -28,7 +28,7 @@ import junit.framework.TestCase; */ public class StrutsDelegateImplTest extends TestCase { = - private class StrutsDelegateImplStub extends StrutsDelegateImpl { + private class StrutsDelegateImplStub extends StrutsDelegate { } = /** @@ -44,7 +44,7 @@ public class StrutsDelegateImplTest extends TestCase { public final void testForwardParams() { ActionForward success =3D new ActionForward("default", "path", fal= se); = - StrutsDelegateImpl strutsDelegate =3D new StrutsDelegateImplStub(); + StrutsDelegate strutsDelegate =3D new StrutsDelegateImplStub(); = ActionForward fwdWithParams =3D strutsDelegate.forwardParam(succes= s, "foo", "bar"); assertEquals(success.getName(), fwdWithParams.getName()); @@ -59,7 +59,7 @@ public class StrutsDelegateImplTest extends TestCase { DynaActionForm form =3D new RhnMockDynaActionForm(); form.set("somevalue", value); = - StrutsDelegateImpl strutsDelegate =3D new StrutsDelegateImplStub(); + StrutsDelegate strutsDelegate =3D new StrutsDelegateImplStub(); = String stripped =3D strutsDelegate.getTextAreaValue(form, "someval= ue"); assertNotNull(stripped); --===============1797729295733058169==-- From partha at fedoraproject.org Thu Aug 20 11:57:22 2015 Content-Type: multipart/mixed; boundary="===============7714246530638103323==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Thu, 04 Jun 2009 22:19:48 +0000 Message-ID: <20090604221948.DBF8F120312@lists.fedorahosted.org> --===============7714246530638103323== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigFileForm.= java | 20 = java/code/src/com/redhat/rhn/frontend/action/errata/DeleteErratumAction.ja= va | 22 = java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java = | 46 - java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPatchSetAct= ion.java | 30 = java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageIndexAction= .java | 30 = java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfi= rmAction.java | 32 - java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfi= rmInstallAction.java | 30 = java/code/src/com/redhat/rhn/frontend/action/user/UserListAction.java = | 20 = java/code/src/com/redhat/rhn/frontend/servlets/EnvironmentFilter.java = | 23 = java/code/src/com/redhat/rhn/frontend/struts/RhnAction.java = | 12 = java/code/src/com/redhat/rhn/frontend/struts/RhnHelper.java = | 7 = java/code/src/com/redhat/rhn/frontend/struts/RhnLookupDispatchAction.java = | 11 = java/code/src/com/redhat/rhn/frontend/struts/RhnSetHelper.java = | 2 = java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java = | 260 +++++++- java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegateFactory.java = | 52 - java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegateImpl.java = | 320 ---------- java/code/src/com/redhat/rhn/frontend/struts/test/RhnUnpagedListActionTest= .java | 19 = java/code/src/com/redhat/rhn/frontend/struts/test/StrutsDelegateImplTest.j= ava | 8 = 18 files changed, 370 insertions(+), 574 deletions(-) New commits: commit 14f674b3c4e9606430adebbd2cb918670d0c478a Author: Partha Aji Date: Thu Jun 4 18:20:20 2009 -0400 good bye StrutsDelegateImpl and StrutsDelegateFactory diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/Con= figFileForm.java b/java/code/src/com/redhat/rhn/frontend/action/configurati= on/ConfigFileForm.java index 0efe595..bb49df8 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigFile= Form.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigFile= Form.java @@ -14,6 +14,14 @@ */ package com.redhat.rhn.frontend.action.configuration; = +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.text.DecimalFormat; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.struts.upload.FormFile; + import com.redhat.rhn.common.conf.Config; import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.common.validator.ValidatorError; @@ -27,7 +35,6 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm; import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.frontend.struts.StrutsDelegateFactory; import com.redhat.rhn.manager.configuration.ConfigurationManager; import com.redhat.rhn.manager.configuration.ConfigurationValidation; import com.redhat.rhn.manager.configuration.file.BinaryFileData; @@ -35,14 +42,6 @@ import com.redhat.rhn.manager.configuration.file.ConfigF= ileData; import com.redhat.rhn.manager.configuration.file.DirectoryData; import com.redhat.rhn.manager.configuration.file.TextFileData; = -import org.apache.struts.upload.FormFile; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.text.DecimalFormat; - -import javax.servlet.http.HttpServletRequest; - /** * ConfigFileForm * @version $Rev$ @@ -298,8 +297,7 @@ public class ConfigFileForm extends ScrubbingDynaAction= Form { else { if (isUpload()) { FormFile file =3D (FormFile) get(REV_UPLOAD); - StrutsDelegate del =3D StrutsDelegateFactory. - getInstance().getStrutsDelegat= e(); + StrutsDelegate del =3D StrutsDelegate.getInstance(); data =3D new TextFileData(del.extractString(file)); = = } else { diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/DeleteErra= tumAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/Delete= ErratumAction.java index 92fc342..fb7c2fe 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/errata/DeleteErratumActi= on.java +++ b/java/code/src/com/redhat/rhn/frontend/action/errata/DeleteErratumActi= on.java @@ -14,11 +14,11 @@ */ package com.redhat.rhn.frontend.action.errata; = -import com.redhat.rhn.domain.errata.Errata; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.frontend.struts.StrutsDelegateFactory; -import com.redhat.rhn.manager.errata.ErrataManager; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; = import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; @@ -27,11 +27,10 @@ import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.apache.struts.actions.LookupDispatchAction; = -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import com.redhat.rhn.domain.errata.Errata; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.StrutsDelegate; +import com.redhat.rhn.manager.errata.ErrataManager; = /** * DeleteErratumAction @@ -40,8 +39,7 @@ import javax.servlet.http.HttpServletResponse; public class DeleteErratumAction extends LookupDispatchAction { = private StrutsDelegate getStrutsDelegate() { - StrutsDelegateFactory factory =3D StrutsDelegateFactory.getInstanc= e(); - return factory.getStrutsDelegate(); + return StrutsDelegate.getInstance(); } = /** diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction= .java b/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java index b2cb4b4..271e044 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java @@ -14,17 +14,17 @@ */ package com.redhat.rhn.frontend.action.errata; = -import com.redhat.rhn.common.hibernate.HibernateFactory; -import com.redhat.rhn.common.hibernate.HibernateRuntimeException; -import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.common.util.StringUtil; -import com.redhat.rhn.domain.errata.Errata; -import com.redhat.rhn.frontend.action.common.BadParameterException; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.struts.RhnValidationHelper; -import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.frontend.struts.StrutsDelegateFactory; -import com.redhat.rhn.manager.errata.ErrataManager; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; = import org.apache.commons.collections.IteratorUtils; import org.apache.commons.lang.StringUtils; @@ -38,17 +38,16 @@ import org.apache.struts.action.DynaActionForm; import org.apache.struts.actions.LookupDispatchAction; import org.hibernate.HibernateException; = -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import com.redhat.rhn.common.hibernate.HibernateFactory; +import com.redhat.rhn.common.hibernate.HibernateRuntimeException; +import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.common.util.StringUtil; +import com.redhat.rhn.domain.errata.Errata; +import com.redhat.rhn.frontend.action.common.BadParameterException; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnValidationHelper; +import com.redhat.rhn.frontend.struts.StrutsDelegate; +import com.redhat.rhn.manager.errata.ErrataManager; = /** * EditAction @@ -57,8 +56,7 @@ import javax.servlet.http.HttpServletResponse; public class EditAction extends LookupDispatchAction { = private StrutsDelegate getStrutsDelegate() { - StrutsDelegateFactory factory =3D StrutsDelegateFactory.getInstanc= e(); - return factory.getStrutsDelegate(); + return StrutsDelegate.getInstance(); } = /** diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/Instal= lPatchSetAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpack= age/InstallPatchSetAction.java index 791ba81..def9f47 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPatchS= etAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPatchS= etAction.java @@ -14,6 +14,19 @@ */ package com.redhat.rhn.frontend.action.rhnpackage; = +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.actions.LookupDispatchAction; + import com.redhat.rhn.domain.action.Action; import com.redhat.rhn.domain.rhnpackage.Package; import com.redhat.rhn.domain.rhnpackage.PatchSet; @@ -22,24 +35,10 @@ import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.frontend.struts.StrutsDelegateFactory; import com.redhat.rhn.manager.action.ActionManager; import com.redhat.rhn.manager.rhnpackage.PackageManager; 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.ActionMessage; -import org.apache.struts.action.ActionMessages; -import org.apache.struts.actions.LookupDispatchAction; - -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** * InstallPatchSetAction * @version $Rev$ @@ -47,8 +46,7 @@ import javax.servlet.http.HttpServletResponse; public class InstallPatchSetAction extends LookupDispatchAction { = private StrutsDelegate getStrutsDelegate() { - StrutsDelegateFactory factory =3D StrutsDelegateFactory.getInstanc= e(); - return factory.getStrutsDelegate(); + return StrutsDelegate.getInstance(); } = /** diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/Packag= eIndexAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage= /PackageIndexAction.java index 273a7e9..b5a54cb 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageIndexA= ction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageIndexA= ction.java @@ -14,15 +14,11 @@ */ package com.redhat.rhn.frontend.action.rhnpackage; = -import com.redhat.rhn.domain.action.rhnpackage.PackageAction; -import com.redhat.rhn.domain.server.Server; -import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.frontend.action.systems.sdc.SdcHelper; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.frontend.struts.StrutsDelegateFactory; -import com.redhat.rhn.manager.action.ActionManager; -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; = import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; @@ -31,11 +27,14 @@ import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.apache.struts.actions.LookupDispatchAction; = -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import com.redhat.rhn.domain.action.rhnpackage.PackageAction; +import com.redhat.rhn.domain.server.Server; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.action.systems.sdc.SdcHelper; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.StrutsDelegate; +import com.redhat.rhn.manager.action.ActionManager; +import com.redhat.rhn.manager.system.SystemManager; = /** * PackageIndexAction @@ -44,8 +43,7 @@ import javax.servlet.http.HttpServletResponse; public class PackageIndexAction extends LookupDispatchAction { = private StrutsDelegate getStrutsDelegate() { - StrutsDelegateFactory factory =3D StrutsDelegateFactory.getInstanc= e(); - return factory.getStrutsDelegate(); + return StrutsDelegate.getInstance(); } = /** diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patche= s/PatchConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/rh= npackage/patches/PatchConfirmAction.java index 9dd94ed..60933c4 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/Patch= ConfirmAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/Patch= ConfirmAction.java @@ -14,6 +14,19 @@ */ package com.redhat.rhn.frontend.action.rhnpackage.patches; = +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.actions.LookupDispatchAction; + import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.domain.action.Action; import com.redhat.rhn.domain.rhnset.RhnSet; @@ -21,33 +34,18 @@ import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.frontend.struts.StrutsDelegateFactory; import com.redhat.rhn.manager.action.ActionManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; 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.ActionMessage; -import org.apache.struts.action.ActionMessages; -import org.apache.struts.actions.LookupDispatchAction; - -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** * ErrataConfirmAction * @version $Rev: 53116 $ */ public class PatchConfirmAction extends LookupDispatchAction { = - private StrutsDelegate getStrutsDelegate() { - StrutsDelegateFactory factory =3D StrutsDelegateFactory.getInstanc= e(); - return factory.getStrutsDelegate(); + private StrutsDelegate getStrutsDelegate() { = + return StrutsDelegate.getInstance(); } = /** diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patche= s/PatchConfirmInstallAction.java b/java/code/src/com/redhat/rhn/frontend/ac= tion/rhnpackage/patches/PatchConfirmInstallAction.java index 7b6ddd7..7914da4 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/Patch= ConfirmInstallAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/Patch= ConfirmInstallAction.java @@ -14,6 +14,19 @@ */ package com.redhat.rhn.frontend.action.rhnpackage.patches; = +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.actions.LookupDispatchAction; + import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.domain.action.Action; import com.redhat.rhn.domain.rhnset.RhnSet; @@ -21,24 +34,10 @@ import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.frontend.struts.StrutsDelegateFactory; import com.redhat.rhn.manager.action.ActionManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; 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.ActionMessage; -import org.apache.struts.action.ActionMessages; -import org.apache.struts.actions.LookupDispatchAction; - -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** * ErrataConfirmAction * @version $Rev: 53116 $ @@ -46,8 +45,7 @@ import javax.servlet.http.HttpServletResponse; public class PatchConfirmInstallAction extends LookupDispatchAction { = private StrutsDelegate getStrutsDelegate() { - StrutsDelegateFactory factory =3D StrutsDelegateFactory.getInstanc= e(); - return factory.getStrutsDelegate(); + return StrutsDelegate.getInstance(); } = /** diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/UserListActi= on.java b/java/code/src/com/redhat/rhn/frontend/action/user/UserListAction.= java index 08be660..93abcbf 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/UserListAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/user/UserListAction.java @@ -14,21 +14,20 @@ */ package com.redhat.rhn.frontend.action.user; = -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.frontend.struts.StrutsDelegateFactory; -import com.redhat.rhn.frontend.taglibs.ListDisplayTag; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; = import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.struts.actions.LookupDispatchAction; = -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.StrutsDelegate; +import com.redhat.rhn.frontend.taglibs.ListDisplayTag; = /** * UserListAction @@ -37,8 +36,7 @@ import javax.servlet.http.HttpServletResponse; public class UserListAction extends LookupDispatchAction { = private StrutsDelegate getStrutsDelegate() { - StrutsDelegateFactory factory =3D StrutsDelegateFactory.getInstanc= e(); - return factory.getStrutsDelegate(); + return StrutsDelegate.getInstance(); } = /** {@inheritDoc} */ diff --git a/java/code/src/com/redhat/rhn/frontend/servlets/EnvironmentFilt= er.java b/java/code/src/com/redhat/rhn/frontend/servlets/EnvironmentFilter.= java index 73cefc8..302e60a 100644 --- a/java/code/src/com/redhat/rhn/frontend/servlets/EnvironmentFilter.java +++ b/java/code/src/com/redhat/rhn/frontend/servlets/EnvironmentFilter.java @@ -14,16 +14,6 @@ */ package com.redhat.rhn.frontend.servlets; = -import com.redhat.rhn.common.conf.Config; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.struts.RhnHelper; -import com.redhat.rhn.frontend.struts.StrutsDelegateFactory; - -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.log4j.Logger; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; - import java.io.IOException; = import javax.servlet.Filter; @@ -35,6 +25,16 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; = +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.log4j.Logger; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; + +import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnHelper; +import com.redhat.rhn.frontend.struts.StrutsDelegate; + /** * EnvironmentFilter * @version $Rev$ @@ -122,8 +122,7 @@ public class EnvironmentFilter implements Filter { args[2] =3D StringEscapeUtils.escapeHtml(param3); = msg.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(messa= geKey, args)); - StrutsDelegateFactory.getInstance(). - getStrutsDelegate().saveMessages(req, msg); + StrutsDelegate.getInstance().saveMessages(req, msg); } } = diff --git a/java/code/src/com/redhat/rhn/frontend/struts/RhnAction.java b/= java/code/src/com/redhat/rhn/frontend/struts/RhnAction.java index b89edba..ef40831 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/RhnAction.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/RhnAction.java @@ -59,16 +59,6 @@ import javax.servlet.http.HttpServletRequest; public abstract class RhnAction extends Action { = public static final String SUBMITTED =3D "submitted"; - = - private StrutsDelegate strutsDelegate; - = - /** - * Performs default initialization. - */ - public RhnAction() { - strutsDelegate =3D StrutsDelegateFactory.getInstance().getStrutsDe= legate(); - } - = /** * Returns a StrutsDelegate object. * = @@ -77,7 +67,7 @@ public abstract class RhnAction extends Action { * @see StrutsDelegateFactory */ protected StrutsDelegate getStrutsDelegate() { - return strutsDelegate; + return StrutsDelegate.getInstance(); } = /** diff --git a/java/code/src/com/redhat/rhn/frontend/struts/RhnHelper.java b/= java/code/src/com/redhat/rhn/frontend/struts/RhnHelper.java index 9d7c632..7fff556 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/RhnHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/RhnHelper.java @@ -15,13 +15,13 @@ = package com.redhat.rhn.frontend.struts; = +import javax.servlet.http.HttpServletRequest; + import org.apache.commons.lang.StringUtils; import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.apache.struts.action.DynaActionForm; = -import javax.servlet.http.HttpServletRequest; - = /** * RhnHelper contains helpful methods usable by our presentation layers. @@ -108,8 +108,7 @@ public class RhnHelper { msg.add(ActionMessages.GLOBAL_MESSAGE, = new ActionMessage(messageKey)); = - StrutsDelegate delegate =3D StrutsDelegateFactory.getInstance(= ). - getStrutsDeleg= ate(); + StrutsDelegate delegate =3D StrutsDelegate.getInstance(); delegate.saveMessages(request, msg); } = diff --git a/java/code/src/com/redhat/rhn/frontend/struts/RhnLookupDispatch= Action.java b/java/code/src/com/redhat/rhn/frontend/struts/RhnLookupDispatc= hAction.java index ecc74c1..cf3efbb 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/RhnLookupDispatchAction.= java +++ b/java/code/src/com/redhat/rhn/frontend/struts/RhnLookupDispatchAction.= java @@ -38,15 +38,6 @@ import javax.servlet.http.HttpServletResponse; public abstract class RhnLookupDispatchAction extends LookupDispatchAction= { = public static final String SUBMITTED =3D "submitted"; - - private StrutsDelegate strutsDelegate; - = - /** - * Performs default initialization. - */ - public RhnLookupDispatchAction() { - strutsDelegate =3D StrutsDelegateFactory.getInstance().getStrutsDe= legate(); - } = /** * Returns a StrutsDelegate object. @@ -56,7 +47,7 @@ public abstract class RhnLookupDispatchAction extends Loo= kupDispatchAction { * @see StrutsDelegateFactory */ protected StrutsDelegate getStrutsDelegate() { - return strutsDelegate; + return StrutsDelegate.getInstance(); } = /** diff --git a/java/code/src/com/redhat/rhn/frontend/struts/RhnSetHelper.java= b/java/code/src/com/redhat/rhn/frontend/struts/RhnSetHelper.java index 0efcfd1..4b92749 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/RhnSetHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/RhnSetHelper.java @@ -59,7 +59,7 @@ public class RhnSetHelper { this.mapping =3D mappingIn; this.forward =3D RhnHelper.DEFAULT_FORWARD; requestContext =3D new RequestContext(requestIn); - strutsDelegate =3D StrutsDelegateFactory.getInstance().getStrutsDe= legate(); + strutsDelegate =3D StrutsDelegate.getInstance(); } = /** diff --git a/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.ja= va b/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java index 390e447..c1eb7d3 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java @@ -13,23 +13,38 @@ * in this software or its documentation. */ package com.redhat.rhn.frontend.struts; - + = +import com.redhat.rhn.common.util.Asserts; import com.redhat.rhn.common.util.DatePicker; +import com.redhat.rhn.common.util.ServletUtils; +import com.redhat.rhn.common.validator.ValidationMessage; import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.common.validator.ValidatorResult; import com.redhat.rhn.common.validator.ValidatorWarning; +import com.redhat.rhn.frontend.context.Context; = +import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; +import org.apache.struts.Globals; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.apache.struts.action.DynaActionForm; import org.apache.struts.upload.FormFile; = +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.UnsupportedEncodingException; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map; +import java.util.TimeZone; = import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; = /** * StrutsDelegate defines a set of helper operations for working with the = Struts API. @@ -38,10 +53,24 @@ import javax.servlet.http.HttpServletRequest; * = * @version $Rev$ */ -public interface StrutsDelegate { +public class StrutsDelegate { + = + private static final Logger LOG =3D Logger.getLogger(StrutsDelegate.c= lass); + private static final StrutsDelegate INSTANCE =3D new StrutsDelegate(); + = /** - * Take an action forward and toss on a form variable. + * Retuns an instance of the struts delegate factory + * @return an instance + */ + public static StrutsDelegate getInstance() { = + return INSTANCE; + } + = + protected StrutsDelegate() { + } = + /** + * Take an action forward and toss on a form variable. * @param base Base ActionForward * = * @param param Parameter to be added to the ActionForward url. @@ -51,8 +80,12 @@ public interface StrutsDelegate { * @return a new ActionForward with the path of the base appended with= the * param and value. */ - ActionForward forwardParam(ActionForward base, String param, String va= lue); - = + public ActionForward forwardParam(ActionForward base, String param, St= ring value) { + Map params =3D new HashMap(); + params.put(param, value); + return forwardParams(base, params); + } + /** * Take an action forward and toss on a set of form variables. * = @@ -63,7 +96,14 @@ public interface StrutsDelegate { * @return a new ActionForward with the path of the base appended with= the * param and value. */ - ActionForward forwardParams(ActionForward base, Map params); + public ActionForward forwardParams(ActionForward base, Map params) { + Asserts.assertNotNull(base, "base"); + String newPath =3D ServletUtils.pathWithParams(base.getPath(), par= ams); + + ActionForward af =3D new ActionForward(newPath, base.getRedirect()= ); + af.setName(base.getName()); + return af; + } = /** * Add a message to an existing set of ActionErrors. Useful to add stu= ff to @@ -71,7 +111,10 @@ public interface StrutsDelegate { * @param msgKey to add * @param errors to add too */ - void addError(String msgKey, ActionErrors errors); + // TODO Write unit tests for addError(String, ActionErrors) + public void addError(String msgKey, ActionErrors errors) { + addError(errors, msgKey, new Object[0]); + } = /** * Add a message to an existing set of ActionErrors. Useful to add stu= ff to @@ -80,14 +123,22 @@ public interface StrutsDelegate { * @param msgKey to add * @param params key params */ - void addError(ActionErrors errors, String msgKey, Object... params); = = + // TODO Write unit tests for addError(String, ActionErrors) + public void addError(ActionErrors errors, String msgKey, Object...para= ms) { + ActionMessages msg =3D new ActionMessages(); + msg.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(msgKey, + params)); + errors.add(msg); + } = = /** * Add a UI message to the Request. * @param msgKey of the string you want to display * @param req used to store the message in. */ - void saveMessage(String msgKey, HttpServletRequest req); + public void saveMessage(String msgKey, HttpServletRequest req) { + saveMessage(msgKey, null, req); = + } = /** * Add a UI message to the Request. @@ -95,32 +146,74 @@ public interface StrutsDelegate { * @param params formatted params for the localized message * @param req used to store the message in. */ - void saveMessage(String msgKey, String[] params, HttpServletRequest re= q); + // TODO Write unit tests for saveMessage(String, String[], HttpServlet= Request) + public void saveMessage(String msgKey, String[] params, HttpServletReq= uest req) { + if (params =3D=3D null) { + params =3D new String[0]; + } + ActionMessages msg =3D new ActionMessages(); + msg.add(ActionMessages.GLOBAL_MESSAGE, + new ActionMessage(msgKey, params)); + saveMessages(req, msg); + } = /** * Add messages to the request * @param request Request where messages will be saved. * @param messages Messages to be saved. */ - void saveMessages(HttpServletRequest request, ActionMessages messages); - = + // TODO Write unit tests for saveMessages(HttpServletRequest, ActionMe= ssages) + public void saveMessages(HttpServletRequest request, ActionMessages me= ssages) { + HttpSession session =3D request.getSession(); + + if ((messages =3D=3D null) || messages.isEmpty()) { + session.removeAttribute(Globals.ERROR_KEY); + session.removeAttribute(Globals.MESSAGE_KEY); + return; + } + String key =3D Globals.MESSAGE_KEY; + if (messages instanceof ActionErrors) { + key =3D Globals.ERROR_KEY; + } + = + ActionMessages newMessages =3D new ActionMessages(); + = + // Check for existing messages + ActionMessages sessionExisting =3D = + (ActionMessages) session.getAttribute(key); + = + if (sessionExisting !=3D null) { + newMessages.add(sessionExisting); + } + newMessages.add(messages); + = + session.setAttribute(key, newMessages); + request.setAttribute(key, newMessages); + } + /** * Add messages to the request * @param request Request where messages will be saved. * @param errors List of ValidatorError objects. * @param warnings List of ValidatorWarning objects. */ - void saveMessages(HttpServletRequest request, = - List errors, - List warnings); + public void saveMessages(HttpServletRequest request, + List errors, = + List warnings) { + = + bindMessage(request, Globals.ERROR_KEY, errors, new ActionErrors()= ); + bindMessage(request, Globals.MESSAGE_KEY, warnings, new ActionMess= ages()); + } = /** * Add messages to the request * @param request Request where messages will bed saved. * @param result the validator result object.. */ - void saveMessages(HttpServletRequest request, = - ValidatorResult result); = + public void saveMessages(HttpServletRequest request, ValidatorResult r= esult) { + saveMessages(request, result.getErrors(), result.getWarnings()); + } = + = /** * Util to get the String version of a file upload form. Not useful if= the * upload is binary. @@ -129,15 +222,47 @@ public interface StrutsDelegate { * @param paramName of the FormFile * @return String version of the upload. */ - String getFormFileString(DynaActionForm form, String paramName); - = + // TODO Write unit tests for getFormFileString(DynaActionForm, String) + public String getFormFileString(DynaActionForm form, String paramName)= { + if (form.getDynaClass().getDynaProperty(paramName) =3D=3D null) { + return ""; + } + + FormFile f =3D (FormFile)form.get(paramName); + return extractString(f); + } + + /** * Util to get the String version of a file upload form. Not useful if= the * upload is binary. * @param f the formfile to extract data off.... * @return String version of the upload. */ - String extractString(FormFile f); + public String extractString(FormFile f) { + String retval =3D null; + try { + if (f !=3D null && f.getFileData() !=3D null) { + String fileString =3D new String(f.getFileData(), "UTF-8"); + if (!StringUtils.isEmpty(fileString)) { + retval =3D fileString; + } + } + } + catch (UnsupportedEncodingException e) { + LOG.error(e); + throw new RuntimeException(e); + } + catch (FileNotFoundException e) { + LOG.error(e); + throw new RuntimeException(e); + } + catch (IOException e) { + LOG.error(e); + throw new RuntimeException(e); + } + return retval; + } = /** * Use this for every textarea that we use in our UI. Otherwise you w= ill get ^M = @@ -146,7 +271,10 @@ public interface StrutsDelegate { * @param name of value in form * @return String without CR in them. = */ - String getTextAreaValue(DynaActionForm form, String name); + public String getTextAreaValue(DynaActionForm form, String name) { + String value =3D form.getString(name); + return StringUtils.replaceChars(value, "\r", ""); + } = /** * Reads the earliest date from a form populated by a datepicker. @@ -158,7 +286,21 @@ public interface StrutsDelegate { * @return The earliest date to schedule actions. * @see com.redhat.rhn.common.util.DatePicker */ - Date readDatePicker(DynaActionForm form, String name, int yearDirectio= n); + public Date readDatePicker(DynaActionForm form, String name, int yearD= irection) { + //use date is not required for date picker forms. + //if it is not there, then that means we should always evaluate the + //date picker. Otherwise, we evaluate if it tells us to do so. + if (!form.getMap().containsKey(DatePicker.USE_DATE) || + form.get(DatePicker.USE_DATE) =3D=3D null || = + ((Boolean)form.get(DatePicker.USE_DATE)).booleanValue()) { + DatePicker p =3D getDatePicker(name, yearDirection); + p.readForm(form); + return p.getDate(); + } + else { + return new Date(); + } + } = /** * Writes the values of a date picker form to the requestParams<= /code> @@ -171,8 +313,19 @@ public interface StrutsDelegate { * @param yearDirection One of DatePicker's year range static variable= s. * @see com.redhat.rhn.common.util.DatePicker */ - void rememberDatePicker(Map requestParams, DynaActionForm form, String= name, = - int yearDirection); + public void rememberDatePicker(Map requestParams, + DynaActionForm form, String name, int yearDirection) { + //Write the option use_date field if it is there. + if (form.get(DatePicker.USE_DATE) !=3D null) { + requestParams.put(DatePicker.USE_DATE, + form.get(DatePicker.USE_DATE)); + } + = + //The datepicker itself can write the rest. + DatePicker p =3D getDatePicker(name, yearDirection); + p.readForm(form); + p.writeToMap(requestParams); + } = /** * Creates a date picker object with the given name and prepopulates t= he date @@ -187,6 +340,61 @@ public interface StrutsDelegate { * @return The created and prepopulated date picker object * @see com.redhat.rhn.common.util.DatePicker */ - DatePicker prepopulateDatePicker(HttpServletRequest request, DynaActio= nForm form, - String name, int yearDirection); + public DatePicker prepopulateDatePicker(HttpServletRequest request, Dy= naActionForm form, + String name, int yearDirection) { + //Create the date picker. + DatePicker p =3D getDatePicker(name, yearDirection); + = + //prepopulate the date for this picker + p.readMap(request.getParameterMap()); + = + //prepopulate the form for this picker + p.writeToForm(form); + if (!StringUtils.isEmpty(request.getParameter(DatePicker.USE_DATE)= )) { + Boolean preset =3D Boolean.valueOf(request.getParameter(DatePi= cker.USE_DATE)); + form.set(DatePicker.USE_DATE, preset); + } + else if (form.getMap().containsKey(DatePicker.USE_DATE)) { + form.set(DatePicker.USE_DATE, Boolean.FALSE); + } + //give back the date picker + return p; + } + = + private DatePicker getDatePicker(String name, int yearDirection) { + Context ctx =3D Context.getCurrentContext(); + if (ctx =3D=3D null) { + return new DatePicker(name, TimeZone.getDefault(), Locale.getD= efault(), + yearDirection); + } + else { + return new DatePicker(name, ctx.getTimezone(), ctx.getLocale()= , yearDirection); + } + } + + = + private void bindMessage(HttpServletRequest request, String key, = + List messages, = + ActionMessages actMsgs) { + if (!messages.isEmpty()) { + for (ValidationMessage msg : messages) { + actMsgs.add(ActionMessages.GLOBAL_MESSAGE, = + new ActionMessage(msg.getKey(), msg.getValues())); + } + + ActionMessages requestMsg =3D (ActionMessages)request. + getAttribute(key); + if (requestMsg =3D=3D null) { + requestMsg =3D new ActionMessages(); + } + requestMsg.add(actMsgs); + if (requestMsg.isEmpty()) { + request.removeAttribute(key); + } + else { + request.setAttribute(key, requestMsg); = + } = + } + = + } } diff --git a/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegateFac= tory.java b/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegateFact= ory.java deleted file mode 100644 index 8fcc760..0000000 --- a/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegateFactory.ja= va +++ /dev/null @@ -1,52 +0,0 @@ -/** - * Copyright (c) 2009 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.struts; - - -/** - * StrutsDelegateFactory is a factory for StrutsDelegate objects. - * = - * @see StrutsDelegate - * @version $Rev$ - */ -public class StrutsDelegateFactory { - = - private static StrutsDelegateFactory instance =3D new StrutsDelegateFa= ctory(); - = - /** - * Returns a StrutsDelegateFactory object. - * = - * @return A StrutsDelegateFactory object. - */ - public static StrutsDelegateFactory getInstance() { - return instance; - } - - /** - * Creates a new factory. Note that by restricting access to the - * constructor, we gain the flexibility to plug in different factory - * implementation should the need arise. - */ - protected StrutsDelegateFactory() { - } - = - /** - * = - * @return A StrutsDelegate instance - */ - public StrutsDelegate getStrutsDelegate() { - return new StrutsDelegateImpl(); - } -} diff --git a/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegateImp= l.java b/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegateImpl.ja= va deleted file mode 100644 index 5a4c36f..0000000 --- a/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegateImpl.java +++ /dev/null @@ -1,320 +0,0 @@ -/** - * Copyright (c) 2009 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.struts; - = -import com.redhat.rhn.common.util.Asserts; -import com.redhat.rhn.common.util.DatePicker; -import com.redhat.rhn.common.util.ServletUtils; -import com.redhat.rhn.common.validator.ValidationMessage; -import com.redhat.rhn.common.validator.ValidatorError; -import com.redhat.rhn.common.validator.ValidatorResult; -import com.redhat.rhn.common.validator.ValidatorWarning; -import com.redhat.rhn.frontend.context.Context; - -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -import org.apache.struts.Globals; -import org.apache.struts.action.ActionErrors; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; -import org.apache.struts.action.DynaActionForm; -import org.apache.struts.upload.FormFile; - -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.TimeZone; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -/** - * StrutsDelegateImpl - * @version $Rev$ - */ -public class StrutsDelegateImpl implements StrutsDelegate { - = - private static final Logger LOG =3D Logger.getLogger(StrutsDelegateIm= pl.class); - = - protected StrutsDelegateImpl() { - } - - /** - * {@inheritDoc} - */ - public ActionForward forwardParam(ActionForward base, String param, St= ring value) { - Map params =3D new HashMap(); - params.put(param, value); - return forwardParams(base, params); - } - - /** - * {@inheritDoc} - */ - public ActionForward forwardParams(ActionForward base, Map params) { - Asserts.assertNotNull(base, "base"); - String newPath =3D ServletUtils.pathWithParams(base.getPath(), par= ams); - - ActionForward af =3D new ActionForward(newPath, base.getRedirect()= ); - af.setName(base.getName()); - return af; - } - = - /** - * {@inheritDoc} - */ - // TODO Write unit tests for addError(String, ActionErrors) - public void addError(String msgKey, ActionErrors errors) { - addError(errors, msgKey, new Object[0]); - } - = - /** - * {@inheritDoc} - */ - // TODO Write unit tests for addError(String, ActionErrors) - public void addError(ActionErrors errors, String msgKey, Object...para= ms) { - ActionMessages msg =3D new ActionMessages(); - msg.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(msgKey, - params)); - errors.add(msg); - } = - = - /** - * {@inheritDoc} - */ - public void saveMessage(String msgKey, HttpServletRequest req) { - saveMessage(msgKey, null, req); = - } - = - /** - * {@inheritDoc} - */ - // TODO Write unit tests for saveMessage(String, String[], HttpServlet= Request) - public void saveMessage(String msgKey, String[] params, HttpServletReq= uest req) { - if (params =3D=3D null) { - params =3D new String[0]; - } - ActionMessages msg =3D new ActionMessages(); - msg.add(ActionMessages.GLOBAL_MESSAGE, - new ActionMessage(msgKey, params)); - saveMessages(req, msg); - } - = - /** - * {@inheritDoc} - */ - // TODO Write unit tests for saveMessages(HttpServletRequest, ActionMe= ssages) - public void saveMessages(HttpServletRequest request, ActionMessages me= ssages) { - HttpSession session =3D request.getSession(); - - if ((messages =3D=3D null) || messages.isEmpty()) { - session.removeAttribute(Globals.ERROR_KEY); - session.removeAttribute(Globals.MESSAGE_KEY); - return; - } - String key =3D Globals.MESSAGE_KEY; - if (messages instanceof ActionErrors) { - key =3D Globals.ERROR_KEY; - } - = - ActionMessages newMessages =3D new ActionMessages(); - = - // Check for existing messages - ActionMessages sessionExisting =3D = - (ActionMessages) session.getAttribute(key); - = - if (sessionExisting !=3D null) { - newMessages.add(sessionExisting); - } - newMessages.add(messages); - = - session.setAttribute(key, newMessages); - request.setAttribute(key, newMessages); - } - - /** - * = - * {@inheritDoc} - */ - public void saveMessages(HttpServletRequest request, - List errors, = - List warnings) { - = - bindMessage(request, Globals.ERROR_KEY, errors, new ActionErrors()= ); - bindMessage(request, Globals.MESSAGE_KEY, warnings, new ActionMess= ages()); - } - - /** - * = - * {@inheritDoc} - */ - public void saveMessages(HttpServletRequest request, ValidatorResult r= esult) { - saveMessages(request, result.getErrors(), result.getWarnings()); - } = - = - /** - * {@inheritDoc} - */ - // TODO Write unit tests for getFormFileString(DynaActionForm, String) - public String getFormFileString(DynaActionForm form, String paramName)= { - if (form.getDynaClass().getDynaProperty(paramName) =3D=3D null) { - return ""; - } - - FormFile f =3D (FormFile)form.get(paramName); - return extractString(f); - } - - - /** - * = - * {@inheritDoc} - */ - public String extractString(FormFile f) { - String retval =3D null; - try { - if (f !=3D null && f.getFileData() !=3D null) { - String fileString =3D new String(f.getFileData(), "UTF-8"); - if (!StringUtils.isEmpty(fileString)) { - retval =3D fileString; - } - } - } - catch (UnsupportedEncodingException e) { - LOG.error(e); - throw new RuntimeException(e); - } - catch (FileNotFoundException e) { - LOG.error(e); - throw new RuntimeException(e); - } - catch (IOException e) { - LOG.error(e); - throw new RuntimeException(e); - } - return retval; - } - = - /** - * {@inheritDoc} - */ - public String getTextAreaValue(DynaActionForm form, String name) { - String value =3D form.getString(name); - return StringUtils.replaceChars(value, "\r", ""); - } - = - /** - * {@inheritDoc} - */ - public Date readDatePicker(DynaActionForm form, String name, int yearD= irection) { - //use date is not required for date picker forms. - //if it is not there, then that means we should always evaluate the - //date picker. Otherwise, we evaluate if it tells us to do so. - if (!form.getMap().containsKey(DatePicker.USE_DATE) || - form.get(DatePicker.USE_DATE) =3D=3D null || = - ((Boolean)form.get(DatePicker.USE_DATE)).booleanValue()) { - DatePicker p =3D getDatePicker(name, yearDirection); - p.readForm(form); - return p.getDate(); - } - else { - return new Date(); - } - } - = - /** - * {@inheritDoc} - */ - public void rememberDatePicker(Map requestParams, - DynaActionForm form, String name, int yearDirection) { - //Write the option use_date field if it is there. - if (form.get(DatePicker.USE_DATE) !=3D null) { - requestParams.put(DatePicker.USE_DATE, - form.get(DatePicker.USE_DATE)); - } - = - //The datepicker itself can write the rest. - DatePicker p =3D getDatePicker(name, yearDirection); - p.readForm(form); - p.writeToMap(requestParams); - } - = - /** - * {@inheritDoc} - */ - public DatePicker prepopulateDatePicker(HttpServletRequest request, Dy= naActionForm form, - String name, int yearDirection) { - //Create the date picker. - DatePicker p =3D getDatePicker(name, yearDirection); - = - //prepopulate the date for this picker - p.readMap(request.getParameterMap()); - = - //prepopulate the form for this picker - p.writeToForm(form); - if (!StringUtils.isEmpty(request.getParameter(DatePicker.USE_DATE)= )) { - Boolean preset =3D Boolean.valueOf(request.getParameter(DatePi= cker.USE_DATE)); - form.set(DatePicker.USE_DATE, preset); - } - else if (form.getMap().containsKey(DatePicker.USE_DATE)) { - form.set(DatePicker.USE_DATE, Boolean.FALSE); - } - //give back the date picker - return p; - } - = - private DatePicker getDatePicker(String name, int yearDirection) { - Context ctx =3D Context.getCurrentContext(); - if (ctx =3D=3D null) { - return new DatePicker(name, TimeZone.getDefault(), Locale.getD= efault(), - yearDirection); - } - else { - return new DatePicker(name, ctx.getTimezone(), ctx.getLocale()= , yearDirection); - } - } - - = - private void bindMessage(HttpServletRequest request, String key, = - List messages, = - ActionMessages actMsgs) { - if (!messages.isEmpty()) { - for (ValidationMessage msg : messages) { - actMsgs.add(ActionMessages.GLOBAL_MESSAGE, = - new ActionMessage(msg.getKey(), msg.getValues())); - } - - ActionMessages requestMsg =3D (ActionMessages)request. - getAttribute(key); - if (requestMsg =3D=3D null) { - requestMsg =3D new ActionMessages(); - } - requestMsg.add(actMsgs); - if (requestMsg.isEmpty()) { - request.removeAttribute(key); - } - else { - request.setAttribute(key, requestMsg); = - } = - } - = - } -} diff --git a/java/code/src/com/redhat/rhn/frontend/struts/test/RhnUnpagedLi= stActionTest.java b/java/code/src/com/redhat/rhn/frontend/struts/test/RhnUn= pagedListActionTest.java index 4b29bdc..e77f6e2 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/test/RhnUnpagedListActio= nTest.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/test/RhnUnpagedListActio= nTest.java @@ -14,23 +14,22 @@ */ package com.redhat.rhn.frontend.struts.test; = +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.action.common.BadParameterException; import com.redhat.rhn.frontend.listview.ListControl; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnUnpagedListAction; import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.frontend.struts.StrutsDelegateFactory; import com.redhat.rhn.testing.ActionHelper; import com.redhat.rhn.testing.RhnBaseTestCase; = -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** * RhnUnpagedListActionTest * @version $Rev$ @@ -59,9 +58,7 @@ public class RhnUnpagedListActionTest extends RhnBaseTest= Case { HttpServletResponse response) { = RequestContext requestContext =3D new RequestContext(request); - = - StrutsDelegateFactory factory =3D StrutsDelegateFactory.getIns= tance(); - StrutsDelegate strutsDelegate =3D factory.getStrutsDelegate(); + StrutsDelegate strutsDelegate =3D StrutsDelegate.getInstance(); = User user =3D requestContext.getLoggedInUser(); lc =3D new ListControl(); diff --git a/java/code/src/com/redhat/rhn/frontend/struts/test/StrutsDelega= teImplTest.java b/java/code/src/com/redhat/rhn/frontend/struts/test/StrutsD= elegateImplTest.java index 943a056..4b2b983 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/test/StrutsDelegateImplT= est.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/test/StrutsDelegateImplT= est.java @@ -14,7 +14,7 @@ */ package com.redhat.rhn.frontend.struts.test; = -import com.redhat.rhn.frontend.struts.StrutsDelegateImpl; +import com.redhat.rhn.frontend.struts.StrutsDelegate; import com.redhat.rhn.testing.RhnMockDynaActionForm; = import org.apache.struts.action.ActionForward; @@ -28,7 +28,7 @@ import junit.framework.TestCase; */ public class StrutsDelegateImplTest extends TestCase { = - private class StrutsDelegateImplStub extends StrutsDelegateImpl { + private class StrutsDelegateImplStub extends StrutsDelegate { } = /** @@ -44,7 +44,7 @@ public class StrutsDelegateImplTest extends TestCase { public final void testForwardParams() { ActionForward success =3D new ActionForward("default", "path", fal= se); = - StrutsDelegateImpl strutsDelegate =3D new StrutsDelegateImplStub(); + StrutsDelegate strutsDelegate =3D new StrutsDelegateImplStub(); = ActionForward fwdWithParams =3D strutsDelegate.forwardParam(succes= s, "foo", "bar"); assertEquals(success.getName(), fwdWithParams.getName()); @@ -59,7 +59,7 @@ public class StrutsDelegateImplTest extends TestCase { DynaActionForm form =3D new RhnMockDynaActionForm(); form.set("somevalue", value); = - StrutsDelegateImpl strutsDelegate =3D new StrutsDelegateImplStub(); + StrutsDelegate strutsDelegate =3D new StrutsDelegateImplStub(); = String stripped =3D strutsDelegate.getTextAreaValue(form, "someval= ue"); assertNotNull(stripped); --===============7714246530638103323==-- From partha at fedoraproject.org Thu Aug 20 11:57:22 2015 Content-Type: multipart/mixed; boundary="===============0022603024599662973==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Thu, 04 Jun 2009 22:40:17 +0000 Message-ID: <20090604224017.B1F28120312@lists.fedorahosted.org> --===============0022603024599662973== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/struts/test/StrutsDelegateImplTest.j= ava | 69 ---------- java/code/src/com/redhat/rhn/frontend/struts/test/StrutsDelegateTest.java = | 69 ++++++++++ 2 files changed, 69 insertions(+), 69 deletions(-) New commits: commit 1cb24f1b9058a74b6dccdae7d13261c2e54b54dd Author: Partha Aji Date: Thu Jun 4 18:42:05 2009 -0400 Sorry forgot to rename StrutsDelegateImplTest to StrutsDelegateTest diff --git a/java/code/src/com/redhat/rhn/frontend/struts/test/StrutsDelega= teImplTest.java b/java/code/src/com/redhat/rhn/frontend/struts/test/StrutsD= elegateImplTest.java deleted file mode 100644 index 4b2b983..0000000 --- a/java/code/src/com/redhat/rhn/frontend/struts/test/StrutsDelegateImplT= est.java +++ /dev/null @@ -1,69 +0,0 @@ -/** - * Copyright (c) 2009 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.struts.test; - -import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.testing.RhnMockDynaActionForm; - -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.DynaActionForm; - -import junit.framework.TestCase; - -/** - * StrutsDelegateImplTest - * @version $Rev$ - */ -public class StrutsDelegateImplTest extends TestCase { - = - private class StrutsDelegateImplStub extends StrutsDelegate { - } - - /** - * @param name The name of the TestCase - */ - public StrutsDelegateImplTest(String name) { - super(name); - } - = - /** - * = - */ - public final void testForwardParams() { - ActionForward success =3D new ActionForward("default", "path", fal= se); - = - StrutsDelegate strutsDelegate =3D new StrutsDelegateImplStub(); - = - ActionForward fwdWithParams =3D strutsDelegate.forwardParam(succes= s, "foo", "bar"); - assertEquals(success.getName(), fwdWithParams.getName()); - assertEquals(fwdWithParams.getPath(), "path?foo=3Dbar"); - } - = - /** - * = - */ - public void testGetTextAreaValue() { - String value =3D "asdf\r\nasdfwerwer\rasdf\n\radsfhjhhasdf"; - DynaActionForm form =3D new RhnMockDynaActionForm(); - form.set("somevalue", value); - = - StrutsDelegate strutsDelegate =3D new StrutsDelegateImplStub(); - = - String stripped =3D strutsDelegate.getTextAreaValue(form, "someval= ue"); - assertNotNull(stripped); - assertTrue(stripped.indexOf('\r') =3D=3D -1); - } - -} diff --git a/java/code/src/com/redhat/rhn/frontend/struts/test/StrutsDelega= teTest.java b/java/code/src/com/redhat/rhn/frontend/struts/test/StrutsDeleg= ateTest.java new file mode 100644 index 0000000..59544ae --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/struts/test/StrutsDelegateTest.= java @@ -0,0 +1,69 @@ +/** + * Copyright (c) 2009 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.struts.test; + +import com.redhat.rhn.frontend.struts.StrutsDelegate; +import com.redhat.rhn.testing.RhnMockDynaActionForm; + +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.DynaActionForm; + +import junit.framework.TestCase; + +/** + * StrutsDelegateImplTest + * @version $Rev$ + */ +public class StrutsDelegateTest extends TestCase { + = + private class StrutsDelegateStub extends StrutsDelegate { + } + + /** + * @param name The name of the TestCase + */ + public StrutsDelegateTest(String name) { + super(name); + } + = + /** + * = + */ + public final void testForwardParams() { + ActionForward success =3D new ActionForward("default", "path", fal= se); + = + StrutsDelegate strutsDelegate =3D new StrutsDelegateStub(); + = + ActionForward fwdWithParams =3D strutsDelegate.forwardParam(succes= s, "foo", "bar"); + assertEquals(success.getName(), fwdWithParams.getName()); + assertEquals(fwdWithParams.getPath(), "path?foo=3Dbar"); + } + = + /** + * = + */ + public void testGetTextAreaValue() { + String value =3D "asdf\r\nasdfwerwer\rasdf\n\radsfhjhhasdf"; + DynaActionForm form =3D new RhnMockDynaActionForm(); + form.set("somevalue", value); + = + StrutsDelegate strutsDelegate =3D new StrutsDelegateStub(); + = + String stripped =3D strutsDelegate.getTextAreaValue(form, "someval= ue"); + assertNotNull(stripped); + assertTrue(stripped.indexOf('\r') =3D=3D -1); + } + +} --===============0022603024599662973==-- From partha at fedoraproject.org Thu Aug 20 11:57:22 2015 Content-Type: multipart/mixed; boundary="===============2900294785712241330==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Thu, 04 Jun 2009 22:42:52 +0000 Message-ID: <20090604224252.196C7120312@lists.fedorahosted.org> --===============2900294785712241330== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/struts/test/StrutsDelegateImplTest.j= ava | 69 ---------- java/code/src/com/redhat/rhn/frontend/struts/test/StrutsDelegateTest.java = | 69 ++++++++++ 2 files changed, 69 insertions(+), 69 deletions(-) New commits: commit d046b584410f0f0c31e2d52000bb486040b0d72c Author: Partha Aji Date: Thu Jun 4 18:42:05 2009 -0400 Sorry forgot to rename StrutsDelegateImplTest to StrutsDelegateTest diff --git a/java/code/src/com/redhat/rhn/frontend/struts/test/StrutsDelega= teImplTest.java b/java/code/src/com/redhat/rhn/frontend/struts/test/StrutsD= elegateImplTest.java deleted file mode 100644 index 4b2b983..0000000 --- a/java/code/src/com/redhat/rhn/frontend/struts/test/StrutsDelegateImplT= est.java +++ /dev/null @@ -1,69 +0,0 @@ -/** - * Copyright (c) 2009 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.struts.test; - -import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.testing.RhnMockDynaActionForm; - -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.DynaActionForm; - -import junit.framework.TestCase; - -/** - * StrutsDelegateImplTest - * @version $Rev$ - */ -public class StrutsDelegateImplTest extends TestCase { - = - private class StrutsDelegateImplStub extends StrutsDelegate { - } - - /** - * @param name The name of the TestCase - */ - public StrutsDelegateImplTest(String name) { - super(name); - } - = - /** - * = - */ - public final void testForwardParams() { - ActionForward success =3D new ActionForward("default", "path", fal= se); - = - StrutsDelegate strutsDelegate =3D new StrutsDelegateImplStub(); - = - ActionForward fwdWithParams =3D strutsDelegate.forwardParam(succes= s, "foo", "bar"); - assertEquals(success.getName(), fwdWithParams.getName()); - assertEquals(fwdWithParams.getPath(), "path?foo=3Dbar"); - } - = - /** - * = - */ - public void testGetTextAreaValue() { - String value =3D "asdf\r\nasdfwerwer\rasdf\n\radsfhjhhasdf"; - DynaActionForm form =3D new RhnMockDynaActionForm(); - form.set("somevalue", value); - = - StrutsDelegate strutsDelegate =3D new StrutsDelegateImplStub(); - = - String stripped =3D strutsDelegate.getTextAreaValue(form, "someval= ue"); - assertNotNull(stripped); - assertTrue(stripped.indexOf('\r') =3D=3D -1); - } - -} diff --git a/java/code/src/com/redhat/rhn/frontend/struts/test/StrutsDelega= teTest.java b/java/code/src/com/redhat/rhn/frontend/struts/test/StrutsDeleg= ateTest.java new file mode 100644 index 0000000..59544ae --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/struts/test/StrutsDelegateTest.= java @@ -0,0 +1,69 @@ +/** + * Copyright (c) 2009 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.struts.test; + +import com.redhat.rhn.frontend.struts.StrutsDelegate; +import com.redhat.rhn.testing.RhnMockDynaActionForm; + +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.DynaActionForm; + +import junit.framework.TestCase; + +/** + * StrutsDelegateImplTest + * @version $Rev$ + */ +public class StrutsDelegateTest extends TestCase { + = + private class StrutsDelegateStub extends StrutsDelegate { + } + + /** + * @param name The name of the TestCase + */ + public StrutsDelegateTest(String name) { + super(name); + } + = + /** + * = + */ + public final void testForwardParams() { + ActionForward success =3D new ActionForward("default", "path", fal= se); + = + StrutsDelegate strutsDelegate =3D new StrutsDelegateStub(); + = + ActionForward fwdWithParams =3D strutsDelegate.forwardParam(succes= s, "foo", "bar"); + assertEquals(success.getName(), fwdWithParams.getName()); + assertEquals(fwdWithParams.getPath(), "path?foo=3Dbar"); + } + = + /** + * = + */ + public void testGetTextAreaValue() { + String value =3D "asdf\r\nasdfwerwer\rasdf\n\radsfhjhhasdf"; + DynaActionForm form =3D new RhnMockDynaActionForm(); + form.set("somevalue", value); + = + StrutsDelegate strutsDelegate =3D new StrutsDelegateStub(); + = + String stripped =3D strutsDelegate.getTextAreaValue(form, "someval= ue"); + assertNotNull(stripped); + assertTrue(stripped.indexOf('\r') =3D=3D -1); + } + +} --===============2900294785712241330==-- From jmrodri at fedoraproject.org Thu Aug 20 11:57:22 2015 Content-Type: multipart/mixed; boundary="===============4973370218055064813==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-java-0.6.24-1' Date: Fri, 05 Jun 2009 14:16:25 +0000 Message-ID: <20090605141625.6239A1201F3@lists.fedorahosted.org> --===============4973370218055064813== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-java-0.6.24-1' created by jesus m. rodriguez at 2009-06-05 14:15 +0000 Tagging package [spacewalk-java] version [0.6.24-1] in directory [java/]. Changes since nocpulse-common-2.1.14-1-28: --- 0 files changed --- --===============4973370218055064813==-- From jmrodri at fedoraproject.org Thu Aug 20 11:57:22 2015 Content-Type: multipart/mixed; boundary="===============7550542830123756149==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: java/spacewalk-java.spec rel-eng/packages Date: Fri, 05 Jun 2009 14:16:19 +0000 Message-ID: <20090605141619.DFC021201BC@lists.fedorahosted.org> --===============7550542830123756149== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/spacewalk-java.spec | 41 +++++++++++++++++++++++++++++++++++= ++++- rel-eng/packages/spacewalk-java | 2 - 2 files changed, 41 insertions(+), 2 deletions(-) New commits: commit 112e8640892842caeb618421a43b5825cf2c55f8 Author: jesus m. rodriguez Date: Fri Jun 5 10:15:35 2009 -0400 Automatic commit of package [spacewalk-java] release [0.6.24-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 325ce58..e4300a0 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -11,7 +11,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 0.6.23 +Version: 0.6.24 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{versi= on}.tar.gz = @@ -248,6 +248,45 @@ fi %attr(644, root, root) %{_datadir}/rhn/lib/rhn.jar = %changelog +* Fri Jun 05 2009 jesus m. rodriguez 0.6.24-1 +- good bye StrutsDelegateImpl and StrutsDelegateFactory (paji(a)redhat.com) +- 502959 - skip null date values for taskomatic status (shughes(a)redhat.c= om) +- Fixed code that would show up even error messages as good messages in th= e UI + (paji(a)redhat.com) +- 504054 - api - errata.getOval - commenting out api (bbuckingham(a)redhat= .com) +- 502941 - Now that 495506 is verified, removing the log message spam. + (jason.dobies(a)redhat.com) +- Restore ChannelManager.getLatestPackageEqualInTree. (dgoodwin(a)redhat.c= om) +- 484294 - Fix to complain a channel with distros cant be deleted. + (paji(a)redhat.com) +- 499399 - api call proxy.createMonitoringScout now return scout shared key + (msuchy(a)redhat.com) +- Revert "adding better support for kickstart cent, whereby we install/udp= ate + the client packages on all distros and not just RHEL-2,3,4" + (dgoodwin(a)redhat.com) +- 499399 - save scout to db (msuchy(a)redhat.com) +- 504023 - fixing repodata generation to skip solaris custom channels + (pkilambi(a)redhat.com) +- 495594, 504012 - Fixed issue where invert flag disappeared on pagination; + fixed ISE when search produces no results. (jason.dobies(a)redhat.com) +- 503642 - update KickstartScheduleCommand to store action id after the ac= tion + has been saved to the db (bbuckingham(a)redhat.com) +- 502905 - fixing issue where non virt kickstarts would show up on virt + provisioning page (jsherril(a)redhat.com) +- checkstyle fix (jsherril(a)redhat.com) +- 502259 - fixing query error that prevented solaris patch clusters from b= eing + installed (jsherril(a)redhat.com) +- 503545 - api - system.migrateSystems - update to handle systems that are= in a + system group (bbuckingham(a)redhat.com) +- 435043 - adding errata sync page for syncing out of date errata (that ha= ve + been updated by red hat) (jsherril(a)redhat.com) +- 502646 - Fixed list tag filter issue hitting the enter key in IE + (paji(a)redhat.com) +- 501224 - api - enhance system.listSystemEvents to include more detail on + events executed (bbuckingham(a)redhat.com) +- Made default virt options in a profile configurable and other anomalies + related to virt options (paji(a)redhat.com) + * Mon Jun 01 2009 jesus m. rodriguez 0.6.23-1 - 496933 - update the errata index when publishing an errata. (jesusr(a)re= dhat.com) - 492206 - Fixed an issue ' bad cobbler template' parsing (paji(a)redhat.c= om) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-j= ava index ce70760..cd584c7 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -0.6.23-1 java/ +0.6.24-1 java/ --===============7550542830123756149==-- From jmrodri at fedoraproject.org Thu Aug 20 11:57:22 2015 Content-Type: multipart/mixed; boundary="===============0818872056743444536==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-web-0.6.8-1' Date: Fri, 05 Jun 2009 14:35:30 +0000 Message-ID: <20090605143530.F3D351201F3@lists.fedorahosted.org> --===============0818872056743444536== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-web-0.6.8-1' created by jesus m. rodriguez at 2009-06-05 14:34 +0000 Tagging package [spacewalk-web] version [0.6.8-1] in directory [web/]. Changes since spacewalk-java-0.6.24-1: jesus m. rodriguez (1): Automatic commit of package [spacewalk-web] release [0.6.8-1]. --- rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 26 +++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) --- --===============0818872056743444536==-- From jmrodri at fedoraproject.org Thu Aug 20 11:57:22 2015 Content-Type: multipart/mixed; boundary="===============2421629511748631693==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: rel-eng/packages web/spacewalk-web.spec Date: Fri, 05 Jun 2009 14:35:28 +0000 Message-ID: <20090605143528.1FBC01201BC@lists.fedorahosted.org> --===============2421629511748631693== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 26 +++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) New commits: commit 2e59def9afbeab8749f50f4cd65c9f06036d9f82 Author: jesus m. rodriguez Date: Fri Jun 5 10:34:59 2009 -0400 Automatic commit of package [spacewalk-web] release [0.6.8-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index 5e2d9ac..9d57df0 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -0.6.7-1 web/ +0.6.8-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index ba4d328..2c6d85d 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -2,7 +2,7 @@ Name: spacewalk-web Summary: Spacewalk Web site packages Group: Applications/Internet License: GPLv2 -Version: 0.6.7 +Version: 0.6.8 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{ve= rsion}.tar.gz @@ -317,6 +317,30 @@ rm -rf $RPM_BUILD_ROOT = # $Id$ %changelog +* Fri Jun 05 2009 jesus m. rodriguez 0.6.8-1 +- 197294 - add hardware report support for CAPTURE cards (shughes(a)redhat= .com) +- 500709 - html error code page support for sessionless bots (shughes(a)re= dhat.com) +- 435043 - adding errata sync page for syncing out of date errata (that ha= ve + been updated by red hat) (jsherril(a)redhat.com) +- 501784 - fixed issue with timed out logins that required cookie deletion= to + log in again (jsherril(a)redhat.com) +- 501224 - api - enhance system.listSystemEvents to include more detail on + events executed (bbuckingham(a)redhat.com) +- 500709 - static html for non session error pages (shughes(a)redhat.com) +- 503081 - fixed /help url to to go to /rhn/help/index.do instead of about= .pxt + (paji(a)redhat.com) +- 503081 - Fixed a html redirect issue causing page to reload indefinitely= on + IE (paji(a)redhat.com) +- 501784 - fixed issue with timed out logins that required cookie deletion= to + log in again (jsherril(a)redhat.com) +- 501797 - remove /etc/rc.d/np.d/step MonitoringScout install + (msuchy(a)redhat.com) +- 499399 - create new api call proxy.createMonitoringScout (msuchy(a)redha= t.com) +- 496105 - Fix for setting up activaiton key for para-host provisioning + (paji(a)redhat.com) +- 498467 - A few changes related to the channel name limit increase. + (jason.dobies(a)redhat.com) + * Tue May 26 2009 Devan Goodwin 0.6.7-1 - 500429 - removed join against rhnSharedChannelView to remove dup entries (shughes(a)redhat.com) --===============2421629511748631693==-- From jmrodri at fedoraproject.org Thu Aug 20 11:57:22 2015 Content-Type: multipart/mixed; boundary="===============4416818758344963417==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-setup-0.6.8-1' Date: Fri, 05 Jun 2009 14:52:28 +0000 Message-ID: <20090605145228.15D4B1201F3@lists.fedorahosted.org> --===============4416818758344963417== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-setup-0.6.8-1' created by jesus m. rodriguez at 2009-06-05 14:51 +0000 Tagging package [spacewalk-setup] version [0.6.8-1] in directory [spacewalk= /setup/]. Changes since spacewalk-web-0.6.8-1: jesus m. rodriguez (1): Automatic commit of package [spacewalk-setup] release [0.6.8-1]. --- rel-eng/packages/spacewalk-setup | 2 +- spacewalk/setup/spacewalk-setup.spec | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) --- --===============4416818758344963417==-- From jmrodri at fedoraproject.org Thu Aug 20 11:57:22 2015 Content-Type: multipart/mixed; boundary="===============0194426103420046621==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: rel-eng/packages spacewalk/setup Date: Fri, 05 Jun 2009 14:52:25 +0000 Message-ID: <20090605145225.01F681201BC@lists.fedorahosted.org> --===============0194426103420046621== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/spacewalk-setup | 2 +- spacewalk/setup/spacewalk-setup.spec | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) New commits: commit 243a97a601cfd1990a584a2294f634fb314177f2 Author: jesus m. rodriguez Date: Fri Jun 5 10:51:33 2009 -0400 Automatic commit of package [spacewalk-setup] release [0.6.8-1]. diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-= setup index 95da184..4512a72 100644 --- a/rel-eng/packages/spacewalk-setup +++ b/rel-eng/packages/spacewalk-setup @@ -1 +1 @@ -0.6.7-1 spacewalk/setup/ +0.6.8-1 spacewalk/setup/ diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewa= lk-setup.spec index abfec34..1abf415 100644 --- a/spacewalk/setup/spacewalk-setup.spec +++ b/spacewalk/setup/spacewalk-setup.spec @@ -1,5 +1,5 @@ Name: spacewalk-setup -Version: 0.6.7 +Version: 0.6.8 Release: 1%{?dist} Summary: Initial setup tools for Red Hat Spacewalk = @@ -100,6 +100,21 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/pki/spacewalk/jabberd = %changelog +* Fri Jun 05 2009 jesus m. rodriguez 0.6.8-1 +- no need to enable Monitoring + MonitoringScout explicitly (mzazrivec(a)r= edhat.com) +- Fixes to support mod_jk >=3D 2.2.26. (dgoodwin(a)redhat.com) +- distinguish minor and major version embedded db upgrades (mzazrivec(a)re= dhat.com) +- include new embedded db upgrade script into spec file (mzazrivec(a)redha= t.com) +- add 10g 10.2.0.3 -> 10.2.0.4 embedded db setup upgrade script (mzazrivec= (a)redhat.com) +- pass custom sid to upgrade-db.sh for embedded db upgrade (mzazrivec(a)re= dhat.com) +- update copyright information (mzazrivec(a)redhat.com) +- support embedded db upgrade with custom sid (mzazrivec(a)redhat.com) +- 502475 - remove initialization of scout from perl (msuchy(a)redhat.com) +- 502475 - add ip address to SatCluster and SatNode (msuchy(a)redhat.com) +- restart satellite using shell script (mzazrivec(a)redhat.com) +- 464189 - embedded db upgrade fixes from Goldmember (mmraka(a)redhat.com) +- set compatible flag to 10.2 during embedded db upgrade (mzazrivec(a)redh= at.com) + * Wed May 27 2009 Jan Pazdziora 0.6.7-1 - spacewalk-setup: move creation of mount points to /usr/bin/spacewalk-make-mount-points --===============0194426103420046621==-- From jmrodri at fedoraproject.org Thu Aug 20 11:57:22 2015 Content-Type: multipart/mixed; boundary="===============5874147414717320002==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-proxy-installer-0.6.11-1' Date: Fri, 05 Jun 2009 14:59:19 +0000 Message-ID: <20090605145919.9E3211201F3@lists.fedorahosted.org> --===============5874147414717320002== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-proxy-installer-0.6.11-1' created by jesus m. rodriguez at 2009-06-05 14:59 +0000 Tagging package [spacewalk-proxy-installer] version [0.6.11-1] in directory= [proxy/installer/]. Changes since spacewalk-setup-0.6.8-1: jesus m. rodriguez (1): Automatic commit of package [spacewalk-proxy-installer] release [0.6.= 11-1]. --- proxy/installer/spacewalk-proxy-installer.spec | 18 +++++++++++++++++- rel-eng/packages/spacewalk-proxy-installer | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) --- --===============5874147414717320002==-- From jmrodri at fedoraproject.org Thu Aug 20 11:57:22 2015 Content-Type: multipart/mixed; boundary="===============3484562668334067007==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: proxy/installer rel-eng/packages Date: Fri, 05 Jun 2009 14:59:16 +0000 Message-ID: <20090605145917.06D501201BC@lists.fedorahosted.org> --===============3484562668334067007== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/installer/spacewalk-proxy-installer.spec | 18 +++++++++++++++++- rel-eng/packages/spacewalk-proxy-installer | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) New commits: commit c8858ae73f7738c7e94e93213fa30a0573510465 Author: jesus m. rodriguez Date: Fri Jun 5 10:59:03 2009 -0400 Automatic commit of package [spacewalk-proxy-installer] release [0.6.11= -1]. diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/install= er/spacewalk-proxy-installer.spec index e34a6f1..a4fe959 100644 --- a/proxy/installer/spacewalk-proxy-installer.spec +++ b/proxy/installer/spacewalk-proxy-installer.spec @@ -2,7 +2,7 @@ Name: spacewalk-proxy-installer Summary: Spacewalk Proxy Server Installer Group: Applications/Internet License: GPLv2 -Version: 0.6.10 +Version: 0.6.11 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz @@ -84,6 +84,22 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE answers.txt = %changelog +* Fri Jun 05 2009 jesus m. rodriguez 0.6.11-1 +- 499399 - read SCOUT_SHARED_KEY value from api call + proxy.createMonitoringScout (msuchy(a)redhat.com) +- enable services (msuchy(a)redhat.com) +- 499399 - update rhn-proxy-activate man page (msuchy(a)redhat.com) +- fix docbook warnings (msuchy(a)redhat.com) +- 499399 - call proxy.createMonitoringScout during proxy activation + (msuchy(a)redhat.com) +- 500151 - do not insist on presence of sslbuildir if we force own CA + (msuchy(a)redhat.com) +- 500151 - flip the condition, so force-own-ca do what it should do + (msuchy(a)redhat.com) +- 499789 - check for /root/ssl-build separately and fix scp command + (msuchy(a)redhat.com) +- 502103 - fix syntax error (msuchy(a)redhat.com) + * Tue May 19 2009 Miroslav Suchy 0.6.10-1 - 498251 - suggest as default proxy version latest version available on pa= rent = diff --git a/rel-eng/packages/spacewalk-proxy-installer b/rel-eng/packages/= spacewalk-proxy-installer index 392d4ce..3510c55 100644 --- a/rel-eng/packages/spacewalk-proxy-installer +++ b/rel-eng/packages/spacewalk-proxy-installer @@ -1 +1 @@ -0.6.10-1 proxy/installer/ +0.6.11-1 proxy/installer/ --===============3484562668334067007==-- From jmrodri at fedoraproject.org Thu Aug 20 11:57:22 2015 Content-Type: multipart/mixed; boundary="===============8681465912260094149==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-backend-0.6.11-1' Date: Fri, 05 Jun 2009 15:59:01 +0000 Message-ID: <20090605155901.4406C1201F3@lists.fedorahosted.org> --===============8681465912260094149== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-backend-0.6.11-1' created by jesus m. rodriguez at 2009-06-05 15:57 +0000 Tagging package [spacewalk-backend] version [0.6.11-1] in directory [backen= d/]. Changes since spacewalk-proxy-installer-0.6.11-1: jesus m. rodriguez (1): Automatic commit of package [spacewalk-backend] release [0.6.11-1]. --- backend/spacewalk-backend.spec | 22 +++++++++++++++++++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 22 insertions(+), 2 deletions(-) --- --===============8681465912260094149==-- From jmrodri at fedoraproject.org Thu Aug 20 11:57:22 2015 Content-Type: multipart/mixed; boundary="===============4168899484248852921==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: backend/spacewalk-backend.spec rel-eng/packages Date: Fri, 05 Jun 2009 15:58:58 +0000 Message-ID: <20090605155858.C117E1201BC@lists.fedorahosted.org> --===============4168899484248852921== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/spacewalk-backend.spec | 22 +++++++++++++++++++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 22 insertions(+), 2 deletions(-) New commits: commit 9904db12dab697cb0de46fb048143763c185260c Author: jesus m. rodriguez Date: Fri Jun 5 11:57:50 2009 -0400 Automatic commit of package [spacewalk-backend] release [0.6.11-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 6982648..515b6aa 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -7,7 +7,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/p= roxies Group: Applications/Internet License: GPLv2 -Version: 0.6.10 +Version: 0.6.11 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz @@ -568,6 +568,26 @@ rm -f %{rhnconf}/rhnSecret.py* = # $Id$ %changelog +* Fri Jun 05 2009 jesus m. rodriguez 0.6.11-1 +- fixing duplicate entries in repogen tables and other clean aup + (pkilambi(a)redhat.com) +- add rhn-db-stats manual page (mzazrivec(a)redhat.com) +- allow rhn-db-stats to write to arbitrary location with running selinux + (mzazrivec(a)redhat.com) +- Fixes to support mod_jk >=3D 2.2.26. (dgoodwin(a)redhat.com) +- 503243 - Dropping the is_default column as we now determine the default = in + the app code based on the compatible eus channel instead of jus the defa= ult. + (pkilambi(a)redhat.com) +- Show all available eus channels during registration (jbowes(a)redhat.com) +- removing some unused hosted stuff (pkilambi(a)redhat.com) +- removing leftover code after a removed query (jsherril(a)redhat.com) +- 498517 fixing the error message to show the needed free entitlements for= the + activation to proceed (pkilambi(a)redhat.com) +- 502060 - The uniquify filter for deps is causing missing deps in repodat= a gen + as we should be looking into the name + version instead of just name. Al= so + since the f10+ rpms have issues with only duplicate provides, lets proce= ss + the rest of the capabilities. (pkilambi(a)redhat.com) + * Wed May 27 2009 Brad Buckingham 0.6.10-1 - 309601 - removing md5crypt from spacewalk-backend-tools (bbuckingham(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewal= k-backend index a2e3ea3..f1b09da 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -0.6.10-1 backend/ +0.6.11-1 backend/ --===============4168899484248852921==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:22 2015 Content-Type: multipart/mixed; boundary="===============9208378248714236213==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Fri, 05 Jun 2009 16:18:23 +0000 Message-ID: <20090605161823.6E4DC1201BC@lists.fedorahosted.org> --===============9208378248714236213== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java= | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) New commits: commit c1b011443463f9ae3f4f9a2ce386005b1b49f27e Author: Brad Buckingham Date: Fri Jun 5 12:17:26 2009 -0400 500505 - apidoc - packages.findByNvrea - update docs = API returns a list of elements vs a single element. diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/Packages= Handler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/Packag= esHandler.java index c6b2a03..74bc35c 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler= .java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler= .java @@ -501,7 +501,8 @@ public class PackagesHandler extends BaseHandler { = = /** - * Find a package by it's NVREA + * Lookup the details for packages with the given name, version, + * release, architecture label, and (optionally) epoch. * @param sessionKey The sessionKey for the logged in used * @param name - name of the package to search for * @param version - version of the package to search for @@ -513,7 +514,7 @@ public class PackagesHandler extends BaseHandler { * @param archLabel the arch to search for * @return the Package object requested * = - * @xmlrpc.doc Lookup the details for the package with the given name,= version, + * @xmlrpc.doc Lookup the details for packages with the given name, ve= rsion, * release, architecture label, and (optionally) epoch. * @xmlrpc.param #session_key() * @xmlrpc.param #param("string", "name") @@ -526,7 +527,9 @@ public class PackagesHandler extends BaseHandler { * NVRA combination, it will be returned. (Empty string is r= ecommended.)") * @xmlrpc.param #param("string", "archLabel") * @xmlrpc.returntype - * $PackageSerializer + * #array() + * $PackageSerializer + * #array_end() */ public List findByNvrea(String sessionKey, String name, Strin= g version, = String release, String epoch, String archLabel) { --===============9208378248714236213==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:22 2015 Content-Type: multipart/mixed; boundary="===============4794178316126708183==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Fri, 05 Jun 2009 16:19:35 +0000 Message-ID: <20090605161935.403731201BC@lists.fedorahosted.org> --===============4794178316126708183== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java= | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) New commits: commit 34bbc2fb586e92a87effb661ce47a0881cd501f1 Author: Brad Buckingham Date: Fri Jun 5 12:17:26 2009 -0400 500505 - apidoc - packages.findByNvrea - update docs = API returns a list of elements vs a single element. diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/Packages= Handler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/Packag= esHandler.java index c6b2a03..74bc35c 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler= .java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler= .java @@ -501,7 +501,8 @@ public class PackagesHandler extends BaseHandler { = = /** - * Find a package by it's NVREA + * Lookup the details for packages with the given name, version, + * release, architecture label, and (optionally) epoch. * @param sessionKey The sessionKey for the logged in used * @param name - name of the package to search for * @param version - version of the package to search for @@ -513,7 +514,7 @@ public class PackagesHandler extends BaseHandler { * @param archLabel the arch to search for * @return the Package object requested * = - * @xmlrpc.doc Lookup the details for the package with the given name,= version, + * @xmlrpc.doc Lookup the details for packages with the given name, ve= rsion, * release, architecture label, and (optionally) epoch. * @xmlrpc.param #session_key() * @xmlrpc.param #param("string", "name") @@ -526,7 +527,9 @@ public class PackagesHandler extends BaseHandler { * NVRA combination, it will be returned. (Empty string is r= ecommended.)") * @xmlrpc.param #param("string", "archLabel") * @xmlrpc.returntype - * $PackageSerializer + * #array() + * $PackageSerializer + * #array_end() */ public List findByNvrea(String sessionKey, String name, Strin= g version, = String release, String epoch, String archLabel) { --===============4794178316126708183==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:22 2015 Content-Type: multipart/mixed; boundary="===============5311433558642238929==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - proxy/proxy web/html Date: Fri, 05 Jun 2009 16:58:48 +0000 Message-ID: <20090605165848.0AC2C1201BC@lists.fedorahosted.org> --===============5311433558642238929== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/proxy/httpd-conf/rhn_proxy.conf | 5 +++++ web/html/applications/rhn-proxy/5.3/httpd/rhn_proxy.conf | 6 ++++++ 2 files changed, 11 insertions(+) New commits: commit eacbbec10b44bf1d72c4c190091c1c503e5eee7d Author: Miroslav Such=C3=BD Date: Fri Jun 5 18:56:36 2009 +0200 503187 - set MaxRequestsPerChild to 200 (Proxy CLI) diff --git a/proxy/proxy/httpd-conf/rhn_proxy.conf b/proxy/proxy/httpd-conf= /rhn_proxy.conf index fe5e6eb..5549297 100644 --- a/proxy/proxy/httpd-conf/rhn_proxy.conf +++ b/proxy/proxy/httpd-conf/rhn_proxy.conf @@ -1,6 +1,11 @@ # ** DO NOT EDIT ** # RHN Proxy handler configuration file = + + # bug #503187 + MaxRequestsPerChild 200 + # this stanza contains all the handlers for RHN app code commit d54d458fefa7e0adc1304be92cb73e410cb87aa0 Author: Miroslav Such=C3=BD Date: Fri Jun 5 18:55:23 2009 +0200 503187 - set MaxRequestsPerChild to 200 (WebUI installer) diff --git a/web/html/applications/rhn-proxy/5.3/httpd/rhn_proxy.conf b/web= /html/applications/rhn-proxy/5.3/httpd/rhn_proxy.conf index 56ecec7..98a68f0 100644 --- a/web/html/applications/rhn-proxy/5.3/httpd/rhn_proxy.conf +++ b/web/html/applications/rhn-proxy/5.3/httpd/rhn_proxy.conf @@ -1,6 +1,12 @@ # ** DO NOT EDIT ** # RHN Proxy handler configuration file = + + + # bug #503187 + MaxRequestsPerChild 200 + + # RHN Proxy Server location # this stanza contains all the handlers for RHN app code --===============5311433558642238929==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:22 2015 Content-Type: multipart/mixed; boundary="===============4945698833346946952==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 2 commits - proxy/proxy web/html Date: Fri, 05 Jun 2009 16:59:58 +0000 Message-ID: <20090605165958.B2C401201BC@lists.fedorahosted.org> --===============4945698833346946952== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/proxy/httpd-conf/rhn_proxy.conf | 5 +++++ web/html/applications/rhn-proxy/5.3/httpd/rhn_proxy.conf | 6 ++++++ 2 files changed, 11 insertions(+) New commits: commit 501703a251702723c320a9ee46551b171ab28f5b Author: Miroslav Such=C3=BD Date: Fri Jun 5 18:56:36 2009 +0200 503187 - set MaxRequestsPerChild to 200 (Proxy CLI) (cherry picked from commit eacbbec10b44bf1d72c4c190091c1c503e5eee7d) diff --git a/proxy/proxy/httpd-conf/rhn_proxy.conf b/proxy/proxy/httpd-conf= /rhn_proxy.conf index fe5e6eb..5549297 100644 --- a/proxy/proxy/httpd-conf/rhn_proxy.conf +++ b/proxy/proxy/httpd-conf/rhn_proxy.conf @@ -1,6 +1,11 @@ # ** DO NOT EDIT ** # RHN Proxy handler configuration file = + + # bug #503187 + MaxRequestsPerChild 200 + # this stanza contains all the handlers for RHN app code commit 866cfc28694446faea177c3eb2e74a545b658bff Author: Miroslav Such=C3=BD Date: Fri Jun 5 18:55:23 2009 +0200 503187 - set MaxRequestsPerChild to 200 (WebUI installer) (cherry picked from commit d54d458fefa7e0adc1304be92cb73e410cb87aa0) diff --git a/web/html/applications/rhn-proxy/5.3/httpd/rhn_proxy.conf b/web= /html/applications/rhn-proxy/5.3/httpd/rhn_proxy.conf index 56ecec7..98a68f0 100644 --- a/web/html/applications/rhn-proxy/5.3/httpd/rhn_proxy.conf +++ b/web/html/applications/rhn-proxy/5.3/httpd/rhn_proxy.conf @@ -1,6 +1,12 @@ # ** DO NOT EDIT ** # RHN Proxy handler configuration file = + + + # bug #503187 + MaxRequestsPerChild 200 + + # RHN Proxy Server location # this stanza contains all the handlers for RHN app code --===============4945698833346946952==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:22 2015 Content-Type: multipart/mixed; boundary="===============3079228948664902817==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Fri, 05 Jun 2009 17:15:14 +0000 Message-ID: <20090605171514.238D41201BC@lists.fedorahosted.org> --===============3079228948664902817== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/KickstartHandler.ja= va | 20 +++++----- 1 file changed, 10 insertions(+), 10 deletions(-) New commits: commit cd06e21fb4f52e898601e9a621f9711d8973fc04 Author: Brad Buckingham Date: Fri Jun 5 13:14:24 2009 -0400 504227 - apidoc - kickstart handler - add 'none' as a supported virt ty= pe = The UI was recently updated to support 'none' as a virt type; however, the API docs were not updated to reflect that chg. This commit is to a= ddress that. diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/Kicksta= rtHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/Kic= kstartHandler.java index 86da911..b6bc18e 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/KickstartHandl= er.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/KickstartHandl= er.java @@ -107,8 +107,8 @@ public class KickstartHandler extends BaseHandler { * @xmlrpc.param #session_key() * @xmlrpc.param #param_desc("string", "profileLabel", "Label for the = new * kickstart profile.") - * @xmlrpc.param #param_desc("string", "virtualizationType", "para_hos= t, qemu, xenfv - * or xenpv.") + * @xmlrpc.param #param_desc("string", "virtualizationType", "none, pa= ra_host, + * qemu, xenfv or xenpv.") * @xmlrpc.param #param_desc("string", "kickstartableTreeLabel", "Labe= l of a * kickstartable tree to associate the new profile with.") * @xmlrpc.param #param_desc("string", "kickstartFileContents", "Conte= nts of @@ -144,8 +144,8 @@ public class KickstartHandler extends BaseHandler { * @xmlrpc.param #session_key() * @xmlrpc.param #param_desc("string", "profileLabel", "Label for the = new * kickstart profile.") - * @xmlrpc.param #param_desc("string", "virtualizationType", "para_hos= t, qemu, xenfv - * or xenpv.") + * @xmlrpc.param #param_desc("string", "virtualizationType", "none, pa= ra_host, + * qemu, xenfv or xenpv.") * @xmlrpc.param #param_desc("string", "kickstartableTreeLabel", "Labe= l of a * kickstartable tree to associate the new profile with.") * @xmlrpc.param #param_desc("string", "kickstartHost", "Kickstart hos= tname @@ -203,8 +203,8 @@ public class KickstartHandler extends BaseHandler { * @xmlrpc.param #session_key() * @xmlrpc.param #param_desc("string", "profileLabel" "Label for the n= ew * kickstart profile.") - * @xmlrpc.param #param_desc("string", "virtualizationType", "para_hos= t, qemu, xenfv - * or xenpv.") + * @xmlrpc.param #param_desc("string", "virtualizationType", "none, pa= ra_host, + * qemu, xenfv or xenpv.") * @xmlrpc.param #param_desc("string", "kickstartableTreeLabel", "Labe= l of a * kickstartable tree to associate the new profile with.") * @xmlrpc.param #param_desc("string", "kickstartHost", "Kickstart hos= tname @@ -257,8 +257,8 @@ public class KickstartHandler extends BaseHandler { * @xmlrpc.param #session_key() * @xmlrpc.param #param_desc("string", "profileLabel", "Label for the = new * kickstart profile.") - * @xmlrpc.param #param_desc("string", "virtualizationType", "para_hos= t, qemu, xenfv - * or xenpv.") + * @xmlrpc.param #param_desc("string", "virtualizationType", "none, pa= ra_host, + * qemu, xenfv or xenpv.") * @xmlrpc.param #param_desc("string", "kickstartableTreeLabel", "Labe= l of a * kickstartable tree to associate the new profile with.") * @xmlrpc.param #param_desc("boolean", "downloadUrl", "Download URL, = or @@ -458,8 +458,8 @@ public class KickstartHandler extends BaseHandler { * @xmlrpc.param #session_key() * @xmlrpc.param #param_desc("string", "profileLabel", "Label for the = new * kickstart profile.") - * @xmlrpc.param #param_desc("string", "virtualizationType", "para_hos= t, qemu, xenfv - * or xenpv.") + * @xmlrpc.param #param_desc("string", "virtualizationType", "none, pa= ra_host, + * qemu, xenfv or xenpv.") * @xmlrpc.param #param_desc("string", "kickstartableTreeLabel", "Labe= l of a * kickstartable tree to associate the new profile with.") * @xmlrpc.param #param_desc("string", "kickstartFileContents", "Conte= nts of --===============3079228948664902817==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:22 2015 Content-Type: multipart/mixed; boundary="===============5076300083780021108==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Fri, 05 Jun 2009 17:17:22 +0000 Message-ID: <20090605171722.3DA941201BC@lists.fedorahosted.org> --===============5076300083780021108== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/KickstartHandler.ja= va | 20 +++++----- 1 file changed, 10 insertions(+), 10 deletions(-) New commits: commit 3aadd2052cc52a3a56f19c878ddd2dab5c457c4c Author: Brad Buckingham Date: Fri Jun 5 13:14:24 2009 -0400 504227 - apidoc - kickstart handler - add 'none' as a supported virt ty= pe = The UI was recently updated to support 'none' as a virt type; however, the API docs were not updated to reflect that chg. This commit is to a= ddress that. diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/Kicksta= rtHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/Kic= kstartHandler.java index 86da911..b6bc18e 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/KickstartHandl= er.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/KickstartHandl= er.java @@ -107,8 +107,8 @@ public class KickstartHandler extends BaseHandler { * @xmlrpc.param #session_key() * @xmlrpc.param #param_desc("string", "profileLabel", "Label for the = new * kickstart profile.") - * @xmlrpc.param #param_desc("string", "virtualizationType", "para_hos= t, qemu, xenfv - * or xenpv.") + * @xmlrpc.param #param_desc("string", "virtualizationType", "none, pa= ra_host, + * qemu, xenfv or xenpv.") * @xmlrpc.param #param_desc("string", "kickstartableTreeLabel", "Labe= l of a * kickstartable tree to associate the new profile with.") * @xmlrpc.param #param_desc("string", "kickstartFileContents", "Conte= nts of @@ -144,8 +144,8 @@ public class KickstartHandler extends BaseHandler { * @xmlrpc.param #session_key() * @xmlrpc.param #param_desc("string", "profileLabel", "Label for the = new * kickstart profile.") - * @xmlrpc.param #param_desc("string", "virtualizationType", "para_hos= t, qemu, xenfv - * or xenpv.") + * @xmlrpc.param #param_desc("string", "virtualizationType", "none, pa= ra_host, + * qemu, xenfv or xenpv.") * @xmlrpc.param #param_desc("string", "kickstartableTreeLabel", "Labe= l of a * kickstartable tree to associate the new profile with.") * @xmlrpc.param #param_desc("string", "kickstartHost", "Kickstart hos= tname @@ -203,8 +203,8 @@ public class KickstartHandler extends BaseHandler { * @xmlrpc.param #session_key() * @xmlrpc.param #param_desc("string", "profileLabel" "Label for the n= ew * kickstart profile.") - * @xmlrpc.param #param_desc("string", "virtualizationType", "para_hos= t, qemu, xenfv - * or xenpv.") + * @xmlrpc.param #param_desc("string", "virtualizationType", "none, pa= ra_host, + * qemu, xenfv or xenpv.") * @xmlrpc.param #param_desc("string", "kickstartableTreeLabel", "Labe= l of a * kickstartable tree to associate the new profile with.") * @xmlrpc.param #param_desc("string", "kickstartHost", "Kickstart hos= tname @@ -257,8 +257,8 @@ public class KickstartHandler extends BaseHandler { * @xmlrpc.param #session_key() * @xmlrpc.param #param_desc("string", "profileLabel", "Label for the = new * kickstart profile.") - * @xmlrpc.param #param_desc("string", "virtualizationType", "para_hos= t, qemu, xenfv - * or xenpv.") + * @xmlrpc.param #param_desc("string", "virtualizationType", "none, pa= ra_host, + * qemu, xenfv or xenpv.") * @xmlrpc.param #param_desc("string", "kickstartableTreeLabel", "Labe= l of a * kickstartable tree to associate the new profile with.") * @xmlrpc.param #param_desc("boolean", "downloadUrl", "Download URL, = or @@ -458,8 +458,8 @@ public class KickstartHandler extends BaseHandler { * @xmlrpc.param #session_key() * @xmlrpc.param #param_desc("string", "profileLabel", "Label for the = new * kickstart profile.") - * @xmlrpc.param #param_desc("string", "virtualizationType", "para_hos= t, qemu, xenfv - * or xenpv.") + * @xmlrpc.param #param_desc("string", "virtualizationType", "none, pa= ra_host, + * qemu, xenfv or xenpv.") * @xmlrpc.param #param_desc("string", "kickstartableTreeLabel", "Labe= l of a * kickstartable tree to associate the new profile with.") * @xmlrpc.param #param_desc("string", "kickstartFileContents", "Conte= nts of --===============5076300083780021108==-- From shughes at fedoraproject.org Thu Aug 20 11:57:22 2015 Content-Type: multipart/mixed; boundary="===============8432803554137368109==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - web/modules Date: Fri, 05 Jun 2009 17:50:27 +0000 Message-ID: <20090605175027.8E4171201BC@lists.fedorahosted.org> --===============8432803554137368109== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable web/modules/rhn/RHN/Access.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 72d44b23f9d9f59ffe79e12886d1b2428eadce89 Author: Shannon Hughes Date: Fri Jun 5 13:44:27 2009 -0400 504327 - fixing acl for chcecking needed install tab diff --git a/web/modules/rhn/RHN/Access.pm b/web/modules/rhn/RHN/Access.pm index 7404244..4ff744f 100644 --- a/web/modules/rhn/RHN/Access.pm +++ b/web/modules/rhn/RHN/Access.pm @@ -70,8 +70,7 @@ sub user_has_access_to_servergroup_acl_test { = sub need_first_user { my $pxt =3D shift; - my $foo =3D not (PXT::Config->get('satellite') and not RHN::User->sate= llite_has_users() and not $pxt->user); - warn "returning " . $foo; + my $foo =3D not RHN::User->satellite_has_users(); return $foo; } = --===============8432803554137368109==-- From shughes at fedoraproject.org Thu Aug 20 11:57:23 2015 Content-Type: multipart/mixed; boundary="===============7067103414299689101==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: web/modules Date: Fri, 05 Jun 2009 17:51:47 +0000 Message-ID: <20090605175147.2B6C81201BC@lists.fedorahosted.org> --===============7067103414299689101== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable web/modules/rhn/RHN/Access.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 57492189835a3e48b51b5c44ad6323272c08555c Author: Shannon Hughes Date: Fri Jun 5 13:44:27 2009 -0400 504327 - fixing acl for chcecking needed install tab diff --git a/web/modules/rhn/RHN/Access.pm b/web/modules/rhn/RHN/Access.pm index 7404244..4ff744f 100644 --- a/web/modules/rhn/RHN/Access.pm +++ b/web/modules/rhn/RHN/Access.pm @@ -70,8 +70,7 @@ sub user_has_access_to_servergroup_acl_test { = sub need_first_user { my $pxt =3D shift; - my $foo =3D not (PXT::Config->get('satellite') and not RHN::User->sate= llite_has_users() and not $pxt->user); - warn "returning " . $foo; + my $foo =3D not RHN::User->satellite_has_users(); return $foo; } = --===============7067103414299689101==-- From jmrodri at fedoraproject.org Thu Aug 20 11:57:23 2015 Content-Type: multipart/mixed; boundary="===============1260290359958908797==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: rel-eng/packages schema/spacewalk Date: Fri, 05 Jun 2009 17:53:27 +0000 Message-ID: <20090605175327.EE6D61201BC@lists.fedorahosted.org> --===============1260290359958908797== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema.spec | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) New commits: commit f5565ea98d0b372cd070931eee5326090c84e7fb Author: jesus m. rodriguez Date: Fri Jun 5 13:53:07 2009 -0400 Automatic commit of package [spacewalk-schema] release [0.6.9-1]. diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk= -schema index 4da1f57..31a1432 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -0.6.8-1 schema/spacewalk/ +0.6.9-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spac= ewalk-schema.spec index 111b15e..3c79a3c 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: 0.6.8 +Version: 0.6.9 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz = @@ -52,6 +52,19 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-schema-upgrade* = %changelog +* Fri Jun 05 2009 jesus m. rodriguez 0.6.9-1 +- 503243 - Dropping the is_default column as we now determine the default = in + the app code based on the compatible eus channel instead of jus the defa= ult. + (pkilambi(a)redhat.com) +- no need to add whitespace to upgrade script (mzazrivec(a)redhat.com) +- monitoring log files belong to /var/log/nocpulse (mzazrivec(a)redhat.com) +- 502641 - renaming upgrade script to 119-rhnSystemMigrations.sql + (bbuckingham(a)redhat.com) +- 502641 - rhnSystemMigrations remove not null constraints from to/from or= g ids + (bbuckingham(a)redhat.com) +- 498467 - A few changes related to the channel name limit increase. + (jason.dobies(a)redhat.com) + * Tue May 26 2009 Devan Goodwin 0.6.8-1 - 501389 - splitting up virt types none and kvm guests, as well as improvi= ng virt type names (jsherril(a)redhat.com) --===============1260290359958908797==-- From jmrodri at fedoraproject.org Thu Aug 20 11:57:23 2015 Content-Type: multipart/mixed; boundary="===============1214677969157687523==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-schema-0.6.9-1' Date: Fri, 05 Jun 2009 17:53:30 +0000 Message-ID: <20090605175330.6D3E6120267@lists.fedorahosted.org> --===============1214677969157687523== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-schema-0.6.9-1' created by jesus m. rodriguez at 2009-06-05 17:53 +0000 Tagging package [spacewalk-schema] version [0.6.9-1] in directory [schema/s= pacewalk/]. Changes since spacewalk-backend-0.6.11-1-5: --- 0 files changed --- --===============1214677969157687523==-- From jmrodri at fedoraproject.org Thu Aug 20 11:57:23 2015 Content-Type: multipart/mixed; boundary="===============7567656184407950256==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/SatConfig-general-1.216.10-1' Date: Fri, 05 Jun 2009 17:54:44 +0000 Message-ID: <20090605175444.0712C1201F3@lists.fedorahosted.org> --===============7567656184407950256== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'SatConfig-general-1.216.10-1' created by jesus m. rodriguez at 2009-06-05 17:54 +0000 Tagging package [SatConfig-general] version [1.216.10-1] in directory [moni= toring/SatConfig/general/]. Changes since spacewalk-schema-0.6.9-1: jesus m. rodriguez (1): Automatic commit of package [SatConfig-general] release [1.216.10-1]. --- monitoring/SatConfig/general/SatConfig-general.spec | 6 +++++- rel-eng/packages/SatConfig-general | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) --- --===============7567656184407950256==-- From jmrodri at fedoraproject.org Thu Aug 20 11:57:23 2015 Content-Type: multipart/mixed; boundary="===============5094938223735351741==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: monitoring/SatConfig rel-eng/packages Date: Fri, 05 Jun 2009 17:54:40 +0000 Message-ID: <20090605175440.8BBCD1201BC@lists.fedorahosted.org> --===============5094938223735351741== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable monitoring/SatConfig/general/SatConfig-general.spec | 6 +++++- rel-eng/packages/SatConfig-general | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 96d288716a34bd0f7d069c4a1f820533b6e0d6c3 Author: jesus m. rodriguez Date: Fri Jun 5 13:54:07 2009 -0400 Automatic commit of package [SatConfig-general] release [1.216.10-1]. diff --git a/monitoring/SatConfig/general/SatConfig-general.spec b/monitori= ng/SatConfig/general/SatConfig-general.spec index 835d125..5e78dda 100644 --- a/monitoring/SatConfig/general/SatConfig-general.spec +++ b/monitoring/SatConfig/general/SatConfig-general.spec @@ -2,7 +2,7 @@ %define hb_res_dir %{_sysconfdir}/ha.d/resource.d %define installed_dir %sysv_dir/installed Name: SatConfig-general -Version: 1.216.9 +Version: 1.216.10 Release: 1%{?dist} Summary: Satellite Configuration System - general setup, used by many= packages URL: https://fedorahosted.org/spacewalk @@ -61,6 +61,10 @@ ln -s ../../rc.d/np.d/hbResource $RPM_BUILD_ROOT%hb_res_= dir/ClusterLeader rm -rf $RPM_BUILD_ROOT = %changelog +* Fri Jun 05 2009 jesus m. rodriguez 1.216.10-1 +- remove unused code (msuchy(a)redhat.com) +- fix formating (msuchy(a)redhat.com) + * Thu May 21 2009 jesus m. rodriguez 1.216.9-1 - 499564 - start InstallSoftwareConfig only when it's due (mzazrivec(a)red= hat.com) = diff --git a/rel-eng/packages/SatConfig-general b/rel-eng/packages/SatConfi= g-general index b795c99..2157fe1 100644 --- a/rel-eng/packages/SatConfig-general +++ b/rel-eng/packages/SatConfig-general @@ -1 +1 @@ -1.216.9-1 monitoring/SatConfig/general/ +1.216.10-1 monitoring/SatConfig/general/ --===============5094938223735351741==-- From partha at fedoraproject.org Thu Aug 20 11:57:23 2015 Content-Type: multipart/mixed; boundary="===============8909151354885084031==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Fri, 05 Jun 2009 18:39:26 +0000 Message-ID: <20090605183926.5915F1201BC@lists.fedorahosted.org> --===============8909151354885084031== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEd= itAction.java | 3 +++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml= | 8 ++++++++ 2 files changed, 11 insertions(+) New commits: commit 2ca36c270de74974f990400bef5ef82d35ae3a81 Author: Partha Aji Date: Fri Jun 5 14:41:32 2009 -0400 504014 - Fix to show an error message on No Kicktstart tree on KS OS pa= ge diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Kicksta= rtSoftwareEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/ki= ckstart/KickstartSoftwareEditAction.java index 91c401d..aa2dc00 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftw= areEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftw= areEditAction.java @@ -205,6 +205,9 @@ public class KickstartSoftwareEditAction extends BaseKi= ckstartEditAction { KickstartableTree tree =3D KickstartFactory.lookupKickstartTreeBy= IdAndOrg( (Long) form.get(TREE), = ctx.getLoggedInUser().getOrg()); + if (tree =3D=3D null) { + return new ValidatorError("kickstart.softwaredit.tree.required= "); + } = Distro distro =3D CobblerProfileCommand.getCobblerDistroForVirtTyp= e(tree, = cmdIn.getKickstartData().getKickstartDefaults().getVirtual= izationType(), diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResour= ce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringReso= urce_en_US.xml index a5a3751..f71671e 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml @@ -10525,6 +10525,14 @@ Please note that some manual configuration of thes= e scripts may still be require
                                      = + + A kickstartable tree is required. + + /rhn/kickstart/KickstartS= oftwareEdit + + + + Software URL --===============8909151354885084031==-- From partha at fedoraproject.org Thu Aug 20 11:57:23 2015 Content-Type: multipart/mixed; boundary="===============4262699568310594802==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Fri, 05 Jun 2009 18:40:12 +0000 Message-ID: <20090605184012.E6CAC1201BC@lists.fedorahosted.org> --===============4262699568310594802== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEd= itAction.java | 3 +++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml= | 8 ++++++++ 2 files changed, 11 insertions(+) New commits: commit 89098d2d6d0321dc20d349b3a6e50da9e629eb56 Author: Partha Aji Date: Fri Jun 5 14:41:32 2009 -0400 504014 - Fix to show an error message on No Kicktstart tree on KS OS pa= ge diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Kicksta= rtSoftwareEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/ki= ckstart/KickstartSoftwareEditAction.java index 91c401d..aa2dc00 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftw= areEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftw= areEditAction.java @@ -205,6 +205,9 @@ public class KickstartSoftwareEditAction extends BaseKi= ckstartEditAction { KickstartableTree tree =3D KickstartFactory.lookupKickstartTreeBy= IdAndOrg( (Long) form.get(TREE), = ctx.getLoggedInUser().getOrg()); + if (tree =3D=3D null) { + return new ValidatorError("kickstart.softwaredit.tree.required= "); + } = Distro distro =3D CobblerProfileCommand.getCobblerDistroForVirtTyp= e(tree, = cmdIn.getKickstartData().getKickstartDefaults().getVirtual= izationType(), diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResour= ce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringReso= urce_en_US.xml index a5a3751..f71671e 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml @@ -10525,6 +10525,14 @@ Please note that some manual configuration of thes= e scripts may still be require = + + A kickstartable tree is required. + + /rhn/kickstart/KickstartS= oftwareEdit + + + + Software URL --===============4262699568310594802==-- From shughes at fedoraproject.org Thu Aug 20 11:57:23 2015 Content-Type: multipart/mixed; boundary="===============2380704154715332651==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Fri, 05 Jun 2009 18:56:24 +0000 Message-ID: <20090605185624.47C861201BC@lists.fedorahosted.org> --===============2380704154715332651== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitlementS= ubscriptionsAction.java | 8 -------- java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementOrg= sAction.java | 9 +-------- 2 files changed, 1 insertion(+), 16 deletions(-) New commits: commit c07d8cb35505612c75751b0becaa9f89475f054e Author: Shannon Hughes Date: Fri Jun 5 14:50:20 2009 -0400 499471 - list default org in subscription list diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/Software= EntitlementSubscriptionsAction.java b/java/code/src/com/redhat/rhn/frontend= /action/multiorg/SoftwareEntitlementSubscriptionsAction.java index 8c6a41c..bfb6b6e 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitle= mentSubscriptionsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitle= mentSubscriptionsAction.java @@ -37,7 +37,6 @@ 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.List; = import javax.servlet.http.HttpServletRequest; @@ -125,13 +124,6 @@ public class SoftwareEntitlementSubscriptionsAction ex= tends RhnAction { = List entitlementUsage =3D = ChannelManager.listEntitlementsForAllOrgsWithEmpty= Orgs(cf, user); - for (Iterator itr =3D = - entitlementUsage.iterator(); itr.h= asNext();) { - OrgSoftwareEntitlementDto dto =3D itr.next(); - if (satelliteOrg.equals(dto.getOrg())) { - itr.remove(); - } - } = ChannelOverview satelliteOrgOverview =3D ChannelManager.getEntitle= ment( satelliteOrg.getId(), cf.getId()); diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEn= titlementOrgsAction.java b/java/code/src/com/redhat/rhn/frontend/action/mul= tiorg/SystemEntitlementOrgsAction.java index 17d21ae..515597c 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitleme= ntOrgsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitleme= ntOrgsAction.java @@ -14,7 +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; @@ -86,13 +85,7 @@ public class SystemEntitlementOrgsAction extends RhnActi= on { DataList result =3D OrgManager.allOrgsSingleEntitlementWithEmptyOrgs(entitlementLa= bel); Org satelliteOrg =3D OrgFactory.getSatelliteOrg(); - for (Iterator itr =3D result.iterator(); itr.hasNext();) { - Map row =3D itr.next(); - if (satelliteOrg.getId().equals(row.get("orgid"))) { - itr.remove(); - break; - } - } + request.setAttribute("egntname", entitlementLabel); request.setAttribute("enthuman", e.getHumanReadableLabel()); request.setAttribute("pageList", result); --===============2380704154715332651==-- From shughes at fedoraproject.org Thu Aug 20 11:57:23 2015 Content-Type: multipart/mixed; boundary="===============0462119418082368710==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Fri, 05 Jun 2009 18:57:13 +0000 Message-ID: <20090605185713.340BC1201BC@lists.fedorahosted.org> --===============0462119418082368710== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitlementS= ubscriptionsAction.java | 8 -------- java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementOrg= sAction.java | 9 +-------- 2 files changed, 1 insertion(+), 16 deletions(-) New commits: commit 34738927f41723afcbe54decc51eee110265b0de Author: Shannon Hughes Date: Fri Jun 5 14:50:20 2009 -0400 499471 - list default org in subscription list diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/Software= EntitlementSubscriptionsAction.java b/java/code/src/com/redhat/rhn/frontend= /action/multiorg/SoftwareEntitlementSubscriptionsAction.java index 8c6a41c..bfb6b6e 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitle= mentSubscriptionsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitle= mentSubscriptionsAction.java @@ -37,7 +37,6 @@ 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.List; = import javax.servlet.http.HttpServletRequest; @@ -125,13 +124,6 @@ public class SoftwareEntitlementSubscriptionsAction ex= tends RhnAction { = List entitlementUsage =3D = ChannelManager.listEntitlementsForAllOrgsWithEmpty= Orgs(cf, user); - for (Iterator itr =3D = - entitlementUsage.iterator(); itr.h= asNext();) { - OrgSoftwareEntitlementDto dto =3D itr.next(); - if (satelliteOrg.equals(dto.getOrg())) { - itr.remove(); - } - } = ChannelOverview satelliteOrgOverview =3D ChannelManager.getEntitle= ment( satelliteOrg.getId(), cf.getId()); diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEn= titlementOrgsAction.java b/java/code/src/com/redhat/rhn/frontend/action/mul= tiorg/SystemEntitlementOrgsAction.java index 17d21ae..515597c 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitleme= ntOrgsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitleme= ntOrgsAction.java @@ -14,7 +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; @@ -86,13 +85,7 @@ public class SystemEntitlementOrgsAction extends RhnActi= on { DataList result =3D OrgManager.allOrgsSingleEntitlementWithEmptyOrgs(entitlementLa= bel); Org satelliteOrg =3D OrgFactory.getSatelliteOrg(); - for (Iterator itr =3D result.iterator(); itr.hasNext();) { - Map row =3D itr.next(); - if (satelliteOrg.getId().equals(row.get("orgid"))) { - itr.remove(); - break; - } - } + request.setAttribute("egntname", entitlementLabel); request.setAttribute("enthuman", e.getHumanReadableLabel()); request.setAttribute("pageList", result); --===============0462119418082368710==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:23 2015 Content-Type: multipart/mixed; boundary="===============3994898556858790685==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Fri, 05 Jun 2009 19:22:56 +0000 Message-ID: <20090605192256.CE4DA1201BC@lists.fedorahosted.org> --===============3994898556858790685== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/util/StringUtil.java = | 3 = java/code/src/com/redhat/rhn/domain/token/ActivationKey.hbm.xml = | 8 = java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java = | 22 ++ java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyFactoryTest.ja= va | 44 +++++ java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java = | 2 = java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWi= zardAction.java | 6 = java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDeleteConf= irmAction.java | 2 = java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDetailsAct= ion.java | 4 = java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHa= ndler.java | 2 = java/code/src/com/redhat/rhn/manager/action/ActionManager.java = | 3 = java/code/src/com/redhat/rhn/manager/kickstart/KickstartActivationKeysComm= and.java | 52 ++++-- java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreate= Command.java | 17 +- java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtualSyste= mCommand.java | 6 = java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java = | 64 ++++--- java/code/src/com/redhat/rhn/manager/token/test/ActivationKeyManagerTest.j= ava | 4 = java/code/src/org/cobbler/CobblerObject.java = | 85 +++++++++- java/code/src/org/cobbler/Profile.java = | 31 ++- java/code/src/org/cobbler/SystemRecord.java = | 20 ++ 18 files changed, 305 insertions(+), 70 deletions(-) New commits: commit cf8987e45e651704d0e93afab095d10ff47752ef Author: Justin Sherrill Date: Fri Jun 5 15:17:56 2009 -0400 504049 - adding functionality to keep the cobbler profile and system r= ecords redhat managemnet keys in line with whats set in the Kickstart Profi= le on satellite = this affects: 1. Clicking create cobbler system record 2. renaming an activation keys key 3. deleting an actiavtion key 4. adding or removing an activation key from a kickstart profile = syncing happens at the profile level, but trickles down to the systems = using that profile diff --git a/java/code/src/com/redhat/rhn/common/util/StringUtil.java b/jav= a/code/src/com/redhat/rhn/common/util/StringUtil.java index 9e13c73..f04a55c 100644 --- a/java/code/src/com/redhat/rhn/common/util/StringUtil.java +++ b/java/code/src/com/redhat/rhn/common/util/StringUtil.java @@ -25,6 +25,7 @@ import org.stringtree.json.JSONReader; import org.stringtree.json.JSONWriter; = import java.net.URLEncoder; +import java.util.Collection; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; @@ -351,7 +352,7 @@ public class StringUtil { * @param inputList The List of Strings to join * @return The joined String */ - public static String join(String separator, List inputList) { + public static String join(String separator, Collection inputList) { Iterator itty =3D inputList.iterator(); = return join(separator, itty); diff --git a/java/code/src/com/redhat/rhn/domain/token/ActivationKey.hbm.xm= l b/java/code/src/com/redhat/rhn/domain/token/ActivationKey.hbm.xml index 1d6665e..7247761 100644 --- a/java/code/src/com/redhat/rhn/domain/token/ActivationKey.hbm.xml +++ b/java/code/src/com/redhat/rhn/domain/token/ActivationKey.hbm.xml @@ -47,4 +47,12 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" = = + + + + + + + + diff --git a/java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory= .java b/java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java index d27055d..eb5e2f6 100644 --- a/java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java +++ b/java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java @@ -18,6 +18,7 @@ import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.common.util.MD5Crypt; import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.domain.channel.Channel; +import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.KickstartSession; import com.redhat.rhn.domain.org.OrgFactory; import com.redhat.rhn.domain.server.Server; @@ -29,8 +30,11 @@ import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; = + +import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.util.Map; = /** * ActivationKeyFactory @@ -113,12 +117,18 @@ public class ActivationKeyFactory extends HibernateFa= ctory { else { validateKeyName(key.trim()); } + keyToUse =3D ActivationKey.makePrefix(user.getOrg()) + keyToUse.tr= im(); = + if (server !=3D null) { + keyToUse =3D "re-" + keyToUse; + } + newKey.setKey(keyToUse); newKey.setCreator(user); newKey.setOrg(user.getOrg()); newKey.setServer(server); + if (StringUtils.isBlank(note)) { note =3D DEFAULT_DESCRIPTION; } @@ -247,5 +257,17 @@ public class ActivationKeyFactory extends HibernateFac= tory { = } = + /** + * List all kickstarts associated with an activation key + * @param key the key to look for associations with + * @return list of kickstartData objects + */ + public static List listAssociatedKickstarts(ActivationK= ey key) { + Map params =3D new HashMap(); + params.put("token", key.getToken()); + return singleton.listObjectsByNamedQuery("ActivationKey.listAssoci= atedKickstarts", + = params); + } + = } diff --git a/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyFa= ctoryTest.java b/java/code/src/com/redhat/rhn/domain/token/test/ActivationK= eyFactoryTest.java new file mode 100644 index 0000000..cc516f2 --- /dev/null +++ b/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyFactoryTe= st.java @@ -0,0 +1,44 @@ +/** + * Copyright (c) 2009 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.domain.token.test; + +import com.redhat.rhn.domain.kickstart.KickstartData; +import com.redhat.rhn.domain.kickstart.test.KickstartDataTest; +import com.redhat.rhn.domain.token.ActivationKey; +import com.redhat.rhn.domain.token.ActivationKeyFactory; +import com.redhat.rhn.testing.BaseTestCaseWithUser; + +import java.util.List; + + +public class ActivationKeyFactoryTest extends BaseTestCaseWithUser { + + + public void testListAssociatedKickstarts() throws Exception { + + ActivationKey key =3D ActivationKeyTest.createTestActivationKey(us= er); + + List list =3D ActivationKeyFactory.listAssociatedKi= ckstarts(key); + assertTrue(list.isEmpty()); + + KickstartData data =3D KickstartDataTest.createTestKickstartData(u= ser.getOrg()); + data.getDefaultRegTokens().add(key.getToken()); + + list =3D ActivationKeyFactory.listAssociatedKickstarts(key); + assertTrue(list.size() =3D=3D 1); + + } + +} diff --git a/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTe= st.java b/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.= java index 96eb85b..6307031 100644 --- a/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java +++ b/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java @@ -140,7 +140,7 @@ public class ActivationKeyTest extends BaseTestCaseWith= User { (user, keyName, "Cool Duplicate", null, null, false); assertEquals(ActivationKey.makePrefix(user.getOrg()) + keyName.tri= m(), k.getKey()); String newKey =3D keyName + " FOO "; - manager.changeKey(newKey , k); + manager.changeKey(newKey , k, user); assertNotNull(ActivationKey.makePrefix(user.getOrg()) + newKey.tri= m()); } = diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Schedul= eKickstartWizardAction.java b/java/code/src/com/redhat/rhn/frontend/action/= kickstart/ScheduleKickstartWizardAction.java index d20b310..d54004a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickst= artWizardAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickst= artWizardAction.java @@ -430,8 +430,12 @@ public class ScheduleKickstartWizardAction extends Rhn= WizardAction { log.debug("Creating cobbler system record"); org.cobbler.Profile profile =3D org.cobbler.Profile.lookupById( CobblerXMLRPCHelper.getConnection(user), cobblerId); + + KickstartData data =3D KickstartFactory.lookupKickstartDataByCobbl= erIdAndOrg( + user.getOrg(), profile.getUid()); + CobblerSystemCreateCommand cmd =3D new CobblerSystemCreateCommand(= server, - profile.getName()); + profile.getName(), data); cmd.store(); log.debug("cobbler system record created."); String[] args =3D new String[2]; diff --git a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationK= eyDeleteConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/t= oken/ActivationKeyDeleteConfirmAction.java index 39a2714..7b2411f 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDelet= eConfirmAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDelet= eConfirmAction.java @@ -45,7 +45,7 @@ public class ActivationKeyDeleteConfirmAction extends Rhn= Action { if (context.isSubmitted() && context.wasDispatched(DELETE_KEY)) { String [] params =3D {key.getNote()}; ActivationKeyManager manager =3D ActivationKeyManager.getInsta= nce(); - manager.remove(key); + manager.remove(key, context.getLoggedInUser()); getStrutsDelegate().saveMessage(DELETED_MESSAGE_KEY, params, r= equest); return mapping.findForward("success"); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationK= eyDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/token/A= ctivationKeyDetailsAction.java index 5f94b11..b29ba3c 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDetai= lsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDetai= lsAction.java @@ -218,10 +218,10 @@ public class ActivationKeyDetailsAction extends RhnAc= tion { if (StringUtils.isBlank(newKey)) { newKey =3D ActivationKeyFactory.generateKey(); = } - newKey =3D ActivationKey.makePrefix(key.getOrg()) + newKey; = + newKey =3D ActivationKey.makePrefix(key.getOrg()) + newKey; String enteredKey =3D form.getString(KEY); if (!enteredKey.equals(key.getKey()) && !newKey.equals(key.getKey(= ))) { - manager.changeKey(newKey, key); + manager.changeKey(newKey, key, user); if (!StringUtils.isBlank(enteredKey) && = !enteredKey.equals(key.getKey())) { addToMessage(msg, "activation-key.java.org_prefixed", = diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/Act= ivationKeyHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activ= ationkey/ActivationKeyHandler.java index f5d6cdf..484cc0c 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/Activation= KeyHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/Activation= KeyHandler.java @@ -258,7 +258,7 @@ public class ActivationKeyHandler extends BaseHandler { public int delete(String sessionKey, String key) { User user =3D getLoggedInUser(sessionKey); ActivationKey activationKey =3D lookupKey(key, user); - ActivationKeyManager.getInstance().remove(activationKey); + ActivationKeyManager.getInstance().remove(activationKey, user); return 1; } = = diff --git a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java= b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java index c8c3de5..8a89935 100644 --- a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java +++ b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java @@ -1466,7 +1466,8 @@ public class ActionManager extends BaseManager { Profile cProfile =3D Profile.lookupById(CobblerXMLRPCHelper.getCon= nection( pcmd.getUser()), pcmd.getKsdata().getCobblerId()); CobblerVirtualSystemCommand vcmd =3D new CobblerVirtualSystemComma= nd( - pcmd.getServer(), cProfile.getName(), pcmd.getGuestName()); + pcmd.getServer(), cProfile.getName(), pcmd.getGuestName(), + pcmd.getKsdata()); kad.setCobblerSystemName(vcmd.getCobblerSystemRecordName()); = kad.setKickstartHost(pcmd.getKickstartServerName()); diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartActiva= tionKeysCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/Kicks= tartActivationKeysCommand.java index e86f0bd..14cbb1e 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartActivationKey= sCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartActivationKey= sCommand.java @@ -14,13 +14,17 @@ */ package com.redhat.rhn.manager.kickstart; = +import com.redhat.rhn.domain.token.ActivationKeyFactory; import com.redhat.rhn.domain.token.Token; import com.redhat.rhn.domain.token.TokenFactory; import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper; + +import org.cobbler.Profile; = import java.util.ArrayList; import java.util.Collections; -import java.util.Iterator; +import java.util.HashSet; import java.util.Set; = /** @@ -42,36 +46,48 @@ public class KickstartActivationKeysCommand extends Bas= eKickstartCommand { * Removes default regtokens from the kickstart profile. * @param ids The ids of the regtokens to remove. */ - public void removeTokensByIds(ArrayList ids) { - Iterator toRemoveIter =3D ids.iterator(); - - while (toRemoveIter.hasNext()) { - Long id =3D (Long) toRemoveIter.next(); - - Iterator tokensIter =3D this.getKickstartData().getDefaultRegT= okens().iterator(); - - while (tokensIter.hasNext()) { - Token token =3D (Token) tokensIter.next(); + public void removeTokensByIds(ArrayList ids) { + Set keysToRemove =3D new HashSet(); = + for (Long id : ids) { + Set tokenSetCopy =3D new HashSet(); + tokenSetCopy.addAll(this.getKickstartData().getDefaultRegToken= s()); + for (Token token : tokenSetCopy) { if (token.getId() =3D=3D id) { - tokensIter.remove(); + this.getKickstartData().getDefaultRegTokens().remove(t= oken); + keysToRemove.add(ActivationKeyFactory.lookupByToken(to= ken).getKey()); } } } + + Profile prof =3D Profile.lookupById( + CobblerXMLRPCHelper.getConnection(this.getUser()), + this.getKickstartData().getCobblerId()); + if (prof !=3D null) { + prof.syncRedHatManagementKeys(keysToRemove, Collections.EMPTY_= SET); + } + prof.save(); } = /** = * Adds default regtokens from the kickstart profile. * @param ids The ids of the regtokens to add. */ - public void addTokensByIds(ArrayList ids) { - Iterator toAddIter =3D ids.iterator(); + public void addTokensByIds(ArrayList ids) { + Set keysToAdd =3D new HashSet(); = - while (toAddIter.hasNext()) { - Long id =3D (Long) toAddIter.next(); - = - this.getKickstartData().addDefaultRegToken(TokenFactory.lookup= ById(id)); + for (Long id : ids) { + Token token =3D TokenFactory.lookupById(id); + this.getKickstartData().addDefaultRegToken(token); + keysToAdd.add(ActivationKeyFactory.lookupByToken(token).getKey= ()); + } + Profile prof =3D Profile.lookupById( + CobblerXMLRPCHelper.getConnection(this.getUser()), + this.getKickstartData().getCobblerId()); + if (prof !=3D null) { + prof.syncRedHatManagementKeys(Collections.EMPTY_SET, keysToAdd= ); } + prof.save(); } = /** diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= SystemCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/c= obbler/CobblerSystemCreateCommand.java index 5eac930..504c3c2 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemC= reateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemC= reateCommand.java @@ -19,6 +19,8 @@ import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.server.NetworkInterface; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.token.ActivationKey; +import com.redhat.rhn.domain.token.ActivationKeyFactory; +import com.redhat.rhn.domain.token.Token; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.kickstart.KickstartUrlHelper; import com.redhat.rhn.manager.token.ActivationKeyManager; @@ -80,8 +82,10 @@ public class CobblerSystemCreateCommand extends CobblerC= ommand { * @param serverIn profile we want to create in cobbler * @param cobblerProfileName the name of the cobbler profile = * to associate with system + * @param ksData the kickstart data to associate the system with */ - public CobblerSystemCreateCommand(Server serverIn, String cobblerProfi= leName) { + public CobblerSystemCreateCommand(Server serverIn, String cobblerProfi= leName, + KickstartData = ksData) { super(serverIn.getCreator()); this.server =3D serverIn; this.mediaPath =3D null; @@ -90,7 +94,16 @@ public class CobblerSystemCreateCommand extends CobblerC= ommand { ActivationKey key =3D ActivationKeyManager.getInstance(). createNewReActivationKey(server.getCreator(), server, = note); log.debug("created reactivation key: " + key.getKey()); - this.activationKeys =3D key.getKey(); + String keys =3D key.getKey(); + if (ksData !=3D null) { + for (Token token : ksData.getDefaultRegTokens()) { + ActivationKey keyTmp =3D ActivationKeyFactory.lookupByToke= n(token); + if (keyTmp !=3D null) { + keys +=3D "," + keyTmp.getKey(); + } + } + } + this.activationKeys =3D keys; } = = diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= VirtualSystemCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/= cobbler/CobblerVirtualSystemCommand.java index b09908d..7c0d5d4 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtual= SystemCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtual= SystemCommand.java @@ -46,10 +46,12 @@ public class CobblerVirtualSystemCommand extends Cobble= rSystemCreateCommand { * @param serverIn to create in cobbler * @param cobblerProfileName to use * @param guestNameIn the guest name to create + * @param ksData the kickstart data to associate + * system with */ public CobblerVirtualSystemCommand(Server serverIn, - String cobblerProfileName, String guestNameIn) { - super(serverIn, cobblerProfileName); + String cobblerProfileName, String guestNameIn, KickstartData k= sData) { + super(serverIn, cobblerProfileName, ksData); guestName =3D guestNameIn; } = diff --git a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManage= r.java b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.ja= va index eccae41..4c23f0a 100644 --- a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java +++ b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java @@ -25,6 +25,7 @@ import com.redhat.rhn.common.validator.ValidatorResult; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelFactory; import com.redhat.rhn.domain.entitlement.Entitlement; +import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.KickstartSession; import com.redhat.rhn.domain.rhnpackage.PackageArch; import com.redhat.rhn.domain.rhnpackage.PackageName; @@ -39,17 +40,22 @@ import com.redhat.rhn.domain.token.ActivationKeyFactory; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.entitlement.EntitlementManager; +import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper; import com.redhat.rhn.manager.rhnpackage.PackageManager; import com.redhat.rhn.manager.system.SystemManager; = +import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; +import org.cobbler.Profile; import org.hibernate.Session; = import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Set; = /** * ActivationKeyManager @@ -128,26 +134,6 @@ public class ActivationKeyManager { return createNewReActivationKey(user, server, "", note, new Long(0= ), null, = false, null); } - - /** - * Create a new Re-ActivationKey object for a given user, server, and = note. = - * @param user The user creating the activation key - * @param server the server to create the key for - * @param key Key to use, empty string to have one auto-generated - * @param note A note about the activation key - * @param usageLimit Usage limit for the activation key - * @param baseChannel Base channel for the activation key - * @param universalDefault Whether or not this key should be set as th= e universal = - * default. - * @return Returns a newly created and filled out Activationkey - */ - public ActivationKey createNewReActivationKey(User user, Server server= , = - String key, String note, Long usageLimit, Channel baseChannel, = - boolean universalDefault) { - return createNewReActivationKey(user, server, key, note, usageLimi= t, baseChannel, = - universalDefault, null); - } - = = /** * Create a new Re-ActivationKey object for a given user, server, and = note. = @@ -393,8 +379,10 @@ public class ActivationKeyManager { * was generated implies that the user credentials have been = * verified... * @param key the key to remove + * @param user TODO */ - public void remove(ActivationKey key) { + public void remove(ActivationKey key, User user) { + changeCobblerProfileKey(key, key.getKey(), "", user); ActivationKeyFactory.removeKey(key); } = @@ -436,9 +424,11 @@ public class ActivationKeyManager { * and activation key after edit by prepending its org_id to it. * @param newKey the key to rename to = * @param key the key object to be renamed + * @param user TODO */ - public void changeKey(String newKey, ActivationKey key) { + public void changeKey(String newKey, ActivationKey key, User user) { newKey =3D newKey.trim(); + String oldKey =3D key.getKey(); if (!newKey.equals(key.getKey())) { ActivationKeyFactory.validateKeyName(newKey); WriteMode m =3D ModeFactory.getWriteMode("General_queries", = @@ -448,8 +438,38 @@ public class ActivationKeyManager { params.put("new_key", newKey); m.executeUpdate(params); = } + changeCobblerProfileKey(key, oldKey, newKey, user); + + } + + + /** + * helper method to change an activation keys' key. + * This loops through all associated kickstart profiles and makes + * the change in cobbler + */ + private static void changeCobblerProfileKey(ActivationKey key, String = oldKey, String newKey, + = User user) { + List kss =3D ActivationKeyFactory.listAssociatedKic= kstarts(key); + for (KickstartData ks : kss) { + if (ks.getCobblerId() !=3D null) { + Profile prof =3D Profile.lookupById(CobblerXMLRPCHelper.ge= tConnection(user), + ks.get= CobblerId()); + Set oldSet =3D new HashSet(); + if (!StringUtils.isEmpty(oldKey)) { + oldSet.add(oldKey); + } + Set newSet =3D new HashSet(); + if (!StringUtils.isEmpty(newKey)) { + newSet.add(newKey); + } + prof.syncRedHatManagementKeys(oldSet, newSet); + prof.save(); + } + } } = + /** * Subscribe an activation key to the first child channel * of its base channel that contains diff --git a/java/code/src/com/redhat/rhn/manager/token/test/ActivationKeyM= anagerTest.java b/java/code/src/com/redhat/rhn/manager/token/test/Activatio= nKeyManagerTest.java index b8871e1..140a30d 100644 --- a/java/code/src/com/redhat/rhn/manager/token/test/ActivationKeyManagerT= est.java +++ b/java/code/src/com/redhat/rhn/manager/token/test/ActivationKeyManagerT= est.java @@ -56,7 +56,7 @@ public class ActivationKeyManagerTest extends BaseTestCas= eWithUser { ActivationKey key =3D manager.createNewActivationKey(user, "Test"); ActivationKey temp =3D manager.lookupByKey(key.getKey(), user); assertNotNull(temp); - manager.remove(temp); + manager.remove(temp, user); try { temp =3D manager.lookupByKey(key.getKey(), user); String msg =3D "NUll lookup failed, because this object should= exist!"; @@ -197,7 +197,7 @@ public class ActivationKeyManagerTest extends BaseTestC= aseWithUser { = final ActivationKey key2 =3D manager.createNewReActivationKey(user= , server, keyName, note, usageLimit, = - baseChannel, true); + baseChannel, true, null); = = temp =3D (ActivationKey)reload(key2); diff --git a/java/code/src/org/cobbler/CobblerObject.java b/java/code/src/o= rg/cobbler/CobblerObject.java index 1dfb571..34566bf 100644 --- a/java/code/src/org/cobbler/CobblerObject.java +++ b/java/code/src/org/cobbler/CobblerObject.java @@ -15,12 +15,18 @@ = package org.cobbler; = +import com.redhat.rhn.common.util.StringUtil; + import org.apache.commons.lang.StringUtils; = +import java.util.Arrays; +import java.util.Collection; import java.util.Date; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; = = /** @@ -46,6 +52,8 @@ public abstract class CobblerObject { protected static final String MGMT_CLASSES =3D "mgmt_classes"; protected static final String TEMPLATE_FILES =3D "template_files"; protected static final String UID =3D "uid"; + protected static final String PROFILE =3D "profile"; + private static final String REDHAT_KEY =3D "redhat_management_key"; = protected String handle; protected Map dataMap =3D new HashMap(= ); @@ -63,21 +71,39 @@ public abstract class CobblerObject { */ protected static Map lookupDataMapById(CobblerConnecti= on client, = String id, String findMethod) { - if (id =3D=3D null) { + + List> objects =3D lookupDataMapsByCriteria(cli= ent, + UID, id, findM= ethod); + if (!objects.isEmpty()) { + return objects.get(0); + } + return null; + + } + + /** + * look up data maps by a certain criteria + * @param client the xmlrpc client + * @param critera (i.e. uid profile, etc..) + * @param value the value of the criteria + * @param findMethod the find method to use (find_system, find_profile) + * @return List of maps + */ + protected static List> lookupDataMapsByCriteria( + CobblerConnection client, String critera, String value, String= findMethod) { + if (value =3D=3D null) { return null; } = Map criteria =3D new HashMap(); - criteria.put(UID, id); + criteria.put(critera, value); List> objects =3D (List>) client.invokeTokenMethod(findMethod, crite= ria); - if (!objects.isEmpty()) { - return objects.get(0); - } - return null; + return objects; = } = + /** * Helper method used by all cobbler objects to = * return a Map of themselves by name. @@ -419,4 +445,51 @@ public abstract class CobblerObject { public String toString() { return "DataMap =3D " + dataMap; } + + /** + * @param key the red hat activation key + */ + public void setRedHatManagementKey(String key) { + modify(REDHAT_KEY, key); + } + + /** + * @param keys the red hat activation keys in a set + */ + public void setRedHatManagementKey(Set keys) { + modify(REDHAT_KEY, StringUtil.join(",", keys)); + } + + /** + * get the red hat management key + * @return returns the red hat key as a string + */ + public String getRedHatManagementKey() { + return (String) dataMap.get(REDHAT_KEY); + } + + /** + * get the redhate management key as a Set of keys + * @return returns the red hat key as a string + */ + public Set getRedHatManagementKeySet() { + String[] sets =3D ((String) dataMap.get(REDHAT_KEY)).split(","); + Set set =3D new HashSet(); + set.addAll(Arrays.asList(sets)); + return set; + } + + /** + * remove the specified keys from the key set and add the specified set + * @param keysToRemove list of tokens to remove + * @param keysToAdd list of tokens to add + */ + public void syncRedHatManagementKeys(Collection keysToRemove, + Collection keysToAdd) { + Set keySet =3D getRedHatManagementKeySet(); + keySet.removeAll(keysToRemove); + keySet.addAll(keysToAdd); + setRedHatManagementKey(keySet); + } + } diff --git a/java/code/src/org/cobbler/Profile.java b/java/code/src/org/cob= bler/Profile.java index 03c922d..232bb93 100644 --- a/java/code/src/org/cobbler/Profile.java +++ b/java/code/src/org/cobbler/Profile.java @@ -17,6 +17,7 @@ package org.cobbler; = import org.apache.log4j.Logger; = +import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -48,7 +49,7 @@ public class Profile extends CobblerObject { private static final String VIRT_FILE_SIZE =3D "virt_file_size"; private static final String VIRT_RAM =3D "virt_ram"; private static final String DISTRO =3D "distro"; = - private static final String REDHAT_KEY =3D "redhat_management_key"; + = private Profile(CobblerConnection clientIn) { client =3D clientIn; @@ -89,6 +90,9 @@ public class Profile extends CobblerObject { * @return the profile matching the given uid or null */ public static Profile lookupById(CobblerConnection client, String id) { + if (id =3D=3D null) { + return null; + } return handleLookup(client, lookupDataMapById(client, id, = "find_profile")); } @@ -377,21 +381,13 @@ public class Profile extends CobblerObject { setDistro(distroIn.getName()); } = - /** * @param name the Distr name */ public void setDistro(String name) { modify(DISTRO, name); } - = - /** - * @param key the red hat activation key - */ - public void setRedHatManagementKey(String key) { - modify(REDHAT_KEY, key); - } - = + /** * Generates the kickstart text and returns that * @return the generated kickstart text @@ -399,4 +395,19 @@ public class Profile extends CobblerObject { public String generateKickstart() { return (String)client.invokeTokenMethod("generate_kickstart", ge= tName()); } + + /** + * + * {@inheritDoc} + */ + public void syncRedHatManagementKeys(Collection keysToRemove, + Collection keysT= oAdd) { + super.syncRedHatManagementKeys(keysToRemove, keysToAdd); + for (SystemRecord record : + SystemRecord.listByAssociatedProfile(client, this.ge= tName())) { + record.syncRedHatManagementKeys(keysToRemove, keysToAdd); + record.save(); + } + } + } diff --git a/java/code/src/org/cobbler/SystemRecord.java b/java/code/src/or= g/cobbler/SystemRecord.java index 42130aa..b46279d 100644 --- a/java/code/src/org/cobbler/SystemRecord.java +++ b/java/code/src/org/cobbler/SystemRecord.java @@ -15,6 +15,7 @@ = package org.cobbler; = +import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -78,6 +79,25 @@ public class SystemRecord extends CobblerObject { return handleLookup(client, lookupDataMapById(client, id, "find_sy= stem")); } = = + /** + * List all SystemRecords associated with a particular profile + * @param client the xmlrpc client + * @param profileName the profile name (Cobbler profile name) + * @return the List of SystemRecords + */ + public static List listByAssociatedProfile(CobblerConnec= tion client, + String= profileName) { + List toReturn =3D new ArrayList(); + List> maps =3D lookupDataMapsByCriteria( + client, PROFILE, profileName, "find_system"); + + for (Map map : maps) { + toReturn.add(handleLookup(client, map)); + } + return toReturn; + } + + private static SystemRecord handleLookup(CobblerConnection client, Map= sysMap) { if (sysMap !=3D null) { SystemRecord sys =3D new SystemRecord(client); --===============3994898556858790685==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:23 2015 Content-Type: multipart/mixed; boundary="===============2122058819706282935==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Fri, 05 Jun 2009 19:23:15 +0000 Message-ID: <20090605192315.4DC591201BC@lists.fedorahosted.org> --===============2122058819706282935== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/util/StringUtil.java = | 3 = java/code/src/com/redhat/rhn/domain/token/ActivationKey.hbm.xml = | 8 = java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java = | 22 ++ java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyFactoryTest.ja= va | 44 +++++ java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java = | 2 = java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWi= zardAction.java | 6 = java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDeleteConf= irmAction.java | 2 = java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDetailsAct= ion.java | 4 = java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHa= ndler.java | 2 = java/code/src/com/redhat/rhn/manager/action/ActionManager.java = | 3 = java/code/src/com/redhat/rhn/manager/kickstart/KickstartActivationKeysComm= and.java | 52 ++++-- java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreate= Command.java | 17 +- java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtualSyste= mCommand.java | 6 = java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java = | 64 ++++--- java/code/src/com/redhat/rhn/manager/token/test/ActivationKeyManagerTest.j= ava | 4 = java/code/src/org/cobbler/CobblerObject.java = | 85 +++++++++- java/code/src/org/cobbler/Profile.java = | 31 ++- java/code/src/org/cobbler/SystemRecord.java = | 20 ++ 18 files changed, 305 insertions(+), 70 deletions(-) New commits: commit e79579ae022daf13dfb9012c9f264ba20633d997 Author: Justin Sherrill Date: Fri Jun 5 15:17:56 2009 -0400 504049 - adding functionality to keep the cobbler profile and system r= ecords redhat managemnet keys in line with whats set in the Kickstart Profi= le on satellite = this affects: 1. Clicking create cobbler system record 2. renaming an activation keys key 3. deleting an actiavtion key 4. adding or removing an activation key from a kickstart profile = syncing happens at the profile level, but trickles down to the systems = using that profile diff --git a/java/code/src/com/redhat/rhn/common/util/StringUtil.java b/jav= a/code/src/com/redhat/rhn/common/util/StringUtil.java index 9e13c73..f04a55c 100644 --- a/java/code/src/com/redhat/rhn/common/util/StringUtil.java +++ b/java/code/src/com/redhat/rhn/common/util/StringUtil.java @@ -25,6 +25,7 @@ import org.stringtree.json.JSONReader; import org.stringtree.json.JSONWriter; = import java.net.URLEncoder; +import java.util.Collection; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; @@ -351,7 +352,7 @@ public class StringUtil { * @param inputList The List of Strings to join * @return The joined String */ - public static String join(String separator, List inputList) { + public static String join(String separator, Collection inputList) { Iterator itty =3D inputList.iterator(); = return join(separator, itty); diff --git a/java/code/src/com/redhat/rhn/domain/token/ActivationKey.hbm.xm= l b/java/code/src/com/redhat/rhn/domain/token/ActivationKey.hbm.xml index 1d6665e..7247761 100644 --- a/java/code/src/com/redhat/rhn/domain/token/ActivationKey.hbm.xml +++ b/java/code/src/com/redhat/rhn/domain/token/ActivationKey.hbm.xml @@ -47,4 +47,12 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" = = + + + + + + + + diff --git a/java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory= .java b/java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java index d27055d..eb5e2f6 100644 --- a/java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java +++ b/java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java @@ -18,6 +18,7 @@ import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.common.util.MD5Crypt; import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.domain.channel.Channel; +import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.KickstartSession; import com.redhat.rhn.domain.org.OrgFactory; import com.redhat.rhn.domain.server.Server; @@ -29,8 +30,11 @@ import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; = + +import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.util.Map; = /** * ActivationKeyFactory @@ -113,12 +117,18 @@ public class ActivationKeyFactory extends HibernateFa= ctory { else { validateKeyName(key.trim()); } + keyToUse =3D ActivationKey.makePrefix(user.getOrg()) + keyToUse.tr= im(); = + if (server !=3D null) { + keyToUse =3D "re-" + keyToUse; + } + newKey.setKey(keyToUse); newKey.setCreator(user); newKey.setOrg(user.getOrg()); newKey.setServer(server); + if (StringUtils.isBlank(note)) { note =3D DEFAULT_DESCRIPTION; } @@ -247,5 +257,17 @@ public class ActivationKeyFactory extends HibernateFac= tory { = } = + /** + * List all kickstarts associated with an activation key + * @param key the key to look for associations with + * @return list of kickstartData objects + */ + public static List listAssociatedKickstarts(ActivationK= ey key) { + Map params =3D new HashMap(); + params.put("token", key.getToken()); + return singleton.listObjectsByNamedQuery("ActivationKey.listAssoci= atedKickstarts", + = params); + } + = } diff --git a/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyFa= ctoryTest.java b/java/code/src/com/redhat/rhn/domain/token/test/ActivationK= eyFactoryTest.java new file mode 100644 index 0000000..cc516f2 --- /dev/null +++ b/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyFactoryTe= st.java @@ -0,0 +1,44 @@ +/** + * Copyright (c) 2009 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.domain.token.test; + +import com.redhat.rhn.domain.kickstart.KickstartData; +import com.redhat.rhn.domain.kickstart.test.KickstartDataTest; +import com.redhat.rhn.domain.token.ActivationKey; +import com.redhat.rhn.domain.token.ActivationKeyFactory; +import com.redhat.rhn.testing.BaseTestCaseWithUser; + +import java.util.List; + + +public class ActivationKeyFactoryTest extends BaseTestCaseWithUser { + + + public void testListAssociatedKickstarts() throws Exception { + + ActivationKey key =3D ActivationKeyTest.createTestActivationKey(us= er); + + List list =3D ActivationKeyFactory.listAssociatedKi= ckstarts(key); + assertTrue(list.isEmpty()); + + KickstartData data =3D KickstartDataTest.createTestKickstartData(u= ser.getOrg()); + data.getDefaultRegTokens().add(key.getToken()); + + list =3D ActivationKeyFactory.listAssociatedKickstarts(key); + assertTrue(list.size() =3D=3D 1); + + } + +} diff --git a/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTe= st.java b/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.= java index 96eb85b..6307031 100644 --- a/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java +++ b/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java @@ -140,7 +140,7 @@ public class ActivationKeyTest extends BaseTestCaseWith= User { (user, keyName, "Cool Duplicate", null, null, false); assertEquals(ActivationKey.makePrefix(user.getOrg()) + keyName.tri= m(), k.getKey()); String newKey =3D keyName + " FOO "; - manager.changeKey(newKey , k); + manager.changeKey(newKey , k, user); assertNotNull(ActivationKey.makePrefix(user.getOrg()) + newKey.tri= m()); } = diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Schedul= eKickstartWizardAction.java b/java/code/src/com/redhat/rhn/frontend/action/= kickstart/ScheduleKickstartWizardAction.java index d20b310..d54004a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickst= artWizardAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickst= artWizardAction.java @@ -430,8 +430,12 @@ public class ScheduleKickstartWizardAction extends Rhn= WizardAction { log.debug("Creating cobbler system record"); org.cobbler.Profile profile =3D org.cobbler.Profile.lookupById( CobblerXMLRPCHelper.getConnection(user), cobblerId); + + KickstartData data =3D KickstartFactory.lookupKickstartDataByCobbl= erIdAndOrg( + user.getOrg(), profile.getUid()); + CobblerSystemCreateCommand cmd =3D new CobblerSystemCreateCommand(= server, - profile.getName()); + profile.getName(), data); cmd.store(); log.debug("cobbler system record created."); String[] args =3D new String[2]; diff --git a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationK= eyDeleteConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/t= oken/ActivationKeyDeleteConfirmAction.java index 39a2714..7b2411f 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDelet= eConfirmAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDelet= eConfirmAction.java @@ -45,7 +45,7 @@ public class ActivationKeyDeleteConfirmAction extends Rhn= Action { if (context.isSubmitted() && context.wasDispatched(DELETE_KEY)) { String [] params =3D {key.getNote()}; ActivationKeyManager manager =3D ActivationKeyManager.getInsta= nce(); - manager.remove(key); + manager.remove(key, context.getLoggedInUser()); getStrutsDelegate().saveMessage(DELETED_MESSAGE_KEY, params, r= equest); return mapping.findForward("success"); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationK= eyDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/token/A= ctivationKeyDetailsAction.java index 5f94b11..b29ba3c 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDetai= lsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDetai= lsAction.java @@ -218,10 +218,10 @@ public class ActivationKeyDetailsAction extends RhnAc= tion { if (StringUtils.isBlank(newKey)) { newKey =3D ActivationKeyFactory.generateKey(); = } - newKey =3D ActivationKey.makePrefix(key.getOrg()) + newKey; = + newKey =3D ActivationKey.makePrefix(key.getOrg()) + newKey; String enteredKey =3D form.getString(KEY); if (!enteredKey.equals(key.getKey()) && !newKey.equals(key.getKey(= ))) { - manager.changeKey(newKey, key); + manager.changeKey(newKey, key, user); if (!StringUtils.isBlank(enteredKey) && = !enteredKey.equals(key.getKey())) { addToMessage(msg, "activation-key.java.org_prefixed", = diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/Act= ivationKeyHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activ= ationkey/ActivationKeyHandler.java index f5d6cdf..484cc0c 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/Activation= KeyHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/Activation= KeyHandler.java @@ -258,7 +258,7 @@ public class ActivationKeyHandler extends BaseHandler { public int delete(String sessionKey, String key) { User user =3D getLoggedInUser(sessionKey); ActivationKey activationKey =3D lookupKey(key, user); - ActivationKeyManager.getInstance().remove(activationKey); + ActivationKeyManager.getInstance().remove(activationKey, user); return 1; } = = diff --git a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java= b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java index c8c3de5..8a89935 100644 --- a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java +++ b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java @@ -1466,7 +1466,8 @@ public class ActionManager extends BaseManager { Profile cProfile =3D Profile.lookupById(CobblerXMLRPCHelper.getCon= nection( pcmd.getUser()), pcmd.getKsdata().getCobblerId()); CobblerVirtualSystemCommand vcmd =3D new CobblerVirtualSystemComma= nd( - pcmd.getServer(), cProfile.getName(), pcmd.getGuestName()); + pcmd.getServer(), cProfile.getName(), pcmd.getGuestName(), + pcmd.getKsdata()); kad.setCobblerSystemName(vcmd.getCobblerSystemRecordName()); = kad.setKickstartHost(pcmd.getKickstartServerName()); diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartActiva= tionKeysCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/Kicks= tartActivationKeysCommand.java index e86f0bd..14cbb1e 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartActivationKey= sCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartActivationKey= sCommand.java @@ -14,13 +14,17 @@ */ package com.redhat.rhn.manager.kickstart; = +import com.redhat.rhn.domain.token.ActivationKeyFactory; import com.redhat.rhn.domain.token.Token; import com.redhat.rhn.domain.token.TokenFactory; import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper; + +import org.cobbler.Profile; = import java.util.ArrayList; import java.util.Collections; -import java.util.Iterator; +import java.util.HashSet; import java.util.Set; = /** @@ -42,36 +46,48 @@ public class KickstartActivationKeysCommand extends Bas= eKickstartCommand { * Removes default regtokens from the kickstart profile. * @param ids The ids of the regtokens to remove. */ - public void removeTokensByIds(ArrayList ids) { - Iterator toRemoveIter =3D ids.iterator(); - - while (toRemoveIter.hasNext()) { - Long id =3D (Long) toRemoveIter.next(); - - Iterator tokensIter =3D this.getKickstartData().getDefaultRegT= okens().iterator(); - - while (tokensIter.hasNext()) { - Token token =3D (Token) tokensIter.next(); + public void removeTokensByIds(ArrayList ids) { + Set keysToRemove =3D new HashSet(); = + for (Long id : ids) { + Set tokenSetCopy =3D new HashSet(); + tokenSetCopy.addAll(this.getKickstartData().getDefaultRegToken= s()); + for (Token token : tokenSetCopy) { if (token.getId() =3D=3D id) { - tokensIter.remove(); + this.getKickstartData().getDefaultRegTokens().remove(t= oken); + keysToRemove.add(ActivationKeyFactory.lookupByToken(to= ken).getKey()); } } } + + Profile prof =3D Profile.lookupById( + CobblerXMLRPCHelper.getConnection(this.getUser()), + this.getKickstartData().getCobblerId()); + if (prof !=3D null) { + prof.syncRedHatManagementKeys(keysToRemove, Collections.EMPTY_= SET); + } + prof.save(); } = /** = * Adds default regtokens from the kickstart profile. * @param ids The ids of the regtokens to add. */ - public void addTokensByIds(ArrayList ids) { - Iterator toAddIter =3D ids.iterator(); + public void addTokensByIds(ArrayList ids) { + Set keysToAdd =3D new HashSet(); = - while (toAddIter.hasNext()) { - Long id =3D (Long) toAddIter.next(); - = - this.getKickstartData().addDefaultRegToken(TokenFactory.lookup= ById(id)); + for (Long id : ids) { + Token token =3D TokenFactory.lookupById(id); + this.getKickstartData().addDefaultRegToken(token); + keysToAdd.add(ActivationKeyFactory.lookupByToken(token).getKey= ()); + } + Profile prof =3D Profile.lookupById( + CobblerXMLRPCHelper.getConnection(this.getUser()), + this.getKickstartData().getCobblerId()); + if (prof !=3D null) { + prof.syncRedHatManagementKeys(Collections.EMPTY_SET, keysToAdd= ); } + prof.save(); } = /** diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= SystemCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/c= obbler/CobblerSystemCreateCommand.java index 5eac930..504c3c2 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemC= reateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemC= reateCommand.java @@ -19,6 +19,8 @@ import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.server.NetworkInterface; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.token.ActivationKey; +import com.redhat.rhn.domain.token.ActivationKeyFactory; +import com.redhat.rhn.domain.token.Token; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.kickstart.KickstartUrlHelper; import com.redhat.rhn.manager.token.ActivationKeyManager; @@ -80,8 +82,10 @@ public class CobblerSystemCreateCommand extends CobblerC= ommand { * @param serverIn profile we want to create in cobbler * @param cobblerProfileName the name of the cobbler profile = * to associate with system + * @param ksData the kickstart data to associate the system with */ - public CobblerSystemCreateCommand(Server serverIn, String cobblerProfi= leName) { + public CobblerSystemCreateCommand(Server serverIn, String cobblerProfi= leName, + KickstartData = ksData) { super(serverIn.getCreator()); this.server =3D serverIn; this.mediaPath =3D null; @@ -90,7 +94,16 @@ public class CobblerSystemCreateCommand extends CobblerC= ommand { ActivationKey key =3D ActivationKeyManager.getInstance(). createNewReActivationKey(server.getCreator(), server, = note); log.debug("created reactivation key: " + key.getKey()); - this.activationKeys =3D key.getKey(); + String keys =3D key.getKey(); + if (ksData !=3D null) { + for (Token token : ksData.getDefaultRegTokens()) { + ActivationKey keyTmp =3D ActivationKeyFactory.lookupByToke= n(token); + if (keyTmp !=3D null) { + keys +=3D "," + keyTmp.getKey(); + } + } + } + this.activationKeys =3D keys; } = = diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= VirtualSystemCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/= cobbler/CobblerVirtualSystemCommand.java index b09908d..7c0d5d4 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtual= SystemCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtual= SystemCommand.java @@ -46,10 +46,12 @@ public class CobblerVirtualSystemCommand extends Cobble= rSystemCreateCommand { * @param serverIn to create in cobbler * @param cobblerProfileName to use * @param guestNameIn the guest name to create + * @param ksData the kickstart data to associate + * system with */ public CobblerVirtualSystemCommand(Server serverIn, - String cobblerProfileName, String guestNameIn) { - super(serverIn, cobblerProfileName); + String cobblerProfileName, String guestNameIn, KickstartData k= sData) { + super(serverIn, cobblerProfileName, ksData); guestName =3D guestNameIn; } = diff --git a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManage= r.java b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.ja= va index eccae41..4c23f0a 100644 --- a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java +++ b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java @@ -25,6 +25,7 @@ import com.redhat.rhn.common.validator.ValidatorResult; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelFactory; import com.redhat.rhn.domain.entitlement.Entitlement; +import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.KickstartSession; import com.redhat.rhn.domain.rhnpackage.PackageArch; import com.redhat.rhn.domain.rhnpackage.PackageName; @@ -39,17 +40,22 @@ import com.redhat.rhn.domain.token.ActivationKeyFactory; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.entitlement.EntitlementManager; +import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper; import com.redhat.rhn.manager.rhnpackage.PackageManager; import com.redhat.rhn.manager.system.SystemManager; = +import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; +import org.cobbler.Profile; import org.hibernate.Session; = import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Set; = /** * ActivationKeyManager @@ -128,26 +134,6 @@ public class ActivationKeyManager { return createNewReActivationKey(user, server, "", note, new Long(0= ), null, = false, null); } - - /** - * Create a new Re-ActivationKey object for a given user, server, and = note. = - * @param user The user creating the activation key - * @param server the server to create the key for - * @param key Key to use, empty string to have one auto-generated - * @param note A note about the activation key - * @param usageLimit Usage limit for the activation key - * @param baseChannel Base channel for the activation key - * @param universalDefault Whether or not this key should be set as th= e universal = - * default. - * @return Returns a newly created and filled out Activationkey - */ - public ActivationKey createNewReActivationKey(User user, Server server= , = - String key, String note, Long usageLimit, Channel baseChannel, = - boolean universalDefault) { - return createNewReActivationKey(user, server, key, note, usageLimi= t, baseChannel, = - universalDefault, null); - } - = = /** * Create a new Re-ActivationKey object for a given user, server, and = note. = @@ -393,8 +379,10 @@ public class ActivationKeyManager { * was generated implies that the user credentials have been = * verified... * @param key the key to remove + * @param user TODO */ - public void remove(ActivationKey key) { + public void remove(ActivationKey key, User user) { + changeCobblerProfileKey(key, key.getKey(), "", user); ActivationKeyFactory.removeKey(key); } = @@ -436,9 +424,11 @@ public class ActivationKeyManager { * and activation key after edit by prepending its org_id to it. * @param newKey the key to rename to = * @param key the key object to be renamed + * @param user TODO */ - public void changeKey(String newKey, ActivationKey key) { + public void changeKey(String newKey, ActivationKey key, User user) { newKey =3D newKey.trim(); + String oldKey =3D key.getKey(); if (!newKey.equals(key.getKey())) { ActivationKeyFactory.validateKeyName(newKey); WriteMode m =3D ModeFactory.getWriteMode("General_queries", = @@ -448,8 +438,38 @@ public class ActivationKeyManager { params.put("new_key", newKey); m.executeUpdate(params); = } + changeCobblerProfileKey(key, oldKey, newKey, user); + + } + + + /** + * helper method to change an activation keys' key. + * This loops through all associated kickstart profiles and makes + * the change in cobbler + */ + private static void changeCobblerProfileKey(ActivationKey key, String = oldKey, String newKey, + = User user) { + List kss =3D ActivationKeyFactory.listAssociatedKic= kstarts(key); + for (KickstartData ks : kss) { + if (ks.getCobblerId() !=3D null) { + Profile prof =3D Profile.lookupById(CobblerXMLRPCHelper.ge= tConnection(user), + ks.get= CobblerId()); + Set oldSet =3D new HashSet(); + if (!StringUtils.isEmpty(oldKey)) { + oldSet.add(oldKey); + } + Set newSet =3D new HashSet(); + if (!StringUtils.isEmpty(newKey)) { + newSet.add(newKey); + } + prof.syncRedHatManagementKeys(oldSet, newSet); + prof.save(); + } + } } = + /** * Subscribe an activation key to the first child channel * of its base channel that contains diff --git a/java/code/src/com/redhat/rhn/manager/token/test/ActivationKeyM= anagerTest.java b/java/code/src/com/redhat/rhn/manager/token/test/Activatio= nKeyManagerTest.java index b8871e1..140a30d 100644 --- a/java/code/src/com/redhat/rhn/manager/token/test/ActivationKeyManagerT= est.java +++ b/java/code/src/com/redhat/rhn/manager/token/test/ActivationKeyManagerT= est.java @@ -56,7 +56,7 @@ public class ActivationKeyManagerTest extends BaseTestCas= eWithUser { ActivationKey key =3D manager.createNewActivationKey(user, "Test"); ActivationKey temp =3D manager.lookupByKey(key.getKey(), user); assertNotNull(temp); - manager.remove(temp); + manager.remove(temp, user); try { temp =3D manager.lookupByKey(key.getKey(), user); String msg =3D "NUll lookup failed, because this object should= exist!"; @@ -197,7 +197,7 @@ public class ActivationKeyManagerTest extends BaseTestC= aseWithUser { = final ActivationKey key2 =3D manager.createNewReActivationKey(user= , server, keyName, note, usageLimit, = - baseChannel, true); + baseChannel, true, null); = = temp =3D (ActivationKey)reload(key2); diff --git a/java/code/src/org/cobbler/CobblerObject.java b/java/code/src/o= rg/cobbler/CobblerObject.java index 1dfb571..34566bf 100644 --- a/java/code/src/org/cobbler/CobblerObject.java +++ b/java/code/src/org/cobbler/CobblerObject.java @@ -15,12 +15,18 @@ = package org.cobbler; = +import com.redhat.rhn.common.util.StringUtil; + import org.apache.commons.lang.StringUtils; = +import java.util.Arrays; +import java.util.Collection; import java.util.Date; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; = = /** @@ -46,6 +52,8 @@ public abstract class CobblerObject { protected static final String MGMT_CLASSES =3D "mgmt_classes"; protected static final String TEMPLATE_FILES =3D "template_files"; protected static final String UID =3D "uid"; + protected static final String PROFILE =3D "profile"; + private static final String REDHAT_KEY =3D "redhat_management_key"; = protected String handle; protected Map dataMap =3D new HashMap(= ); @@ -63,21 +71,39 @@ public abstract class CobblerObject { */ protected static Map lookupDataMapById(CobblerConnecti= on client, = String id, String findMethod) { - if (id =3D=3D null) { + + List> objects =3D lookupDataMapsByCriteria(cli= ent, + UID, id, findM= ethod); + if (!objects.isEmpty()) { + return objects.get(0); + } + return null; + + } + + /** + * look up data maps by a certain criteria + * @param client the xmlrpc client + * @param critera (i.e. uid profile, etc..) + * @param value the value of the criteria + * @param findMethod the find method to use (find_system, find_profile) + * @return List of maps + */ + protected static List> lookupDataMapsByCriteria( + CobblerConnection client, String critera, String value, String= findMethod) { + if (value =3D=3D null) { return null; } = Map criteria =3D new HashMap(); - criteria.put(UID, id); + criteria.put(critera, value); List> objects =3D (List>) client.invokeTokenMethod(findMethod, crite= ria); - if (!objects.isEmpty()) { - return objects.get(0); - } - return null; + return objects; = } = + /** * Helper method used by all cobbler objects to = * return a Map of themselves by name. @@ -419,4 +445,51 @@ public abstract class CobblerObject { public String toString() { return "DataMap =3D " + dataMap; } + + /** + * @param key the red hat activation key + */ + public void setRedHatManagementKey(String key) { + modify(REDHAT_KEY, key); + } + + /** + * @param keys the red hat activation keys in a set + */ + public void setRedHatManagementKey(Set keys) { + modify(REDHAT_KEY, StringUtil.join(",", keys)); + } + + /** + * get the red hat management key + * @return returns the red hat key as a string + */ + public String getRedHatManagementKey() { + return (String) dataMap.get(REDHAT_KEY); + } + + /** + * get the redhate management key as a Set of keys + * @return returns the red hat key as a string + */ + public Set getRedHatManagementKeySet() { + String[] sets =3D ((String) dataMap.get(REDHAT_KEY)).split(","); + Set set =3D new HashSet(); + set.addAll(Arrays.asList(sets)); + return set; + } + + /** + * remove the specified keys from the key set and add the specified set + * @param keysToRemove list of tokens to remove + * @param keysToAdd list of tokens to add + */ + public void syncRedHatManagementKeys(Collection keysToRemove, + Collection keysToAdd) { + Set keySet =3D getRedHatManagementKeySet(); + keySet.removeAll(keysToRemove); + keySet.addAll(keysToAdd); + setRedHatManagementKey(keySet); + } + } diff --git a/java/code/src/org/cobbler/Profile.java b/java/code/src/org/cob= bler/Profile.java index 03c922d..232bb93 100644 --- a/java/code/src/org/cobbler/Profile.java +++ b/java/code/src/org/cobbler/Profile.java @@ -17,6 +17,7 @@ package org.cobbler; = import org.apache.log4j.Logger; = +import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -48,7 +49,7 @@ public class Profile extends CobblerObject { private static final String VIRT_FILE_SIZE =3D "virt_file_size"; private static final String VIRT_RAM =3D "virt_ram"; private static final String DISTRO =3D "distro"; = - private static final String REDHAT_KEY =3D "redhat_management_key"; + = private Profile(CobblerConnection clientIn) { client =3D clientIn; @@ -89,6 +90,9 @@ public class Profile extends CobblerObject { * @return the profile matching the given uid or null */ public static Profile lookupById(CobblerConnection client, String id) { + if (id =3D=3D null) { + return null; + } return handleLookup(client, lookupDataMapById(client, id, = "find_profile")); } @@ -377,21 +381,13 @@ public class Profile extends CobblerObject { setDistro(distroIn.getName()); } = - /** * @param name the Distr name */ public void setDistro(String name) { modify(DISTRO, name); } - = - /** - * @param key the red hat activation key - */ - public void setRedHatManagementKey(String key) { - modify(REDHAT_KEY, key); - } - = + /** * Generates the kickstart text and returns that * @return the generated kickstart text @@ -399,4 +395,19 @@ public class Profile extends CobblerObject { public String generateKickstart() { return (String)client.invokeTokenMethod("generate_kickstart", ge= tName()); } + + /** + * + * {@inheritDoc} + */ + public void syncRedHatManagementKeys(Collection keysToRemove, + Collection keysT= oAdd) { + super.syncRedHatManagementKeys(keysToRemove, keysToAdd); + for (SystemRecord record : + SystemRecord.listByAssociatedProfile(client, this.ge= tName())) { + record.syncRedHatManagementKeys(keysToRemove, keysToAdd); + record.save(); + } + } + } diff --git a/java/code/src/org/cobbler/SystemRecord.java b/java/code/src/or= g/cobbler/SystemRecord.java index 42130aa..b46279d 100644 --- a/java/code/src/org/cobbler/SystemRecord.java +++ b/java/code/src/org/cobbler/SystemRecord.java @@ -15,6 +15,7 @@ = package org.cobbler; = +import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -78,6 +79,25 @@ public class SystemRecord extends CobblerObject { return handleLookup(client, lookupDataMapById(client, id, "find_sy= stem")); } = = + /** + * List all SystemRecords associated with a particular profile + * @param client the xmlrpc client + * @param profileName the profile name (Cobbler profile name) + * @return the List of SystemRecords + */ + public static List listByAssociatedProfile(CobblerConnec= tion client, + String= profileName) { + List toReturn =3D new ArrayList(); + List> maps =3D lookupDataMapsByCriteria( + client, PROFILE, profileName, "find_system"); + + for (Map map : maps) { + toReturn.add(handleLookup(client, map)); + } + return toReturn; + } + + private static SystemRecord handleLookup(CobblerConnection client, Map= sysMap) { if (sysMap !=3D null) { SystemRecord sys =3D new SystemRecord(client); --===============2122058819706282935==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:23 2015 Content-Type: multipart/mixed; boundary="===============2128622335453424075==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: client/rhel Date: Fri, 05 Jun 2009 19:51:22 +0000 Message-ID: <20090605195122.971A21201BC@lists.fedorahosted.org> --===============2128622335453424075== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/rhel/rhn-client-tools/etc-conf/up2date.config | 2 -- client/rhel/rhn-client-tools/rhn-client-tools.spec | 3 +++ client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 6d456ff12f92fc00a10487779b9e0708aea41d46 Author: Pradeep Kilambi Date: Fri Jun 5 15:51:13 2009 -0400 504296 - removing debug statements from hardware probing - Also cleaning the config option used for debugging purposes diff --git a/client/rhel/rhn-client-tools/etc-conf/up2date.config b/client/= rhel/rhn-client-tools/etc-conf/up2date.config index d6746fc..586d0d1 100644 --- a/client/rhel/rhn-client-tools/etc-conf/up2date.config +++ b/client/rhel/rhn-client-tools/etc-conf/up2date.config @@ -43,5 +43,3 @@ skipNetwork=3D0 tmpDir[comment]=3DUse this Directory to place the temporary transport files tmpDir=3D/tmp = -supportsSMBIOS[comment]=3DSupports probing smbios info during registration -supportsSMBIOS=3D1 diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rh= el/rhn-client-tools/rhn-client-tools.spec index 8c1c245..53f9279 100644 --- a/client/rhel/rhn-client-tools/rhn-client-tools.spec +++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec @@ -204,6 +204,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/rhn_register.desktop = %changelog +* Fri Jun 5 2009 Pradeep Kilambi +- Resolves: #504296 + = * Thu May 21 2009 jesus m. rodriguez 0.4.27-1 - new build (pkilambi(a)redhat.com) - 501316 - chnaging the network switch to always send network info by defa= ult diff --git a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py b/= client/rhel/rhn-client-tools/src/up2date_client/hardware.py index 8d8f8e4..acc2746 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py @@ -936,7 +936,6 @@ def Hardware(): cfg =3D config.initUp2dateConfig() if not cfg["skipNetwork"]: # minimal networking info - print "Network Info::" try: ret =3D read_network() if ret: = --===============2128622335453424075==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:23 2015 Content-Type: multipart/mixed; boundary="===============5079428119915409540==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 2 commits - client/tools rel-eng/packages Date: Fri, 05 Jun 2009 21:29:15 +0000 Message-ID: <20090605212915.566DC1201BC@lists.fedorahosted.org> --===============5079428119915409540== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/rhncustominfo/rhncustominfo.spec | 6 +++++- rel-eng/packages/rhn-custom-info | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 54116032f9c9024c435368bf580b1056209c0e29 Author: Brad Buckingham Date: Fri Jun 5 17:27:08 2009 -0400 Automatic commit of package [rhn-custom-info] release [5.3.0-1]. diff --git a/client/tools/rhncustominfo/rhncustominfo.spec b/client/tools/r= hncustominfo/rhncustominfo.spec index e063889..5c43d3d 100644 --- a/client/tools/rhncustominfo/rhncustominfo.spec +++ b/client/tools/rhncustominfo/rhncustominfo.spec @@ -43,6 +43,10 @@ rm -rf $RPM_BUILD_ROOT = # $Id$ %changelog +* Fri Jun 05 2009 Brad Buckingham 5.3.0-1 +- Bump version to 5.3.0 (bbuckingham(a)redhat.com) +- update copyright and licenses (jesusr(a)redhat.com) + * Thu Feb 19 2009 Pradeep Kilambi 0.4.5-1 - 485459 - constructed url should now point to right handler = diff --git a/rel-eng/packages/rhn-custom-info b/rel-eng/packages/rhn-custom= -info index d12ab8b..e6de495 100644 --- a/rel-eng/packages/rhn-custom-info +++ b/rel-eng/packages/rhn-custom-info @@ -1 +1 @@ -0.4.5-1 client/tools/rhncustominfo/ +5.3.0-1 client/tools/rhncustominfo/ commit 361ecbb1151f696597fc4d9b2e33d2c8f65941cf Author: Brad Buckingham Date: Fri Jun 5 17:18:11 2009 -0400 Bump version to 5.3.0 diff --git a/client/tools/rhncustominfo/rhncustominfo.spec b/client/tools/r= hncustominfo/rhncustominfo.spec index 588017b..e063889 100644 --- a/client/tools/rhncustominfo/rhncustominfo.spec +++ b/client/tools/rhncustominfo/rhncustominfo.spec @@ -3,7 +3,7 @@ Summary: set and list custom values for RHN-enabled machines Group: RHN/Client License: GPLv2 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz -Version: 0.4.5 +Version: 5.3.0 Release: 1%{?dist} BuildRoot: /var/tmp/%{name}-%{version}-root BuildArch: noarch --===============5079428119915409540==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:23 2015 Content-Type: multipart/mixed; boundary="===============0446133649742182230==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/rhn-custom-info-5.3.0-1' Date: Fri, 05 Jun 2009 21:29:35 +0000 Message-ID: <20090605212935.AE5C61201BC@lists.fedorahosted.org> --===============0446133649742182230== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'rhn-custom-info-5.3.0-1' created by Brad Buckingham at 2009-06-05 21:27 +0000 Tagging package [rhn-custom-info] version [5.3.0-1] in directory [client/to= ols/rhncustominfo/]. Changes since rhn-virtualization-0.5.2-1-336: --- 0 files changed --- --===============0446133649742182230==-- From jortel at fedoraproject.org Thu Aug 20 11:57:23 2015 Content-Type: multipart/mixed; boundary="===============5980980651922096699==" MIME-Version: 1.0 From: Jeff Ortel To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'pgsql' - schema/spacewalk Date: Fri, 05 Jun 2009 22:16:04 +0000 Message-ID: <20090605221604.6EE741201BC@lists.fedorahosted.org> --===============5980980651922096699== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable schema/spacewalk/common/tables/rhnReleaseChannelMap.sql | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit c7eaf613ac04db05d0172731412c243c73f9e551 Author: Jeff Ortel Date: Fri Jun 5 17:04:21 2009 -0500 Fix incomplete merge conflict resolution. diff --git a/schema/spacewalk/common/tables/rhnReleaseChannelMap.sql b/sche= ma/spacewalk/common/tables/rhnReleaseChannelMap.sql index b2086fb..4ec5062 100644 --- a/schema/spacewalk/common/tables/rhnReleaseChannelMap.sql +++ b/schema/spacewalk/common/tables/rhnReleaseChannelMap.sql @@ -22,10 +22,8 @@ CREATE TABLE rhnReleaseChannelMap channel_arch_id NUMBER NOT NULL, = channel_id NUMBER NOT NULL, = = - CONSTRAINT rhn_rcm_default_ck - CHECK (is_default in ( 'Y' , 'N' )), CONSTRAINT rhn_rcm_pva_def_uniq - UNIQUE (product, version, channel_arch_id, is_default) + UNIQUE (product, version, channel_arch_id) ) ENABLE ROW MOVEMENT ; --===============5980980651922096699==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:23 2015 Content-Type: multipart/mixed; boundary="===============0180144952292217252==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: search-server/src Date: Fri, 05 Jun 2009 23:07:57 +0000 Message-ID: <20090605230757.9B4D71201BC@lists.fedorahosted.org> --===============0180144952292217252== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable search-server/src/java/com/redhat/satellite/search/index/DocResult.java = | 19 ---- search-server/src/java/com/redhat/satellite/search/index/IndexManager.java= | 46 +++++----- 2 files changed, 25 insertions(+), 40 deletions(-) New commits: commit 0612fe5955a0ce98f221054979463362e70c13be Author: John Matthews Date: Fri Jun 5 18:59:48 2009 -0400 DocumentationSearch fixing returned links so they are relative and upda= te for segment dir Segments dir needed to be changed to match new dir locations of latest = satellite-doc-indexes Additionally our logic broke for dropping the absolute portion of the U= RL, so we were displaying absolute links to file://... diff --git a/search-server/src/java/com/redhat/satellite/search/index/DocRe= sult.java b/search-server/src/java/com/redhat/satellite/search/index/DocRes= ult.java index d5309db..2e686e7 100644 --- a/search-server/src/java/com/redhat/satellite/search/index/DocResult.ja= va +++ b/search-server/src/java/com/redhat/satellite/search/index/DocResult.ja= va @@ -72,26 +72,11 @@ public class DocResult extends Result { if (urlIn.startsWith("file:")) { // Translate file:// to a usable URL String prefix =3D "/rhn/help"; - String patternA =3D "docs/guides"; - String patternB =3D "docs/release-notes"; - int index =3D urlIn.indexOf(patternA); + int index =3D urlIn.indexOf(prefix); if (index > 0) { - // For case of "..../docs/guides/..." remove the doc/guides - // only keep the end portion of the URL - String end =3D urlIn.substring(index + patternA.length()); - urlIn =3D prefix + end; - } - else { - // For case of ".../docs/release-notes" we will keep the - //"release-notes" path in the URL - index =3D urlIn.indexOf(patternB); - if (index > 0) { - String end =3D urlIn.substring(index + "docs".length()= ); - urlIn =3D prefix + end; - } + urlIn =3D urlIn.substring(index); } } - = this.url =3D urlIn; } = diff --git a/search-server/src/java/com/redhat/satellite/search/index/Index= Manager.java b/search-server/src/java/com/redhat/satellite/search/index/Ind= exManager.java index 83b9724..23e4f5a 100644 --- a/search-server/src/java/com/redhat/satellite/search/index/IndexManager= .java +++ b/search-server/src/java/com/redhat/satellite/search/index/IndexManager= .java @@ -806,32 +806,32 @@ public class IndexManager { } = private void initDocLocaleLookup() { - docLocaleLookUp.put("bn_IN", "bn"); - docLocaleLookUp.put("de", "de"); - docLocaleLookUp.put("en_US", "en"); - docLocaleLookUp.put("es", "es"); - docLocaleLookUp.put("fr", "fr"); - docLocaleLookUp.put("gu", "gu"); - docLocaleLookUp.put("hi", "hi"); - docLocaleLookUp.put("it", "it"); - docLocaleLookUp.put("ja", "ja"); - docLocaleLookUp.put("ko", "ko"); - docLocaleLookUp.put("pa", "pa"); - docLocaleLookUp.put("pt_BR", "pt_br"); - docLocaleLookUp.put("ru", "ru"); - docLocaleLookUp.put("ta", "ta"); - docLocaleLookUp.put("zh_CN", "zh_cn"); - docLocaleLookUp.put("zh_TW", "zh_tw"); + docLocaleLookUp.put("bn_IN", "bn-IN"); + docLocaleLookUp.put("de", "de-DE"); + docLocaleLookUp.put("en_US", "en-US"); + docLocaleLookUp.put("es", "es-ES"); + docLocaleLookUp.put("fr", "fr-FR"); + docLocaleLookUp.put("gu", "gu-IN"); + docLocaleLookUp.put("hi", "hi-IN"); + docLocaleLookUp.put("it", "it-IT"); + docLocaleLookUp.put("ja", "ja-JP"); + docLocaleLookUp.put("ko", "ko-KR"); + docLocaleLookUp.put("pa", "pa-IN"); + docLocaleLookUp.put("pt_BR", "pt-BR"); + docLocaleLookUp.put("ru", "ru-RU"); + docLocaleLookUp.put("ta", "ta-IN"); + docLocaleLookUp.put("zh_CN", "zh-CN"); + docLocaleLookUp.put("zh_TW", "zh-TW"); // Below exist in docs, but weren't available as a doc option from // satellite webui and they weren't available Locales on my machine // guessing at what they will look at. - docLocaleLookUp.put("as", "as"); - docLocaleLookUp.put("ml", "ml"); - docLocaleLookUp.put("mr", "mr"); - docLocaleLookUp.put("or", "or"); - docLocaleLookUp.put("kn", "kn"); - docLocaleLookUp.put("si_lk", "si_lk"); - docLocaleLookUp.put("te", "te"); + docLocaleLookUp.put("as", "as-IN"); + docLocaleLookUp.put("ml", "ml-IN"); + docLocaleLookUp.put("mr", "mr-IN"); + docLocaleLookUp.put("or", "or-IN"); + docLocaleLookUp.put("kn", "kn-IN"); + docLocaleLookUp.put("si_lk", "si-LK"); + docLocaleLookUp.put("te", "te-IN"); } = } --===============0180144952292217252==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:23 2015 Content-Type: multipart/mixed; boundary="===============8397537048624757007==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - search-server/src Date: Fri, 05 Jun 2009 23:08:51 +0000 Message-ID: <20090605230851.6B9A91201BC@lists.fedorahosted.org> --===============8397537048624757007== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable search-server/src/java/com/redhat/satellite/search/index/DocResult.java = | 19 ---- search-server/src/java/com/redhat/satellite/search/index/IndexManager.java= | 46 +++++----- 2 files changed, 25 insertions(+), 40 deletions(-) New commits: commit 4ddfd4cbe63db0d5d11ab0066dfaaf9533577e79 Author: John Matthews Date: Fri Jun 5 18:59:48 2009 -0400 DocumentationSearch fixing returned links so they are relative and upda= te for segment dir Segments dir needed to be changed to match new dir locations of latest = satellite-doc-indexes Additionally our logic broke for dropping the absolute portion of the U= RL, so we were displaying absolute links to file://... diff --git a/search-server/src/java/com/redhat/satellite/search/index/DocRe= sult.java b/search-server/src/java/com/redhat/satellite/search/index/DocRes= ult.java index d5309db..2e686e7 100644 --- a/search-server/src/java/com/redhat/satellite/search/index/DocResult.ja= va +++ b/search-server/src/java/com/redhat/satellite/search/index/DocResult.ja= va @@ -72,26 +72,11 @@ public class DocResult extends Result { if (urlIn.startsWith("file:")) { // Translate file:// to a usable URL String prefix =3D "/rhn/help"; - String patternA =3D "docs/guides"; - String patternB =3D "docs/release-notes"; - int index =3D urlIn.indexOf(patternA); + int index =3D urlIn.indexOf(prefix); if (index > 0) { - // For case of "..../docs/guides/..." remove the doc/guides - // only keep the end portion of the URL - String end =3D urlIn.substring(index + patternA.length()); - urlIn =3D prefix + end; - } - else { - // For case of ".../docs/release-notes" we will keep the - //"release-notes" path in the URL - index =3D urlIn.indexOf(patternB); - if (index > 0) { - String end =3D urlIn.substring(index + "docs".length()= ); - urlIn =3D prefix + end; - } + urlIn =3D urlIn.substring(index); } } - = this.url =3D urlIn; } = diff --git a/search-server/src/java/com/redhat/satellite/search/index/Index= Manager.java b/search-server/src/java/com/redhat/satellite/search/index/Ind= exManager.java index 83b9724..23e4f5a 100644 --- a/search-server/src/java/com/redhat/satellite/search/index/IndexManager= .java +++ b/search-server/src/java/com/redhat/satellite/search/index/IndexManager= .java @@ -806,32 +806,32 @@ public class IndexManager { } = private void initDocLocaleLookup() { - docLocaleLookUp.put("bn_IN", "bn"); - docLocaleLookUp.put("de", "de"); - docLocaleLookUp.put("en_US", "en"); - docLocaleLookUp.put("es", "es"); - docLocaleLookUp.put("fr", "fr"); - docLocaleLookUp.put("gu", "gu"); - docLocaleLookUp.put("hi", "hi"); - docLocaleLookUp.put("it", "it"); - docLocaleLookUp.put("ja", "ja"); - docLocaleLookUp.put("ko", "ko"); - docLocaleLookUp.put("pa", "pa"); - docLocaleLookUp.put("pt_BR", "pt_br"); - docLocaleLookUp.put("ru", "ru"); - docLocaleLookUp.put("ta", "ta"); - docLocaleLookUp.put("zh_CN", "zh_cn"); - docLocaleLookUp.put("zh_TW", "zh_tw"); + docLocaleLookUp.put("bn_IN", "bn-IN"); + docLocaleLookUp.put("de", "de-DE"); + docLocaleLookUp.put("en_US", "en-US"); + docLocaleLookUp.put("es", "es-ES"); + docLocaleLookUp.put("fr", "fr-FR"); + docLocaleLookUp.put("gu", "gu-IN"); + docLocaleLookUp.put("hi", "hi-IN"); + docLocaleLookUp.put("it", "it-IT"); + docLocaleLookUp.put("ja", "ja-JP"); + docLocaleLookUp.put("ko", "ko-KR"); + docLocaleLookUp.put("pa", "pa-IN"); + docLocaleLookUp.put("pt_BR", "pt-BR"); + docLocaleLookUp.put("ru", "ru-RU"); + docLocaleLookUp.put("ta", "ta-IN"); + docLocaleLookUp.put("zh_CN", "zh-CN"); + docLocaleLookUp.put("zh_TW", "zh-TW"); // Below exist in docs, but weren't available as a doc option from // satellite webui and they weren't available Locales on my machine // guessing at what they will look at. - docLocaleLookUp.put("as", "as"); - docLocaleLookUp.put("ml", "ml"); - docLocaleLookUp.put("mr", "mr"); - docLocaleLookUp.put("or", "or"); - docLocaleLookUp.put("kn", "kn"); - docLocaleLookUp.put("si_lk", "si_lk"); - docLocaleLookUp.put("te", "te"); + docLocaleLookUp.put("as", "as-IN"); + docLocaleLookUp.put("ml", "ml-IN"); + docLocaleLookUp.put("mr", "mr-IN"); + docLocaleLookUp.put("or", "or-IN"); + docLocaleLookUp.put("kn", "kn-IN"); + docLocaleLookUp.put("si_lk", "si-LK"); + docLocaleLookUp.put("te", "te-IN"); } = } --===============8397537048624757007==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:23 2015 Content-Type: multipart/mixed; boundary="===============0377637672521028001==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - backend/server Date: Sat, 06 Jun 2009 14:12:41 +0000 Message-ID: <20090606141241.D78ED120272@lists.fedorahosted.org> --===============0377637672521028001== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/rhnServer/server_kickstart.py | 5 +++++ 1 file changed, 5 insertions(+) New commits: commit 3e4373282bc6afdcfb5264a86014c6d9c0678c83 Author: Devan Goodwin Date: Sat Jun 6 11:04:36 2009 -0300 503090 - Exclude rhnlib from kickstart profile sync. = Latest version of rhnlib is hacked into place with wget and rpm -Uvh in kickstart post script, so we will always have the latest version anyhow. It appears that this can cause the database to not know rhnlib is installed, and on RHEL 4 when the package sync is run it attempts to install rhnlib fresh causing an error. (as it's already installed) diff --git a/backend/server/rhnServer/server_kickstart.py b/backend/server/= rhnServer/server_kickstart.py index 3011062..9e81975 100644 --- a/backend/server/rhnServer/server_kickstart.py +++ b/backend/server/rhnServer/server_kickstart.py @@ -665,6 +665,10 @@ def terminate_kickstart_sessions(server_id): = # Fetches the package profile from the kickstart session def get_kisckstart_session_package_profile(kickstart_session_id): + # NOTE: We're filtering out rhnlib in this query as it's manually + # upgraded anyhow in kickstart post scripts, and it appears the + # database might not yet know it's there when we attempt to + # sync with the package profile. h =3D rhnSQL.prepare(""" select pn.name, pe.version, pe.release, pe.epoch, pa.label from rhnKickstartSession ks, @@ -677,6 +681,7 @@ def get_kisckstart_session_package_profile(kickstart_se= ssion_id): and spp.name_id =3D pn.id and spp.evr_id =3D pe.id and spp.package_arch_id =3D pa.id + and pn.name !=3D 'rhnlib' """) h.execute(kickstart_session_id=3Dkickstart_session_id) return _packages_from_cursor(h) --===============0377637672521028001==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:23 2015 Content-Type: multipart/mixed; boundary="===============8406653289399614262==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: backend/server Date: Sat, 06 Jun 2009 14:12:54 +0000 Message-ID: <20090606141254.94239120272@lists.fedorahosted.org> --===============8406653289399614262== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/rhnServer/server_kickstart.py | 5 +++++ 1 file changed, 5 insertions(+) New commits: commit ef545fff7d64e1e469e7808eb050a0aa832d81e2 Author: Devan Goodwin Date: Sat Jun 6 11:04:36 2009 -0300 503090 - Exclude rhnlib from kickstart profile sync. = Latest version of rhnlib is hacked into place with wget and rpm -Uvh in kickstart post script, so we will always have the latest version anyhow. It appears that this can cause the database to not know rhnlib is installed, and on RHEL 4 when the package sync is run it attempts to install rhnlib fresh causing an error. (as it's already installed) diff --git a/backend/server/rhnServer/server_kickstart.py b/backend/server/= rhnServer/server_kickstart.py index 3011062..9e81975 100644 --- a/backend/server/rhnServer/server_kickstart.py +++ b/backend/server/rhnServer/server_kickstart.py @@ -665,6 +665,10 @@ def terminate_kickstart_sessions(server_id): = # Fetches the package profile from the kickstart session def get_kisckstart_session_package_profile(kickstart_session_id): + # NOTE: We're filtering out rhnlib in this query as it's manually + # upgraded anyhow in kickstart post scripts, and it appears the + # database might not yet know it's there when we attempt to + # sync with the package profile. h =3D rhnSQL.prepare(""" select pn.name, pe.version, pe.release, pe.epoch, pa.label from rhnKickstartSession ks, @@ -677,6 +681,7 @@ def get_kisckstart_session_package_profile(kickstart_se= ssion_id): and spp.name_id =3D pn.id and spp.evr_id =3D pe.id and spp.package_arch_id =3D pa.id + and pn.name !=3D 'rhnlib' """) h.execute(kickstart_session_id=3Dkickstart_session_id) return _packages_from_cursor(h) --===============8406653289399614262==-- From partha at fedoraproject.org Thu Aug 20 11:57:23 2015 Content-Type: multipart/mixed; boundary="===============0906742020369166140==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Sun, 07 Jun 2009 03:18:59 +0000 Message-ID: <20090607031859.6922B120307@lists.fedorahosted.org> --===============0906742020369166140== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/webapp/WEB-INF/pages/activationkeys/list.jsp = | 1 + java/code/webapp/WEB-INF/pages/admin/addresses.jsp = | 1 + java/code/webapp/WEB-INF/pages/admin/config/general.jsp = | 1 + java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp = | 1 + java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp = | 2 ++ java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp = | 1 + java/code/webapp/WEB-INF/pages/admin/errata/publisheddeleteconfirm.jsp = | 1 + java/code/webapp/WEB-INF/pages/admin/errata/unpublisheddeleteconfirm.jsp = | 1 + java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesremoveco= nfirm.jsp | 1 + java/code/webapp/WEB-INF/pages/admin/multiorg/deletesatadmin.jsp = | 1 + java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp = | 1 + java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp = | 1 + java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp = | 1 + java/code/webapp/WEB-INF/pages/channel/all.jsp = | 1 + java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp = | 1 + java/code/webapp/WEB-INF/pages/channel/custom.jsp = | 1 + java/code/webapp/WEB-INF/pages/channel/entitlements.jsp = | 1 + java/code/webapp/WEB-INF/pages/channel/manage/add.jsp = | 1 + java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp = | 1 + java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp = | 1 + java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp = | 1 + java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp = | 2 ++ java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp = | 1 + java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp = | 1 + java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp = | 2 ++ java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp = | 2 ++ java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp = | 2 ++ java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp = | 1 + java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp = | 2 ++ java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp = | 1 + java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp = | 1 + java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp = | 1 + java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp = | 2 ++ java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackage= s.jsp | 2 ++ java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompack= ages.jsp | 1 + java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp = | 1 + java/code/webapp/WEB-INF/pages/channel/popular.jsp = | 1 + java/code/webapp/WEB-INF/pages/channel/redhat.jsp = | 1 + java/code/webapp/WEB-INF/pages/channel/relevant.jsp = | 1 + java/code/webapp/WEB-INF/pages/channel/retired.jsp = | 1 + java/code/webapp/WEB-INF/pages/channel/shared.jsp = | 1 + java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-head= er.jspf | 1 + java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/deta= ils-header.jspf | 1 + java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/delete= header.jspf | 1 + java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header= .jspf | 1 + java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/manage= _header.jspf | 1 + java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf = | 1 + java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf = | 1 + java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf = | 1 + java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf = | 1 + java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf= | 1 + java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf = | 1 + java/code/webapp/WEB-INF/pages/common/login.jsp = | 1 + java/code/webapp/WEB-INF/pages/common/relogin.jsp = | 1 + java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp= | 1 + java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp = | 1 + java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp = | 1 + java/code/webapp/WEB-INF/pages/errata/all.jsp = | 1 + java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp = | 3 ++- java/code/webapp/WEB-INF/pages/errata/delete.jsp = | 3 ++- java/code/webapp/WEB-INF/pages/errata/notify.jsp = | 3 ++- java/code/webapp/WEB-INF/pages/errata/overview.jsp = | 1 + java/code/webapp/WEB-INF/pages/errata/packages/add.jsp = | 3 ++- java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp = | 3 ++- java/code/webapp/WEB-INF/pages/errata/packages/list.jsp = | 3 ++- java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp = | 3 ++- java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp = | 3 ++- java/code/webapp/WEB-INF/pages/errata/published.jsp = | 1 + java/code/webapp/WEB-INF/pages/errata/relevant.jsp = | 1 + java/code/webapp/WEB-INF/pages/errata/unpublished.jsp = | 1 + java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp = | 1 + java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp = | 1 + java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp = | 1 + java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp = | 1 + java/code/webapp/WEB-INF/pages/schedule/actiondetails.jsp = | 1 + java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp = | 3 ++- java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp = | 3 ++- java/code/webapp/WEB-INF/pages/schedule/inprogresssystems.jsp = | 3 ++- java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp = | 3 ++- java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp = | 3 ++- java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf = | 1 + java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfi= rm.jsp | 1 + java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinsta= ll.jsp | 1 + java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinsta= llconfirm.jsp | 1 + java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.= jsp | 1 + java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/patchset= list.jsp | 1 + java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparepr= ofiles.jsp | 1 + java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesy= stems.jsp | 1 + java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/delete.js= p | 1 + java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/missingpk= gs.jsp | 1 + java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.= jsp | 1 + java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofi= le.jsp | 1 + java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsyste= m.jsp | 1 + java/code/webapp/WEB-INF/pages/systems/details/packages/scheduleremote.jsp= | 1 + java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp = | 1 + java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguest= s_confirm.jsp | 1 + java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguest= slist.jsp | 1 + java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp = | 1 + java/code/webapp/WEB-INF/pages/systems/grouplist.jsp = | 1 + java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp = | 1 + java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp = | 1 + java/code/webapp/WEB-INF/pages/systems/overview.jsp = | 1 + java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservat= ionlistconfirm.jsp | 1 + java/code/webapp/WEB-INF/pages/systems/proxylist.jsp = | 1 + java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp = | 1 + java/code/webapp/WEB-INF/pages/systems/systemlist.jsp = | 1 + java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp = | 1 + java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp = | 1 + java/code/webapp/WEB-INF/pages/yourrhn.jsp = | 1 + 109 files changed, 130 insertions(+), 13 deletions(-) New commits: commit fc3ee4c12f6644ca795c35381fdcf560022eb9c3 Author: Partha Aji Date: Sat Jun 6 23:20:12 2009 -0400 Fix to include html:errors wherever html:messages is used so that error= s can be reported. diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp b/java/= code/webapp/WEB-INF/pages/activationkeys/list.jsp index 0766d1a..b39599c 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp @@ -11,6 +11,7 @@ = = + diff --git a/java/code/webapp/WEB-INF/pages/admin/addresses.jsp b/java/code= /webapp/WEB-INF/pages/admin/addresses.jsp index 0510eab..2ef4912 100644 --- a/java/code/webapp/WEB-INF/pages/admin/addresses.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/addresses.jsp @@ -10,6 +10,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/admin/config/general.jsp b/java= /code/webapp/WEB-INF/pages/admin/config/general.jsp index 761ef30..461eecb 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/general.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/general.jsp @@ -6,6 +6,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp b/jav= a/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp index eb0e7be..b07596c 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp @@ -6,6 +6,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp b= /java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp index 92f5557..4b02a65 100644 --- a/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp @@ -4,10 +4,12 @@ <%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> = + + diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp b/java= /code/webapp/WEB-INF/pages/admin/errata/confirm.jsp index 14cac94..aedb836 100644 --- a/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp @@ -12,6 +12,7 @@ = <%@ include file=3D"/WEB-INF/pages/common/fragments/errata/errata-header.j= spf" %> = + diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/publisheddeletecon= firm.jsp b/java/code/webapp/WEB-INF/pages/admin/errata/publisheddeleteconfi= rm.jsp index e86b40a..f54e04f 100644 --- a/java/code/webapp/WEB-INF/pages/admin/errata/publisheddeleteconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/errata/publisheddeleteconfirm.jsp @@ -9,6 +9,7 @@ + diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/unpublisheddeletec= onfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/errata/unpublisheddeletec= onfirm.jsp index dbe75b2..15bd178 100644 --- a/java/code/webapp/WEB-INF/pages/admin/errata/unpublisheddeleteconfirm.= jsp +++ b/java/code/webapp/WEB-INF/pages/admin/errata/unpublisheddeleteconfirm.= jsp @@ -9,6 +9,7 @@ + diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesu= itesremoveconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/con= fig/probesuitesremoveconfirm.jsp index c0f0c5c..2106c87 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesrem= oveconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesrem= oveconfirm.jsp @@ -8,6 +8,7 @@ = = + diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/deletesatadmin.j= sp b/java/code/webapp/WEB-INF/pages/admin/multiorg/deletesatadmin.jsp index d36c593..b633bf6 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/deletesatadmin.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/deletesatadmin.jsp @@ -8,6 +8,7 @@ = = + diff --git a/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp b/= java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp index 7faba8a..d7292ba 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp @@ -11,6 +11,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp b/j= ava/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp index 67050fd..3e3a38a 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp @@ -11,6 +11,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp b/java= /code/webapp/WEB-INF/pages/admin/users/userlist.jsp index 8fd50ca..d63277e 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp @@ -11,6 +11,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/channel/all.jsp b/java/code/web= app/WEB-INF/pages/channel/all.jsp index 3d9bdef..42a460f 100644 --- a/java/code/webapp/WEB-INF/pages/channel/all.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/all.jsp @@ -18,6 +18,7 @@ function showFiltered() { = = = + diff --git a/java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp= b/java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp index 035f43a..0dff0c8 100644 --- a/java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp @@ -11,6 +11,7 @@ = = = + diff --git a/java/code/webapp/WEB-INF/pages/channel/custom.jsp b/java/code/= webapp/WEB-INF/pages/channel/custom.jsp index 0436b00..1a00b86 100644 --- a/java/code/webapp/WEB-INF/pages/channel/custom.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/custom.jsp @@ -20,6 +20,7 @@ function showFiltered() { = = = + diff --git a/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp b/java= /code/webapp/WEB-INF/pages/channel/entitlements.jsp index b50917c..0ff21e0 100644 --- a/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp @@ -10,6 +10,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp b/java/c= ode/webapp/WEB-INF/pages/channel/manage/add.jsp index b237862..72f3dc3 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp @@ -11,6 +11,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.= jsp b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp index 739ec25..2289143 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp @@ -21,6 +21,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.= jsp b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp index 3b9e3c9..cf9d279 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp @@ -20,6 +20,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp = b/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp index 97673b1..04a9d37 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp @@ -20,6 +20,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackag= es.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.j= sp index 823c464..44804cd 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp @@ -11,10 +11,12 @@ = + = + diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.js= p b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp index 1c6b00f..11408af 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp @@ -11,6 +11,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerratarem= ove.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove= .jsp index a06f2a4..4859f98 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp @@ -11,6 +11,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.j= sp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp index 95dbe17..02599d5 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp @@ -13,10 +13,12 @@ = + = + diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected= .jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp index 0c55f7c..79fba52 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp @@ -13,10 +13,12 @@ = + = + diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepac= kages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepack= ages.jsp index a3f1558..eb4cd69 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.j= sp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.j= sp @@ -11,10 +11,12 @@ = + = + diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp b/jav= a/code/webapp/WEB-INF/pages/channel/manage/errata.jsp index e11cdff..a18a4ac 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp @@ -11,6 +11,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesyn= c.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp index 6a82188..73d8b1f 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp @@ -11,10 +11,12 @@ = + = + diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp= b/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp index 7654050..19b829b 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp @@ -11,6 +11,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp b= /java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp index 089d675..21cef99 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp @@ -11,6 +11,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp= b/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp index 253aa9a..18d0ff8 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp @@ -11,6 +11,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackag= es.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.j= sp index 1179932..707e5cf 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp @@ -11,10 +11,12 @@ = + = + diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/package/confirmd= eletepackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/package/c= onfirmdeletepackages.jsp index 79825a9..3f7c50b 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepa= ckages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepa= ckages.jsp @@ -11,10 +11,12 @@ = + = + diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/package/listremo= vecustompackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/packag= e/listremovecustompackages.jsp index 1630d8e..df78218 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecusto= mpackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecusto= mpackages.jsp @@ -20,6 +20,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp = b/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp index 284b71e..0ac6b82 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp @@ -11,6 +11,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/channel/popular.jsp b/java/code= /webapp/WEB-INF/pages/channel/popular.jsp index e842fa7..861f4ff 100644 --- a/java/code/webapp/WEB-INF/pages/channel/popular.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/popular.jsp @@ -20,6 +20,7 @@ function showFiltered() { = = = + diff --git a/java/code/webapp/WEB-INF/pages/channel/redhat.jsp b/java/code/= webapp/WEB-INF/pages/channel/redhat.jsp index 4a14991..006ce9c 100644 --- a/java/code/webapp/WEB-INF/pages/channel/redhat.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/redhat.jsp @@ -20,6 +20,7 @@ function showFiltered() { = = = + diff --git a/java/code/webapp/WEB-INF/pages/channel/relevant.jsp b/java/cod= e/webapp/WEB-INF/pages/channel/relevant.jsp index 8a43adc..a8cfb8c 100644 --- a/java/code/webapp/WEB-INF/pages/channel/relevant.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/relevant.jsp @@ -20,6 +20,7 @@ function showFiltered() { = = = + diff --git a/java/code/webapp/WEB-INF/pages/channel/retired.jsp b/java/code= /webapp/WEB-INF/pages/channel/retired.jsp index 2b1d654..7a85dbf 100644 --- a/java/code/webapp/WEB-INF/pages/channel/retired.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/retired.jsp @@ -18,6 +18,7 @@ function showFiltered() { = = = + diff --git a/java/code/webapp/WEB-INF/pages/channel/shared.jsp b/java/code/= webapp/WEB-INF/pages/channel/shared.jsp index bf4110c..dbf8e44 100644 --- a/java/code/webapp/WEB-INF/pages/channel/shared.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/shared.jsp @@ -18,6 +18,7 @@ function showFiltered() { = = = + diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys= /common-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/activ= ationkeys/common-header.jspf index 47e06e3..87614b3 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common= -header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common= -header.jspf @@ -1,5 +1,6 @@ <%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> <%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> + diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/= channel/details-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragmen= ts/configuration/channel/details-header.jspf index bc7c2fc..d583a69 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel= /details-header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel= /details-header.jspf @@ -3,6 +3,7 @@ <%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> + diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/= files/deleteheader.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/c= onfiguration/files/deleteheader.jspf index 21cba3c..2dd8200 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/d= eleteheader.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/d= eleteheader.jspf @@ -3,6 +3,7 @@ <%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> + diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/= files/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configu= ration/files/header.jspf index fb1e02f..d3016bf 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/h= eader.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/h= eader.jspf @@ -6,6 +6,7 @@ <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c"%> <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/functions" prefix=3D"fn" %> + diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/= files/manage_header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/= configuration/files/manage_header.jspf index 43bc64a..f1fd7fa 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/m= anage_header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/m= anage_header.jspf @@ -4,6 +4,7 @@ <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c"%> <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/functions" prefix=3D"fn" %> + diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-= header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata= -header.jspf index 26408e5..a30d5ea 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.= jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.= jspf @@ -3,6 +3,7 @@ <%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> + diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.= jspf b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf index 723930f..e881e8b 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf @@ -5,6 +5,7 @@ <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/functions" prefix=3D"fn" %> = + diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/profile/header= .jspf b/java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf index 9b2112c..cc7b1f4 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf @@ -2,6 +2,7 @@ <%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> + diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jsp= f b/java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf index d4db5ac..fa585b5 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf @@ -2,6 +2,7 @@ <%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> + diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system= -header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/syst= em-header.jspf index 5d30239..96d73ac 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header= .jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header= .jspf @@ -5,6 +5,7 @@ <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/functions" prefix=3D"fn" %> = + diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/user/user-head= er.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.= jspf index cf2adef..1de0163 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf @@ -3,6 +3,7 @@ <%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> + diff --git a/java/code/webapp/WEB-INF/pages/common/login.jsp b/java/code/we= bapp/WEB-INF/pages/common/login.jsp index aa8c226..106a072 100644 --- a/java/code/webapp/WEB-INF/pages/common/login.jsp +++ b/java/code/webapp/WEB-INF/pages/common/login.jsp @@ -10,6 +10,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/common/relogin.jsp b/java/code/= webapp/WEB-INF/pages/common/relogin.jsp index 6a341c4..a82f462 100644 --- a/java/code/webapp/WEB-INF/pages/common/relogin.jsp +++ b/java/code/webapp/WEB-INF/pages/common/relogin.jsp @@ -11,6 +11,7 @@ = = + diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/globalco= nfiglist.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/global= configlist.jsp index c6b275f..498409d 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglis= t.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglis= t.jsp @@ -10,6 +10,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/manageds= ystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/manageds= ystems.jsp index d720c54..f5588f7 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.= jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.= jsp @@ -10,6 +10,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp b/ja= va/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp index ad716ba..97df990 100644 --- a/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp @@ -13,6 +13,7 @@ = <%@ include file=3D"/WEB-INF/pages/common/fragments/errata/errata-header.j= spf" %> = + diff --git a/java/code/webapp/WEB-INF/pages/errata/all.jsp b/java/code/weba= pp/WEB-INF/pages/errata/all.jsp index ff5b983..3c56da7 100644 --- a/java/code/webapp/WEB-INF/pages/errata/all.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/all.jsp @@ -11,6 +11,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp b/java/c= ode/webapp/WEB-INF/pages/errata/cloneerrata.jsp index 73b541e..b1a3cd4 100644 --- a/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp @@ -7,7 +7,8 @@ = - + + = diff --git a/java/code/webapp/WEB-INF/pages/errata/delete.jsp b/java/code/w= ebapp/WEB-INF/pages/errata/delete.jsp index 1417a1e..8e2e5b8 100644 --- a/java/code/webapp/WEB-INF/pages/errata/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/delete.jsp @@ -10,7 +10,8 @@ = - + + = diff --git a/java/code/webapp/WEB-INF/pages/errata/notify.jsp b/java/code/w= ebapp/WEB-INF/pages/errata/notify.jsp index c6dbd09..185620c 100644 --- a/java/code/webapp/WEB-INF/pages/errata/notify.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/notify.jsp @@ -10,7 +10,8 @@ = - + + = diff --git a/java/code/webapp/WEB-INF/pages/errata/overview.jsp b/java/code= /webapp/WEB-INF/pages/errata/overview.jsp index e6429ef..89ef07a 100644 --- a/java/code/webapp/WEB-INF/pages/errata/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/overview.jsp @@ -11,6 +11,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp b/java/= code/webapp/WEB-INF/pages/errata/packages/add.jsp index 76e59df..d11b8bf 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp @@ -20,7 +20,8 @@ = - + + = diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp b/j= ava/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp index 4524eb8..dcf1f76 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp @@ -11,7 +11,8 @@ = - + + = diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp b/java= /code/webapp/WEB-INF/pages/errata/packages/list.jsp index e5ad6f4..688376d 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp @@ -10,7 +10,8 @@ = - + + = diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp b/= java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp index ea53db9..31b9b4a 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp @@ -10,7 +10,8 @@ = - + + = diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp b/ja= va/code/webapp/WEB-INF/pages/errata/packages/remove.jsp index 06db783..94b6865 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp @@ -10,7 +10,8 @@ = - + + = diff --git a/java/code/webapp/WEB-INF/pages/errata/published.jsp b/java/cod= e/webapp/WEB-INF/pages/errata/published.jsp index 0716cc7..2d825fc 100644 --- a/java/code/webapp/WEB-INF/pages/errata/published.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/published.jsp @@ -9,6 +9,7 @@ + diff --git a/java/code/webapp/WEB-INF/pages/errata/relevant.jsp b/java/code= /webapp/WEB-INF/pages/errata/relevant.jsp index 628b2a7..b2409a1 100644 --- a/java/code/webapp/WEB-INF/pages/errata/relevant.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/relevant.jsp @@ -11,6 +11,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp b/java/c= ode/webapp/WEB-INF/pages/errata/unpublished.jsp index 1402f79..d385f2b 100644 --- a/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp @@ -9,6 +9,7 @@ + diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariable= s.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp index 5e469c6..2a0563e 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp @@ -8,6 +8,7 @@ = = = + diff --git a/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp = b/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp index a6497b3..31dbf3b 100644 --- a/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp +++ b/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp @@ -18,6 +18,7 @@ function showFiltered() { = = = + diff --git a/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp b= /java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp index bcba877..8fde4c4 100644 --- a/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp +++ b/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp @@ -11,6 +11,7 @@ = = + diff --git a/java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp = b/java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp index 6780abd..ac8f504 100644 --- a/java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp +++ b/java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp @@ -18,6 +18,7 @@ function showFiltered() { = = = + diff --git a/java/code/webapp/WEB-INF/pages/schedule/actiondetails.jsp b/ja= va/code/webapp/WEB-INF/pages/schedule/actiondetails.jsp index 334590d..e3c997b 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/actiondetails.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/actiondetails.jsp @@ -7,6 +7,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp b= /java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp index cc222e2..d2ee2ea 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp @@ -9,7 +9,8 @@ = - + + = diff --git a/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp b/ja= va/code/webapp/WEB-INF/pages/schedule/failedactions.jsp index 7508ac7..34d7442 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp @@ -11,7 +11,8 @@ = = = - + + = diff --git a/java/code/webapp/WEB-INF/pages/schedule/inprogresssystems.jsp = b/java/code/webapp/WEB-INF/pages/schedule/inprogresssystems.jsp index 1af4ec2..b0f0bf1 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/inprogresssystems.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/inprogresssystems.jsp @@ -7,7 +7,8 @@ = - + + = diff --git a/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp b/j= ava/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp index 5ac2f17..e8d4a7b 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp @@ -8,7 +8,8 @@ = - + + = diff --git a/java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.= jsp b/java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp index 3308ab9..89be605 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp @@ -9,7 +9,8 @@ = - + + = diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packag= elist.jspf b/java/code/webapp/WEB-INF/pages/systems/details/packages/packag= elist.jspf index eea4329..baecd0d 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.j= spf +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.j= spf @@ -8,6 +8,7 @@ = = + diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patche= s/patchconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/package= s/patches/patchconfirm.jsp index c480544..9a0fc19 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patch= confirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patch= confirm.jsp @@ -8,6 +8,7 @@ = = + diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patche= s/patchinstall.jsp b/java/code/webapp/WEB-INF/pages/systems/details/package= s/patches/patchinstall.jsp index 9d99a4a..04e6e3d 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patch= install.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patch= install.jsp @@ -8,6 +8,7 @@ = = + diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patche= s/patchinstallconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/= packages/patches/patchinstallconfirm.jsp index a812653..2ee3bc3 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patch= installconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patch= installconfirm.jsp @@ -8,6 +8,7 @@ = = + diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patche= s/patchlist.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/p= atches/patchlist.jsp index ce75071..67fe1e3 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patch= list.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patch= list.jsp @@ -8,6 +8,7 @@ = = + diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patchs= ets/patchsetlist.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packa= ges/patchsets/patchsetlist.jsp index f9657fa..4e0fe22 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/pat= chsetlist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/pat= chsetlist.jsp @@ -8,6 +8,7 @@ = = + diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profil= es/compareprofiles.jsp b/java/code/webapp/WEB-INF/pages/systems/details/pac= kages/profiles/compareprofiles.jsp index 6b261f4..538bdfd 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comp= areprofiles.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comp= areprofiles.jsp @@ -8,6 +8,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profil= es/comparesystems.jsp b/java/code/webapp/WEB-INF/pages/systems/details/pack= ages/profiles/comparesystems.jsp index f83dfc0..b83c0d0 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comp= aresystems.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comp= aresystems.jsp @@ -9,6 +9,7 @@ = = + diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profil= es/delete.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/pro= files/delete.jsp index 12228eb..b804d5b 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/dele= te.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/dele= te.jsp @@ -8,6 +8,7 @@ = = + diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profil= es/missingpkgs.jsp b/java/code/webapp/WEB-INF/pages/systems/details/package= s/profiles/missingpkgs.jsp index 20a2ab4..b915b3f 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/miss= ingpkgs.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/miss= ingpkgs.jsp @@ -9,6 +9,7 @@ = = + diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profil= es/profiles.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/p= rofiles/profiles.jsp index b1a9744..48a3416 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/prof= iles.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/prof= iles.jsp @@ -8,6 +8,7 @@ = = + diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profil= es/syncprofile.jsp b/java/code/webapp/WEB-INF/pages/systems/details/package= s/profiles/syncprofile.jsp index 751b02f..02be0da 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/sync= profile.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/sync= profile.jsp @@ -9,6 +9,7 @@ = = + diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profil= es/syncsystem.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages= /profiles/syncsystem.jsp index 6ca3561..8a19099 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/sync= system.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/sync= system.jsp @@ -9,6 +9,7 @@ = = + diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/schedu= leremote.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/sche= duleremote.jsp index 9d28b14..bc3b69b 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/scheduleremot= e.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/scheduleremot= e.jsp @@ -8,6 +8,7 @@ = = + diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/upgrad= able.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradab= le.jsp index 5813d36..3cc0f5e 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp @@ -9,6 +9,7 @@ = = + diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/= virtualguests_confirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/= virtualization/virtualguests_confirm.jsp index 65cc386..fb7fd4d 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtual= guests_confirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtual= guests_confirm.jsp @@ -8,6 +8,7 @@ = = + diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/= virtualguestslist.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virt= ualization/virtualguestslist.jsp index 7d9a807..89f2ed0 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtual= guestslist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtual= guestslist.jsp @@ -8,6 +8,7 @@ = = + diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlemen= ts.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.j= sp index 1190f2a..0ac8be4 100644 --- a/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp @@ -11,6 +11,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/systems/grouplist.jsp b/java/co= de/webapp/WEB-INF/pages/systems/grouplist.jsp index 9c2cd82..f021bcf 100644 --- a/java/code/webapp/WEB-INF/pages/systems/grouplist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/grouplist.jsp @@ -11,6 +11,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp b/java= /code/webapp/WEB-INF/pages/systems/inactivelist.jsp index 6799319..b03df6c 100644 --- a/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp @@ -11,6 +11,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp b/jav= a/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp index 83cb509..2f55059 100644 --- a/java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp @@ -11,6 +11,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/systems/overview.jsp b/java/cod= e/webapp/WEB-INF/pages/systems/overview.jsp index f76612c..958b8e9 100644 --- a/java/code/webapp/WEB-INF/pages/systems/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/overview.jsp @@ -11,6 +11,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservati= on/preservationlistconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/pro= visioning/preservation/preservationlistconfirm.jsp index c8ddc41..0feca5e 100644 --- a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/pres= ervationlistconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/pres= ervationlistconfirm.jsp @@ -7,6 +7,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp b/java/co= de/webapp/WEB-INF/pages/systems/proxylist.jsp index 205b7c6..07fa7e7 100644 --- a/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp @@ -11,6 +11,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp b/ja= va/code/webapp/WEB-INF/pages/systems/registeredlist.jsp index 6d63d6f..97be234 100644 --- a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp @@ -12,6 +12,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp b/java/c= ode/webapp/WEB-INF/pages/systems/systemlist.jsp index d4795be..5a878d2 100644 --- a/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp @@ -11,6 +11,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp b/ja= va/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp index 8cbcef1..6310693 100644 --- a/java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp @@ -11,6 +11,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp b/jav= a/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp index 0d0eef7..7bfec6b 100644 --- a/java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp @@ -11,6 +11,7 @@ = + diff --git a/java/code/webapp/WEB-INF/pages/yourrhn.jsp b/java/code/webapp/= WEB-INF/pages/yourrhn.jsp index b1633f6..1bf35f1 100644 --- a/java/code/webapp/WEB-INF/pages/yourrhn.jsp +++ b/java/code/webapp/WEB-INF/pages/yourrhn.jsp @@ -38,6 +38,7 @@ = + --===============0906742020369166140==-- From partha at fedoraproject.org Thu Aug 20 11:57:23 2015 Content-Type: multipart/mixed; boundary="===============0625217823665181107==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Mon, 08 Jun 2009 02:51:44 +0000 Message-ID: <20090608025144.B641E120328@lists.fedorahosted.org> --===============0625217823665181107== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java | = 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 2a893591f19285984bf7776c30791ede27e380a6 Author: Partha Aji Date: Sun Jun 7 22:53:58 2009 -0400 Fixed a checkstyle issue diff --git a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManage= r.java b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.ja= va index 4c23f0a..ded9c09 100644 --- a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java +++ b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java @@ -448,8 +448,8 @@ public class ActivationKeyManager { * This loops through all associated kickstart profiles and makes * the change in cobbler */ - private static void changeCobblerProfileKey(ActivationKey key, String = oldKey, String newKey, - = User user) { + private static void changeCobblerProfileKey(ActivationKey key, = + String oldKey, String newKey, User use= r) { List kss =3D ActivationKeyFactory.listAssociatedKic= kstarts(key); for (KickstartData ks : kss) { if (ks.getCobblerId() !=3D null) { --===============0625217823665181107==-- From partha at fedoraproject.org Thu Aug 20 11:57:23 2015 Content-Type: multipart/mixed; boundary="===============2030402387243732598==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Mon, 08 Jun 2009 02:52:30 +0000 Message-ID: <20090608025230.BF56F120328@lists.fedorahosted.org> --===============2030402387243732598== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java | = 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 6529b100b5b90036b09cdc2a1ab3212a02b240ed Author: Partha Aji Date: Sun Jun 7 22:53:58 2009 -0400 Fixed a checkstyle issue diff --git a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManage= r.java b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.ja= va index 4c23f0a..ded9c09 100644 --- a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java +++ b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java @@ -448,8 +448,8 @@ public class ActivationKeyManager { * This loops through all associated kickstart profiles and makes * the change in cobbler */ - private static void changeCobblerProfileKey(ActivationKey key, String = oldKey, String newKey, - = User user) { + private static void changeCobblerProfileKey(ActivationKey key, = + String oldKey, String newKey, User use= r) { List kss =3D ActivationKeyFactory.listAssociatedKic= kstarts(key); for (KickstartData ks : kss) { if (ks.getCobblerId() !=3D null) { --===============2030402387243732598==-- From partha at fedoraproject.org Thu Aug 20 11:57:23 2015 Content-Type: multipart/mixed; boundary="===============1286643810362730501==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Mon, 08 Jun 2009 03:00:50 +0000 Message-ID: <20090608030050.11E7B120328@lists.fedorahosted.org> --===============1286643810362730501== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/util/StringUtil.java = | 12 = java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEdi= tAction.java | 5 = java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartVariableAc= tion.java | 2 = java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWi= zardAction.java | 123 +++++++-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xm= l | 9 = java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml= | 126 +++------- java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.ja= va | 84 +++--- java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand.java= | 4 = java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileComma= nd.java | 8 = java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreate= Command.java | 55 +++- java/code/src/org/cobbler/CobblerObject.java = | 2 = java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp = | 2 = java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp = | 5 = java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/second.jsp = | 77 +++++- java/code/webapp/WEB-INF/struts-config.xml = | 5 = 15 files changed, 343 insertions(+), 176 deletions(-) New commits: commit 8146ade6a01bcb61f63b9b73a7ea99273dfdabad Author: Partha Aji Date: Sun Jun 7 23:02:27 2009 -0400 501388 - kernel options and post kernel options redesign = A bunch of bugs were fixed in this one commit, including kernel parameters in the UI never getting copied to cobbler post kernel options missing. wrong error reported when you specify more than one kernel options This commit basically pertains to the kernel options and post kernel op= tions on the system-> provision-> schedule -> advanced options page more to come when we add this login to the system -> virtualization->s= chedule page diff --git a/java/code/src/com/redhat/rhn/common/util/StringUtil.java b/jav= a/code/src/com/redhat/rhn/common/util/StringUtil.java index f04a55c..5f7d246 100644 --- a/java/code/src/com/redhat/rhn/common/util/StringUtil.java +++ b/java/code/src/com/redhat/rhn/common/util/StringUtil.java @@ -710,22 +710,24 @@ public class StringUtil { } = /** - * Convert a string of options (name value pairs seperated by '=3D', w= here the - * pairs are seperated by whitespace), into a map. + * Convert a string of options (name value pairs separated by '=3D', w= here the + * pairs are seperated by 'separator'), into a map. * @param options the string of options * @param errorKey the localization key of the error message to throw = if we * can't parse it correctly + * @param separator the separator the separates different name value p= airs = * @return a map containing name value pairs of options * @throws ValidatorException if there isn't an '=3D' sign seperating = the * pairs */ - public static Map convertOptionsToMap(String options, String errorKey) + public static Map convertOptionsToMap(String options, String errorKey, + String sep= arator) throws ValidatorException { Map toReturn =3D new HashMap(); - StringTokenizer token =3D new StringTokenizer(options, "\n"); + StringTokenizer token =3D new StringTokenizer(options, separator); while (token.hasMoreElements()) { String option =3D token.nextToken(); - if (option.trim().length() > 0) { //Skip blank lines + if (!StringUtils.isBlank(option)) { //Skip blank lines String[] args =3D option.split("=3D"); if (args.length !=3D 2) { ValidatorException.raiseException(errorKey, option); diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Kicksta= rtDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kic= kstart/KickstartDetailsEditAction.java index 328d68b..94838b3 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetai= lsEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetai= lsEditAction.java @@ -291,9 +291,10 @@ public class KickstartDetailsEditAction extends BaseKi= ckstartEditAction { DynaActionForm form, User user= ) { CobblerProfileEditCommand cmd =3D new CobblerProfileEditCommand(ks= data, user); cmd.setKernelOptions(StringUtil.convertOptionsToMap( - form.getString(KERNEL_OPTIONS), "kickstart.jsp.error.inval= idvariable")); + form.getString(KERNEL_OPTIONS), "kickstart.jsp.error.inval= idoption", " ")); cmd.setPostKernelOptions(StringUtil.convertOptionsToMap( - form.getString(POST_KERNEL_OPTIONS), "kickstart.jsp.error.= invalidoption")); + form.getString(POST_KERNEL_OPTIONS), = + "kickstart.jsp.error.invalidoption= ", " ")); cmd.store(); = CobblerXMLRPCHelper helper =3D new CobblerXMLRPCHelper(); diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Kicksta= rtVariableAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickst= art/KickstartVariableAction.java index d2be147..7a00879 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartVaria= bleAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartVaria= bleAction.java @@ -119,7 +119,7 @@ public abstract class KickstartVariableAction extends R= hnAction { = CobblerObject cobj =3D getCobblerObject(cId, ctx.getLoggedInUs= er()); cobj.setKsMeta(StringUtil.convertOptionsToMap((String)form.get= (VARIABLES), = - "kickstart.jsp.error.invalidvariable")); + "kickstart.jsp.error.invalidvariable", "\n")); cobj.save(); = return null; diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Schedul= eKickstartWizardAction.java b/java/code/src/com/redhat/rhn/frontend/action/= kickstart/ScheduleKickstartWizardAction.java index d54004a..50b1afe 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickst= artWizardAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickst= artWizardAction.java @@ -14,25 +14,6 @@ */ package com.redhat.rhn.frontend.action.kickstart; = -import java.lang.reflect.Method; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.lang.BooleanUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -import org.apache.struts.action.ActionErrors; -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.DataResult; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.util.DatePicker; @@ -57,6 +38,27 @@ import com.redhat.rhn.manager.kickstart.cobbler.CobblerS= ystemCreateCommand; import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper; import com.redhat.rhn.manager.system.SystemManager; = +import org.apache.commons.lang.BooleanUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.DynaActionForm; +import org.cobbler.CobblerConnection; +import org.cobbler.Distro; + +import java.lang.reflect.Method; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletResponse; + /** * blah blah * = @@ -79,6 +81,13 @@ public class ScheduleKickstartWizardAction extends RhnWi= zardAction { public static final String SYNC_SYSTEM_DISABLED =3D "syncSystemDisable= d"; public static final String PROXIES =3D "proxies"; public static final String KERNEL_PARAMS =3D "kernelParams"; + public static final String KERNEL_PARAMS_TYPE =3D "kernelParamsType"; + public static final String KERNEL_PARAMS_DISTRO =3D "distro"; + public static final String KERNEL_PARAMS_PROFILE =3D "profile"; + public static final String KERNEL_PARAMS_CUSTOM =3D "custom"; + = + public static final String POST_KERNEL_PARAMS =3D "postKernelParams"; + public static final String POST_KERNEL_PARAMS_TYPE =3D "postKernelPara= msType"; public static final String PROXY_HOST =3D "proxyHost"; public static final String USE_EXISTING_PROFILE =3D "useExistingProfil= e"; public static final String ACTIVATION_KEY =3D "activationKey"; @@ -199,7 +208,7 @@ public class ScheduleKickstartWizardAction extends RhnW= izardAction { Boolean.FALSE.toString()); } = - addRequestAttributes(ctx, cmd); + addRequestAttributes(ctx, cmd, form); checkForKickstart(form, cmd, ctx); List proxies =3D getProxies(cmd); if (proxies !=3D null && proxies.size() > 0) { @@ -259,7 +268,7 @@ public class ScheduleKickstartWizardAction extends RhnW= izardAction { KickstartScheduleCommand cmd =3D getScheduleCommand(form, ctx, nul= l, null); = checkForKickstart(form, cmd, ctx); - addRequestAttributes(ctx, cmd); + addRequestAttributes(ctx, cmd, form); form.set(ACTIVATION_KEYS, cmd.getActivationKeys()); DataResult packageProfiles =3D cmd.getProfiles(); form.set(SYNCH_PACKAGES, packageProfiles); @@ -283,17 +292,50 @@ public class ScheduleKickstartWizardAction extends Rh= nWizardAction { if (StringUtils.isEmpty(form.getString(USE_EXISTING_PROFILE))) { form.set(USE_EXISTING_PROFILE, Boolean.TRUE.toString()); } + = + if (StringUtils.isEmpty(form.getString(KERNEL_PARAMS_TYPE))) { + form.set(KERNEL_PARAMS_TYPE, KERNEL_PARAMS_DISTRO); + } + = + if (StringUtils.isEmpty(form.getString(POST_KERNEL_PARAMS_TYPE))) { + form.set(POST_KERNEL_PARAMS_TYPE, KERNEL_PARAMS_DISTRO); + } + = SdcHelper.ssmCheck(ctx.getRequest(), sid, user); return mapping.findForward("second"); } = protected void addRequestAttributes(RequestContext ctx, - KickstartScheduleCommand cmd) { + KickstartScheduleCommand cmd, DynaActionForm form) { ctx.getRequest().setAttribute(RequestContext.SYSTEM, cmd.getServer= ()); ctx.getRequest() .setAttribute(RequestContext.KICKSTART, cmd.getKsdata()); + if (cmd.getKsdata() !=3D null) { + ctx.getRequest().setAttribute("profile", cmd.getKsdata()); + ctx.getRequest().setAttribute("distro", cmd.getKsdata().getTre= e()); + CobblerConnection con =3D CobblerXMLRPCHelper. + getConnection(ctx.getLoggedInUser()); + = + Distro distro =3D Distro.lookupById(con, + cmd.getKsdata().getTree().getCobblerId()); + + ctx.getRequest().setAttribute("distro_kernel_params", + distro.getKernelOptionsString(= )); + ctx.getRequest().setAttribute("distro_post_kernel_params", + distro.getKernelPostOption= sString()); + + org.cobbler.Profile profile =3D org.cobbler.Profile. + lookupById(con, cmd.getKsdata().getCobbler= Id()); + ctx.getRequest().setAttribute("profile_kernel_params", + profile.getKernelOptionsString()); + ctx.getRequest().setAttribute("profile_post_kernel_params", + profile.getKernelPostOptionsString= ()); + + } } = + = + = /** * The third step in the wizard * @param mapping ActionMapping for struts @@ -324,8 +366,41 @@ public class ScheduleKickstartWizardAction extends Rhn= WizardAction { KickstartHelper helper =3D new KickstartHelper(ctx.getRequest()); KickstartScheduleCommand cmd =3D getScheduleCommand(form, ctx, scheduleTime, helper.getKickstartHost()); - - cmd.setKernelParams(form.getString(KERNEL_PARAMS)); + = + CobblerConnection con =3D CobblerXMLRPCHelper. + getConnection(ctx.getLoggedInUser()); + = + String type =3D form.getString(KERNEL_PARAMS_TYPE); + if (KERNEL_PARAMS_CUSTOM.equals(type)) { + cmd.setKernelOptions(form.getString(KERNEL_PARAMS)); + } + else if (KERNEL_PARAMS_DISTRO.equals(type)) { + Distro distro =3D Distro. + lookupById(con, cmd.getKsdata().getTree().getCobblerId= ()); + cmd.setKernelOptions(distro.getKernelOptionsString()); + } + else { + org.cobbler.Profile profile =3D org.cobbler.Profile. + lookupById(con, cmd.getKsdata().ge= tCobblerId()); + cmd.setKernelOptions(profile.getKernelOptionsString()); + } + = + type =3D form.getString(POST_KERNEL_PARAMS_TYPE); + if (KERNEL_PARAMS_CUSTOM.equals(type)) { + cmd.setPostKernelOptions(form.getString(POST_KERNEL_PARAMS)); + } + else if (KERNEL_PARAMS_DISTRO.equals(type)) { + Distro distro =3D Distro. + lookupById(con, cmd.getKsdata().getTree().getCobblerId= ()); + cmd.setPostKernelOptions(distro.getKernelPostOptionsString()); + } + else { + org.cobbler.Profile profile =3D org.cobbler.Profile. + lookupById(con, cmd.getKsdata().ge= tCobblerId()); + cmd.setPostKernelOptions(profile.getKernelPostOptionsString()); + } + = + = boolean advancedConfig =3D false; // if existing profile is not set then actions froms from normal c= onfig // page diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResou= rce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringRe= source_en_US.xml index d3ea29c..493afba 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml @@ -185,7 +185,6 @@ http://www.oasis-open.org/committees/xliff/documents/xl= iff-core-1.1.xsd" General Stufff - Yes @@ -206,7 +205,13 @@ http://www.oasis-open.org/committees/xliff/documents/x= liff-core-1.1.xsd" Warning - = + + + Custom + + + none specified + = diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResour= ce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringReso= urce_en_US.xml index f71671e..ea75762 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml @@ -10889,9 +10889,6 @@ the <strong>Red Hat Enterprise Linux System A= dministration Guide.</stro Snippet Type = - - Custom - Custom kickstart snippets will be only available to the &l= t;strong>{0}</strong> organization. @@ -16396,81 +16393,56 @@ the <a href=3D"/rhn/kickstart/ActivationK= eysList.do?ksid=3D{0}">Acti /rhn/systems/details/kick= start/ScheduleWizard.do - = - - Advanced Kickstart Configuration - - /rhn/systems/details/kick= start/ScheduleWizard.do - - - - Bootloader - - /rhn/systems/details/kick= start/ScheduleWizard.do - - - - Extra Kernel<br />Parameters - - /rhn/systems/details/kick= start/ScheduleWizard.do - - - - @@PRODUCT_NAME@@ System<br />Profile - - /rhn/systems/details/kick= start/ScheduleWizard.do - - - - Sync Package<br />Profile - - /rhn/systems/details/kick= start/ScheduleWizard.do - - - Use this system's existing @@PRODUCT_NAME@@ Profile - - /rhn/systems/details/kick= start/ScheduleWizard.do - - - - Use the default guest profile - - /rhn/systems/details/virt= ualization/ProvisionVirtualizationWizard.do - - - - Use an activation key (select below): - - /rhn/systems/details/kick= start/ScheduleWizard.do - - - - With system's existing package profile - - /rhn/systems/details/kick= start/ScheduleWizard.do - - - - With Package Profile - - /rhn/systems/details/kick= start/ScheduleWizard.do - - - - With System Profile - - /rhn/systems/details/kick= start/ScheduleWizard.do - - - - Do not sync package profile - - /rhn/systems/details/kick= start/ScheduleWizard.do - - - - + = + + + + /rhn/systems/details/kicksta= rt/ScheduleWizard.do + + + Advanced Kickstart Configuration + + + Bootloader + + + <strong>As specified by Kickstart Distribution</= strong>({0}) + + + <strong>As specified by Kickstart Profile</stron= g>({0}) + + + If you would not like any kernel options, select '{0}' an= d leave the form field blank. + + + @@PRODUCT_NAME@@ System<br />Profile + + + Sync Package<br />Profile + + + Use this system's existing @@PRODUCT_NAME@@ Profile + + + Use the default guest profile + + + Use an activation key (select below): + + + With system's existing package profile + + + With Package Profile + + + With System Profile + + + Do not sync package profile + + = Confirm Kickstart Script Deletion diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSchedu= leCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSc= heduleCommand.java index 28bf6a5..5f56e6d 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java @@ -14,20 +14,6 @@ */ package com.redhat.rhn.manager.kickstart; = -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -import org.cobbler.SystemRecord; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.SelectMode; @@ -71,6 +57,20 @@ import com.redhat.rhn.manager.system.BaseSystemOperation; import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.manager.token.ActivationKeyManager; = +import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; +import org.cobbler.SystemRecord; + +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * Provides frequently used data for scheduling a kickstart * @@ -141,8 +141,10 @@ public class KickstartScheduleCommand extends BaseSyst= emOperation { private Profile createdProfile; // Static device private String staticDevice; - // extra kernel params set in the UI - private String kernelParams; + + private String kernelOptions; + private String postKernelOptions; = + = = // The server who serves the kickstarts private String kickstartServerName; @@ -593,6 +595,8 @@ public class KickstartScheduleCommand extends BaseSyste= mOperation { getKickstartMediaPath(kickstartSession), tokenList); cmd.setKickstartHost(host); + cmd.setKernelOptions(getExtraOptions()); + cmd.setPostKernelOptions(postKernelOptions); ValidatorError cobblerError =3D cmd.store(); if (cobblerError !=3D null) { return cobblerError; @@ -603,6 +607,8 @@ public class KickstartScheduleCommand extends BaseSyste= mOperation { new CobblerSystemCreateCommand(user, = server, cobblerProfileLabel); cmd.setKickstartHost(host); + cmd.setKernelOptions(kernelOptions); + cmd.setPostKernelOptions(postKernelOptions); = ValidatorError cobblerError =3D cmd.store(); if (cobblerError !=3D null) { return cobblerError; @@ -943,7 +949,8 @@ public class KickstartScheduleCommand extends BaseSyste= mOperation { if (isCobblerOnly()) { return ""; } - StringBuffer retval =3D new StringBuffer(); + StringBuilder retval =3D new StringBuilder(); + = retval.append("ks=3D"); if (this.proxyHost !=3D null) { retval.append(kickstartSession.getUrl(this.proxyHost, = @@ -952,9 +959,9 @@ public class KickstartScheduleCommand extends BaseSyste= mOperation { else { retval.append(kickstartSession.getUrl(this.kickstartServerName= , = this.scheduleDate)); - } - - String extraParams =3D new String(" ksdevice=3Deth0"); + } = + = + String extraParams =3D " ksdevice=3Deth0"; /** Some examples: dhcp:eth0 , dhcp:eth2, static:10.1.4.75 static:146.108.30.184, static:auto, static:eth0 @@ -975,11 +982,8 @@ public class KickstartScheduleCommand extends BaseSyst= emOperation { extraParams =3D ""; } } - if (this.kernelParams !=3D null) { - extraParams =3D extraParams + " " + this.kernelParams; - } - if (this.getKsdata().getKernelParams() !=3D null) { - extraParams =3D extraParams + " " + this.getKsdata().getKernel= Params(); = + if (!StringUtils.isBlank(kernelOptions)) { + extraParams =3D extraParams + " " + this.kernelOptions; } retval.append(extraParams); = @@ -1419,22 +1423,6 @@ public class KickstartScheduleCommand extends BaseSy= stemOperation { return createdProfile; } = - = - /** - * @return Returns the kernelParams. - */ - public String getKernelParams() { - return kernelParams; - } - - = - /** - * @param kernelParamsIn The kernelParams to set. - */ - public void setKernelParams(String kernelParamsIn) { - this.kernelParams =3D kernelParamsIn; - } - /** * Set the activationkey id to use * @param idIn to add to the Kickstart @@ -1550,4 +1538,18 @@ public class KickstartScheduleCommand extends BaseSy= stemOperation { public boolean isCobblerOnly() { return cobblerOnly; } + = + /** + * @param kernelOptionsIn The kernelOptions to set. + */ + public void setKernelOptions(String kernelOptionsIn) { + this.kernelOptions =3D kernelOptionsIn; + } + = + /** + * @param postKernelOptionsIn The postKernelOptions to set. + */ + public void setPostKernelOptions(String postKernelOptionsIn) { + this.postKernelOptions =3D postKernelOptionsIn; + } = } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= Command.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbl= erCommand.java index c76f886..7793d07 100755 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand= .java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand= .java @@ -253,6 +253,10 @@ public abstract class CobblerCommand { } = protected CobblerConnection getCobblerConnection() { + return getCobblerConnection(user); + } + = + protected static CobblerConnection getCobblerConnection(User user) { if (user =3D=3D null) { return CobblerXMLRPCHelper.getAutomatedConnection(); } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= ProfileCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobble= r/CobblerProfileCommand.java index aed5b69..b19ac62 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfile= Command.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfile= Command.java @@ -171,13 +171,7 @@ public abstract class CobblerProfileCommand extends Co= bblerCommand { */ public static Distro getCobblerDistroForVirtType(KickstartableTree tre= e, = KickstartVirtualizationType virtType, User user) { - CobblerConnection con; - if (user =3D=3D null) { - con =3D CobblerXMLRPCHelper.getAutomatedConnection(); - } - else { - con =3D CobblerXMLRPCHelper.getConnection(user); - } + CobblerConnection con =3D getCobblerConnection(user); if (virtType.equals(KickstartFactory.VIRT_TYPE_XEN_PV)) { if (tree.getCobblerXenId() =3D=3D null) { return null; diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= SystemCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/c= obbler/CobblerSystemCreateCommand.java index 504c3c2..b456db6 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemC= reateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemC= reateCommand.java @@ -14,7 +14,9 @@ */ package com.redhat.rhn.manager.kickstart.cobbler; = +import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.common.validator.ValidatorError; +import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.server.NetworkInterface; import com.redhat.rhn.domain.server.Server; @@ -31,6 +33,7 @@ import org.cobbler.SystemRecord; = import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; @@ -52,6 +55,8 @@ public class CobblerSystemCreateCommand extends CobblerCo= mmand { private String profileName; private String activationKeys; private String kickstartHost; + private String kernelOptions; + private String postKernelOptions; = /** * Constructor @@ -230,7 +235,7 @@ public class CobblerSystemCreateCommand extends Cobbler= Command { } = = - if (!StringUtils.isEmpty(getKickstartHost())) { + if (!StringUtils.isBlank(getKickstartHost())) { invokeXMLRPC("modify_system", handle, "server", getKickstartHost(), xmlRpcToken); } @@ -238,9 +243,33 @@ public class CobblerSystemCreateCommand extends Cobble= rCommand { invokeXMLRPC("modify_system", handle, "server", "", xmlRpcToken); } - - - = + try { + if (!StringUtils.isBlank(kernelOptions)) { + invokeXMLRPC("modify_system", handle, "kopts", + StringUtil.convertOptionsToMap( + kernelOptions, "kickstart.jsp.error.invali= doption", " "), + xmlRpcToken); + } + else { + invokeXMLRPC("modify_system", handle, "kopts", + Collections.EMPTY_MAP, xmlRpcToken); + } + = + if (!StringUtils.isBlank(postKernelOptions)) { + invokeXMLRPC("modify_system", handle, "kopts-post", + StringUtil.convertOptionsToMap( + postKernelOptions, + "kickstart.jsp.error.invalidoption", " "), + xmlRpcToken); + } + else { + invokeXMLRPC("modify_system", handle, "kopts-post", + Collections.EMPTY_MAP, xmlRpcToken); + } = + } + catch (ValidatorException ve) { + return ve.getResult().getErrors().get(0); + } // Setup the kickstart metadata so the URLs and activation key are= setup Map ksmeta =3D new HashMap(); if (!StringUtils.isBlank(mediaPath)) { @@ -257,13 +286,12 @@ public class CobblerSystemCreateCommand extends Cobbl= erCommand { invokeXMLRPC("modify_system", Arrays.asList(args)); = invokeXMLRPC("save_system", handle, xmlRpcToken); - = Map cSystem =3D getSystemMapByMac(); // Virt system records have no mac/interfaces setup so we search o= n name if (cSystem =3D=3D null) { cSystem =3D getSystemMapByName(); } - server.setCobblerId((String)cSystem.get("uid")); + server.setCobblerId((String)cSystem.get("uid")); = return null; } = @@ -323,5 +351,18 @@ public class CobblerSystemCreateCommand extends Cobble= rCommand { public void setKickstartHost(String kickstartHostIn) { this.kickstartHost =3D kickstartHostIn; } - = + + /** + * @param kernelOptionsIn The kernelOptions to set. + */ + public void setKernelOptions(String kernelOptionsIn) { + this.kernelOptions =3D kernelOptionsIn; + } + = + /** + * @param postKernelOptionsIn The postKernelOptions to set. + */ + public void setPostKernelOptions(String postKernelOptionsIn) { + this.postKernelOptions =3D postKernelOptionsIn; + } = } diff --git a/java/code/src/org/cobbler/CobblerObject.java b/java/code/src/o= rg/cobbler/CobblerObject.java index 34566bf..fcb2d0e 100644 --- a/java/code/src/org/cobbler/CobblerObject.java +++ b/java/code/src/org/cobbler/CobblerObject.java @@ -40,7 +40,7 @@ public abstract class CobblerObject { protected static final String OWNERS =3D "owners"; protected static final String CTIME =3D "ctime"; protected static final String KERNEL_OPTIONS_POST =3D "kernel_options_= post"; - protected static final String SET_KERNEL_OPTIONS_POST =3D "kopts-post"; + protected static final String SET_KERNEL_OPTIONS_POST =3D "kopts_post"; protected static final String DEPTH =3D "depth"; protected static final String KERNEL_OPTIONS =3D "kernel_options"; protected static final String SET_KERNEL_OPTIONS =3D "kopts"; diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetail= s.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp index dc89d2c..fe5e969 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp @@ -85,7 +85,7 @@ : -
                                      +
                                      = diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first= .jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp index e637eb7..6c05b7d 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp @@ -61,7 +61,10 @@ function setStep(stepName) { - + = + + + = diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/secon= d.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/second.jsp index c1d0122..408f29b 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/second.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/second.jsp @@ -76,16 +76,77 @@ function setInitialState() { = - - + + + + + = + = + = +
                                      :: + ${requestScope.profile.label= } + + + ${requestScope.distro.label} + + + ${requestScope.distro.label} + + + = + + + :
                                      + ${requestScope.distro_kernel_params} + () + + = +

                                      + + + :
                                      + ${requestScope.profile_kernel_params} + () + +

                                      + = + + + :   

                                      + = = +
                                      : + + + :
                                      + ${requestScope.distro_post_kernel_params} + () +

                                      + = + + + :
                                      + ${requestScope.profile_post_kernel_params} + () +

                                      + = + + + :   

                                      = + +
                                      : - +

                                      - + :   @@ -93,7 +154,9 @@ function setInitialState() { label=3D"name" value=3D"id"/>

                                      - + :   @@ -101,7 +164,9 @@ function setInitialState() { label=3D"name" value=3D"id"/>

                                      = -
                                      = + +
                                      =
                                      diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/= WEB-INF/struts-config.xml index 1b8023b..b20292e 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -729,11 +729,14 @@ - + + + + = --===============1286643810362730501==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:23 2015 Content-Type: multipart/mixed; boundary="===============0373205144679161030==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: java/scripts Date: Mon, 08 Jun 2009 15:23:13 +0000 Message-ID: <20090608152313.C3AC0120197@lists.fedorahosted.org> --===============0373205144679161030== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/scripts/findmissingstrings.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 8e8d15ffcb5bfe68070c32e6f1ecee4ce4d0117e Author: John Matthews Date: Mon Jun 8 11:17:30 2009 -0400 Update for python 2.5+ diff --git a/java/scripts/findmissingstrings.py b/java/scripts/findmissings= trings.py index 01764c2..9807b98 100755 --- a/java/scripts/findmissingstrings.py +++ b/java/scripts/findmissingstrings.py @@ -1,5 +1,10 @@ #!/usr/bin/python -import elementtree.ElementTree as et + +try: + import elementtree.ElementTree as et +except: + import xml.etree.ElementTree as et + import os = skip =3D ["emptyspace.jsp"] --===============0373205144679161030==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:23 2015 Content-Type: multipart/mixed; boundary="===============3946977799913384626==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/scripts Date: Mon, 08 Jun 2009 15:23:54 +0000 Message-ID: <20090608152354.BB0BB12020D@lists.fedorahosted.org> --===============3946977799913384626== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/scripts/findmissingstrings.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 8bd25d70508572754a17fec136f2af91dcfc6991 Author: John Matthews Date: Mon Jun 8 11:17:30 2009 -0400 Update for python 2.5+ diff --git a/java/scripts/findmissingstrings.py b/java/scripts/findmissings= trings.py index 01764c2..9807b98 100755 --- a/java/scripts/findmissingstrings.py +++ b/java/scripts/findmissingstrings.py @@ -1,5 +1,10 @@ #!/usr/bin/python -import elementtree.ElementTree as et + +try: + import elementtree.ElementTree as et +except: + import xml.etree.ElementTree as et + import os = skip =3D ["emptyspace.jsp"] --===============3946977799913384626==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:23 2015 Content-Type: multipart/mixed; boundary="===============2560872150695842244==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: web/modules Date: Mon, 08 Jun 2009 15:50:49 +0000 Message-ID: <20090608155049.E0EC4120197@lists.fedorahosted.org> --===============2560872150695842244== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml | 1 - 1 file changed, 1 deletion(-) New commits: commit a24ed0d729d9726af35a0a472c997b209c17a162 Author: Justin Sherrill Date: Mon Jun 8 11:48:29 2009 -0400 502259 - fixing issue where systems would not show up on applicable sys= tems page of patches diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml b/web= /modules/rhn/RHN/DB/DataSource/xml/System_queries.xml index 6432836..a86912d 100644 --- a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml +++ b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml @@ -1264,7 +1264,6 @@ SELECT S.id, AND SPP.patch_id =3D :pid AND PNEVRA.id =3D SPP.package_nevra_id AND PNEVRA.name_id =3D SP.name_id - AND PNEVRA.evr_id =3D SP.evr_id AND NOT EXISTS (SELECT 1 FROM rhnSolarisPatchedPackage SPdP WHERE SPdP.server_id =3D S.id --===============2560872150695842244==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:24 2015 Content-Type: multipart/mixed; boundary="===============6823209423835266417==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - web/modules Date: Mon, 08 Jun 2009 15:51:13 +0000 Message-ID: <20090608155113.05127120197@lists.fedorahosted.org> --===============6823209423835266417== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml | 1 - 1 file changed, 1 deletion(-) New commits: commit caf97d10bf5661219505eb4cca31d50d73d3f844 Author: Justin Sherrill Date: Mon Jun 8 11:48:29 2009 -0400 502259 - fixing issue where systems would not show up on applicable sys= tems page of patches diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml b/web= /modules/rhn/RHN/DB/DataSource/xml/System_queries.xml index 6432836..a86912d 100644 --- a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml +++ b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml @@ -1264,7 +1264,6 @@ SELECT S.id, AND SPP.patch_id =3D :pid AND PNEVRA.id =3D SPP.package_nevra_id AND PNEVRA.name_id =3D SP.name_id - AND PNEVRA.evr_id =3D SP.evr_id AND NOT EXISTS (SELECT 1 FROM rhnSolarisPatchedPackage SPdP WHERE SPdP.server_id =3D S.id --===============6823209423835266417==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:24 2015 Content-Type: multipart/mixed; boundary="===============4259641543651294792==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: backend/server Date: Mon, 08 Jun 2009 16:39:59 +0000 Message-ID: <20090608163959.3A0D9120197@lists.fedorahosted.org> --===============4259641543651294792== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/rhnSQL/driver_cx_Oracle.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit e71b5f2a44c68a710dc376a0c1fe4e1bacea99e9 Author: Pradeep Kilambi Date: Mon Jun 8 12:39:51 2009 -0400 502581 - splitting the data to smaller chunks to please cx_oracle to av= oid throwing array too big errors diff --git a/backend/server/rhnSQL/driver_cx_Oracle.py b/backend/server/rhn= SQL/driver_cx_Oracle.py index 903fdde..e64348a 100644 --- a/backend/server/rhnSQL/driver_cx_Oracle.py +++ b/backend/server/rhnSQL/driver_cx_Oracle.py @@ -116,6 +116,9 @@ class Cursor(sql_base.Cursor): elif 20000 <=3D errno <=3D 20999: # error codes we know we rai= se as schema errors raise apply(sql_base.SQLSchemaError, ret) raise apply(sql_base.SQLError, ret) + except ValueError: + # this is not good.Let the user know + raise else: self.reparsed =3D 0 # reset the reparsed counter # Munge back the values @@ -151,7 +154,7 @@ class Cursor(sql_base.Cursor): if not kwargs: return 0 # Compute number of values - max_array_size =3D 100 + max_array_size =3D 25 i =3D kwargs.itervalues() firstval =3D i.next() array_size =3D len(firstval) --===============4259641543651294792==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:24 2015 Content-Type: multipart/mixed; boundary="===============3228460851846475967==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - backend/server Date: Mon, 08 Jun 2009 16:40:41 +0000 Message-ID: <20090608164041.37821120197@lists.fedorahosted.org> --===============3228460851846475967== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/rhnSQL/driver_cx_Oracle.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit b3052cb98db03601b2c393432954c904bf747c27 Author: Pradeep Kilambi Date: Mon Jun 8 12:39:51 2009 -0400 502581 - splitting the data to smaller chunks to please cx_oracle to av= oid throwing array too big errors diff --git a/backend/server/rhnSQL/driver_cx_Oracle.py b/backend/server/rhn= SQL/driver_cx_Oracle.py index 903fdde..e64348a 100644 --- a/backend/server/rhnSQL/driver_cx_Oracle.py +++ b/backend/server/rhnSQL/driver_cx_Oracle.py @@ -116,6 +116,9 @@ class Cursor(sql_base.Cursor): elif 20000 <=3D errno <=3D 20999: # error codes we know we rai= se as schema errors raise apply(sql_base.SQLSchemaError, ret) raise apply(sql_base.SQLError, ret) + except ValueError: + # this is not good.Let the user know + raise else: self.reparsed =3D 0 # reset the reparsed counter # Munge back the values @@ -151,7 +154,7 @@ class Cursor(sql_base.Cursor): if not kwargs: return 0 # Compute number of values - max_array_size =3D 100 + max_array_size =3D 25 i =3D kwargs.itervalues() firstval =3D i.next() array_size =3D len(firstval) --===============3228460851846475967==-- From partha at fedoraproject.org Thu Aug 20 11:57:24 2015 Content-Type: multipart/mixed; boundary="===============2219695497320991281==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Mon, 08 Jun 2009 18:00:45 +0000 Message-ID: <20090608180045.C8903120197@lists.fedorahosted.org> --===============2219695497320991281== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/Provis= ionVirtualizationWizardAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f20660ad707fc881fbd54948d0187b9fd5d84cb6 Author: Partha Aji Date: Mon Jun 8 14:03:01 2009 -0400 Fixed a compile error diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualiz= ation/ProvisionVirtualizationWizardAction.java b/java/code/src/com/redhat/r= hn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardActi= on.java index 56ceb30..0f3f94b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/P= rovisionVirtualizationWizardAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/P= rovisionVirtualizationWizardAction.java @@ -168,7 +168,7 @@ public class ProvisionVirtualizationWizardAction extend= s ScheduleKickstartWizard cmd.setActivationKeyId((Long) form.get(ACTIVATION_KEY)); } = - cmd.setKernelParams(form.getString(KERNEL_PARAMS)); + cmd.setKernelOptions(form.getString(KERNEL_PARAMS)); = cmd.setProfileType(form.getString("targetProfileType")); cmd.setServerProfileId((Long) form.get("targetProfile")); --===============2219695497320991281==-- From shughes at fedoraproject.org Thu Aug 20 11:57:24 2015 Content-Type: multipart/mixed; boundary="===============2817519627489733006==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Mon, 08 Jun 2009 19:14:37 +0000 Message-ID: <20090608191437.E2267120197@lists.fedorahosted.org> --===============2817519627489733006== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml = | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit a5909b6e65ac092e9c38b2a8268b1b0e32b01cb5 Author: Shannon Hughes Date: Mon Jun 8 15:08:12 2009 -0400 504652 - remove default column from rhnchanneldist map query diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_= queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel= _queries.xml index 1596c68..2e8a38a 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml @@ -849,8 +849,7 @@ SELECT C.id, C.name, C.label, 1 AS IS_CUSTOM where rcm.version =3D :version and rcm.channel_arch_id =3D :channel_arch_id - and rcm.channel_id =3D c.id - and rcm.is_default =3D 'Y' + and rcm.channel_id =3D c.id = and cp.org_id =3D :org_id and pn.id =3D c.product_name_id and pn.label =3D :product_name_label --===============2817519627489733006==-- From shughes at fedoraproject.org Thu Aug 20 11:57:24 2015 Content-Type: multipart/mixed; boundary="===============8949114724705494318==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Mon, 08 Jun 2009 19:15:34 +0000 Message-ID: <20090608191534.3F31F120197@lists.fedorahosted.org> --===============8949114724705494318== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml = | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 670b5e7069584585998e9921f337599268f830b7 Author: Shannon Hughes Date: Mon Jun 8 15:08:12 2009 -0400 504652 - remove default column from rhnchanneldist map query diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_= queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel= _queries.xml index 92fbc33..ecfa02e 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml @@ -849,8 +849,7 @@ SELECT C.id, C.name, C.label, 1 AS IS_CUSTOM where rcm.version =3D :version and rcm.channel_arch_id =3D :channel_arch_id - and rcm.channel_id =3D c.id - and rcm.is_default =3D 'Y' + and rcm.channel_id =3D c.id = and cp.org_id =3D :org_id and pn.id =3D c.product_name_id and pn.label =3D :product_name_label --===============8949114724705494318==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:24 2015 Content-Type: multipart/mixed; boundary="===============2418625966484932274==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Mon, 08 Jun 2009 20:14:44 +0000 Message-ID: <20090608201444.6A35A120197@lists.fedorahosted.org> --===============2418625966484932274== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEdi= tAction.java | 16 +--- java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.ja= va | 12 --- java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileComma= nd.java | 8 +- java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreate= Command.java | 36 +--------- 4 files changed, 17 insertions(+), 55 deletions(-) New commits: commit 5637d5bc1f5c0a57f3c8bc95c39bc3b397c99ab0 Author: Justin Sherrill Date: Mon Jun 8 16:14:24 2009 -0400 501388 - fixing kernel options on profile and scheduling pages to use n= ewer CobblerObject based parsing diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Kicksta= rtDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kic= kstart/KickstartDetailsEditAction.java index 94838b3..e52e191 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetai= lsEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetai= lsEditAction.java @@ -16,7 +16,6 @@ package com.redhat.rhn.frontend.action.kickstart; = = import com.redhat.rhn.common.conf.Config; -import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.domain.kickstart.KickstartData; @@ -144,10 +143,8 @@ public class KickstartDetailsEditAction extends BaseKi= ckstartEditAction { Profile prof =3D Profile.lookupById(helper.getConnection(ctx.getLo= ggedInUser()), = data.getCobblerId()); if (prof !=3D null) { - form.set(KERNEL_OPTIONS, StringUtil.convertMapToString( - prof.getKernelOptions(), " ")); - form.set(POST_KERNEL_OPTIONS, StringUtil.convertMapToString( - prof.getKernelPostOptions(), " ")); + form.set(KERNEL_OPTIONS, prof.getKernelOptionsString()); + form.set(POST_KERNEL_OPTIONS, prof.getKernelPostOptionsString(= )); } = if (prof =3D=3D null) { @@ -290,11 +287,10 @@ public class KickstartDetailsEditAction extends BaseK= ickstartEditAction { public static void processCobblerFormValues(KickstartData ksdata, = DynaActionForm form, User user= ) { CobblerProfileEditCommand cmd =3D new CobblerProfileEditCommand(ks= data, user); - cmd.setKernelOptions(StringUtil.convertOptionsToMap( - form.getString(KERNEL_OPTIONS), "kickstart.jsp.error.inval= idoption", " ")); - cmd.setPostKernelOptions(StringUtil.convertOptionsToMap( - form.getString(POST_KERNEL_OPTIONS), = - "kickstart.jsp.error.invalidoption= ", " ")); + + cmd.setKernelOptions(StringUtils.defaultString(form.getString(KERN= EL_OPTIONS))); + cmd.setPostKernelOptions(StringUtils.defaultString( + form.getString(POST_KERNEL_OPTIONS))); cmd.store(); = CobblerXMLRPCHelper helper =3D new CobblerXMLRPCHelper(); diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSchedu= leCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSc= heduleCommand.java index 5f56e6d..3f95d81 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java @@ -950,17 +950,7 @@ public class KickstartScheduleCommand extends BaseSyst= emOperation { return ""; } StringBuilder retval =3D new StringBuilder(); - = - retval.append("ks=3D"); - if (this.proxyHost !=3D null) { - retval.append(kickstartSession.getUrl(this.proxyHost, = - this.scheduleDate)); - } - else { - retval.append(kickstartSession.getUrl(this.kickstartServerName= , = - this.scheduleDate)); - } = - = + String extraParams =3D " ksdevice=3Deth0"; /** Some examples: dhcp:eth0 , dhcp:eth2, static:10.1.4.75 diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= ProfileCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobble= r/CobblerProfileCommand.java index b19ac62..5928490 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfile= Command.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfile= Command.java @@ -40,8 +40,8 @@ public abstract class CobblerProfileCommand extends Cobbl= erCommand { = private static Logger log =3D Logger.getLogger(CobblerProfileCommand.c= lass); = - private Map kernelOptions; - private Map postKernelOptions; + private String kernelOptions; + private String postKernelOptions; = = protected KickstartData ksData; @@ -147,7 +147,7 @@ public abstract class CobblerProfileCommand extends Cob= blerCommand { /** * @param kernelOptionsIn The kernelOptions to set. */ - public void setKernelOptions(Map kernelOptionsIn) { + public void setKernelOptions(String kernelOptionsIn) { this.kernelOptions =3D kernelOptionsIn; } = @@ -156,7 +156,7 @@ public abstract class CobblerProfileCommand extends Cob= blerCommand { /** * @param postKernelOptionsIn The postKernelOptions to set. */ - public void setPostKernelOptions(Map postKernelOptionsIn) { + public void setPostKernelOptions(String postKernelOptionsIn) { this.postKernelOptions =3D postKernelOptionsIn; } = diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= SystemCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/c= obbler/CobblerSystemCreateCommand.java index b456db6..c87cdc2 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemC= reateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemC= reateCommand.java @@ -14,9 +14,7 @@ */ package com.redhat.rhn.manager.kickstart.cobbler; = -import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.common.validator.ValidatorError; -import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.server.NetworkInterface; import com.redhat.rhn.domain.server.Server; @@ -33,7 +31,6 @@ import org.cobbler.SystemRecord; = import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; @@ -243,33 +240,7 @@ public class CobblerSystemCreateCommand extends Cobble= rCommand { invokeXMLRPC("modify_system", handle, "server", "", xmlRpcToken); } - try { - if (!StringUtils.isBlank(kernelOptions)) { - invokeXMLRPC("modify_system", handle, "kopts", - StringUtil.convertOptionsToMap( - kernelOptions, "kickstart.jsp.error.invali= doption", " "), - xmlRpcToken); - } - else { - invokeXMLRPC("modify_system", handle, "kopts", - Collections.EMPTY_MAP, xmlRpcToken); - } - = - if (!StringUtils.isBlank(postKernelOptions)) { - invokeXMLRPC("modify_system", handle, "kopts-post", - StringUtil.convertOptionsToMap( - postKernelOptions, - "kickstart.jsp.error.invalidoption", " "), - xmlRpcToken); - } - else { - invokeXMLRPC("modify_system", handle, "kopts-post", - Collections.EMPTY_MAP, xmlRpcToken); - } = - } - catch (ValidatorException ve) { - return ve.getResult().getErrors().get(0); - } + // Setup the kickstart metadata so the URLs and activation key are= setup Map ksmeta =3D new HashMap(); if (!StringUtils.isBlank(mediaPath)) { @@ -292,6 +263,11 @@ public class CobblerSystemCreateCommand extends Cobble= rCommand { cSystem =3D getSystemMapByName(); } server.setCobblerId((String)cSystem.get("uid")); = + SystemRecord record =3D SystemRecord.lookupById(getCobblerConnecti= on(), + server.getCobblerId()); + record.setKernelOptions(kernelOptions); + record.setKernelPostOptions(postKernelOptions); + record.save(); return null; } = --===============2418625966484932274==-- From partha at fedoraproject.org Thu Aug 20 11:57:24 2015 Content-Type: multipart/mixed; boundary="===============0221772275865694254==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Mon, 08 Jun 2009 23:14:59 +0000 Message-ID: <20090608231459.55566120197@lists.fedorahosted.org> --===============0221772275865694254== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWi= zardAction.java | 26 + java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/Provis= ionVirtualizationWizardAction.java | 4 = java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.ja= va | 30 - java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advance= d.jspf | 60 +++ java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-= options.jspf | 66 +++ java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile= -sync.jspf | 41 ++ java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/virt-op= tions.jspf | 52 ++ java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/second.jsp = | 186 ---------- java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/se= cond.jsp | 170 --------- 9 files changed, 267 insertions(+), 368 deletions(-) New commits: commit 0303558e094452c8c25e449572094c0d60326639 Author: Partha Aji Date: Mon Jun 8 19:17:17 2009 -0400 501388 - Fixed the guest provisioning side of things also to conform to= the new UI diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Schedul= eKickstartWizardAction.java b/java/code/src/com/redhat/rhn/frontend/action/= kickstart/ScheduleKickstartWizardAction.java index 50b1afe..1524c6e 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickst= artWizardAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickst= artWizardAction.java @@ -47,6 +47,7 @@ import org.apache.struts.action.ActionMapping; import org.apache.struts.action.DynaActionForm; import org.cobbler.CobblerConnection; import org.cobbler.Distro; +import org.cobbler.SystemRecord; = import java.lang.reflect.Method; import java.util.Collections; @@ -95,6 +96,7 @@ public class ScheduleKickstartWizardAction extends RhnWiz= ardAction { public static final String HOST_SID =3D "hostSid"; public static final String VIRT_HOST_IS_REGISTERED =3D "virtHostIsRegi= stered"; = + public static final String TARGET_PROFILE_TYPE =3D "targetProfileType"; /** * {@inheritDoc} */ @@ -293,10 +295,15 @@ public class ScheduleKickstartWizardAction extends Rh= nWizardAction { form.set(USE_EXISTING_PROFILE, Boolean.TRUE.toString()); } = + if (StringUtils.isEmpty(form.getString(TARGET_PROFILE_TYPE))) { + form.set(TARGET_PROFILE_TYPE, = + KickstartScheduleCommand.TARGET_PROFILE_TYPE_EXIST= ING); + } + = if (StringUtils.isEmpty(form.getString(KERNEL_PARAMS_TYPE))) { form.set(KERNEL_PARAMS_TYPE, KERNEL_PARAMS_DISTRO); } - = + if (StringUtils.isEmpty(form.getString(POST_KERNEL_PARAMS_TYPE))) { form.set(POST_KERNEL_PARAMS_TYPE, KERNEL_PARAMS_DISTRO); } @@ -330,7 +337,20 @@ public class ScheduleKickstartWizardAction extends Rhn= WizardAction { profile.getKernelOptionsString()); ctx.getRequest().setAttribute("profile_post_kernel_params", profile.getKernelPostOptionsString= ()); - + if (cmd.getServer().getCobblerId() !=3D null) { + SystemRecord rec =3D SystemRecord. + lookupById(con, cmd.getServer().getCobblerId()); + if (rec !=3D null && profile.getName().equals(rec.getProfi= le())) { + if (StringUtils.isBlank(form.getString(KERNEL_PARAMS_T= YPE))) { + form.set(KERNEL_PARAMS_TYPE, KERNEL_PARAMS_CUSTOM); + form.set(KERNEL_PARAMS, rec.getKernelOptionsString= ()); + } + if (StringUtils.isBlank(form.getString(POST_KERNEL_PAR= AMS_TYPE))) { + form.set(POST_KERNEL_PARAMS_TYPE, KERNEL_PARAMS_CU= STOM); + form.set(POST_KERNEL_PARAMS, rec.getKernelPostOpti= onsString()); + } + } + } } } = @@ -437,7 +457,7 @@ public class ScheduleKickstartWizardAction extends RhnW= izardAction { * through advanced config and there is no package profile= to * sync in the kickstart profile */ - cmd.setProfileType(form.getString("targetProfileType")); + cmd.setProfileType(form.getString(TARGET_PROFILE_TYPE)); cmd.setServerProfileId((Long) form.get("targetProfile")); cmd.setProfileId((Long) form.get("targetProfile")); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualiz= ation/ProvisionVirtualizationWizardAction.java b/java/code/src/com/redhat/r= hn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardActi= on.java index 0f3f94b..eaaf417 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/P= rovisionVirtualizationWizardAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/P= rovisionVirtualizationWizardAction.java @@ -119,6 +119,10 @@ public class ProvisionVirtualizationWizardAction exten= ds ScheduleKickstartWizard form.set(VIRTUAL_BRIDGE, String.valueOf(pf.getVirtBridge())); } = + if (StringUtils.isEmpty(form.getString(TARGET_PROFILE_TYPE))) { + form.set(TARGET_PROFILE_TYPE, = + KickstartScheduleCommand.TARGET_PROFILE_TYPE_NONE); + } = return super.runSecond(mapping, form, ctx, response, step); } = diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSchedu= leCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSc= heduleCommand.java index 3f95d81..ea0650b 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java @@ -950,8 +950,7 @@ public class KickstartScheduleCommand extends BaseSyste= mOperation { return ""; } StringBuilder retval =3D new StringBuilder(); - - String extraParams =3D " ksdevice=3Deth0"; + String kOptions =3D StringUtils.defaultString(kernelOptions); /** Some examples: dhcp:eth0 , dhcp:eth2, static:10.1.4.75 static:146.108.30.184, static:auto, static:eth0 @@ -960,27 +959,30 @@ public class KickstartScheduleCommand extends BaseSys= temOperation { staticDevice =3D this.getKsdata().getStaticDevice(); if (staticDevice.indexOf("dhcp:") >=3D 0) { // Get rid of the dhcp: - extraParams =3D " ksdevice=3D" + staticDevice.substring( + String params =3D " ksdevice=3D" + staticDevice.substring( staticDevice.indexOf("dhcp:") + "dhcp:".length()); - log.debug("extraParams: " + extraParams); + if (!kOptions.contains("ksdevice=3Deth0")) { + retval.append(" ksdevice=3Deth0 "); + } + = + if (!kOptions.contains(params)) { + retval.append(params); + } staticDevice =3D ""; } else if (staticDevice.indexOf("static:") >=3D 0) { // Get rid of the static: staticDevice =3D staticDevice.substring( staticDevice.indexOf("static:") + "static:".length= ()); - extraParams =3D ""; + = + } + else { + if (!kOptions.contains("ksdevice=3Deth0")) { + retval.append("ksdevice=3Deth0"); + } } } - if (!StringUtils.isBlank(kernelOptions)) { - extraParams =3D extraParams + " " + this.kernelOptions; - } - retval.append(extraParams); - = - log.debug("extraParams: " + extraParams); - log.debug("staticDevice: " + staticDevice); - log.debug("retval: " + retval); - = + retval.append(" ").append(kOptions); return retval.toString(); } = diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/sche= dule/advanced.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickst= art/schedule/advanced.jspf new file mode 100644 index 0000000..3840730 --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ad= vanced.jspf @@ -0,0 +1,60 @@ +<%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> +<%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> + + + + + + + + + + +<%@ include file=3D"/WEB-INF/pages/common/fragments/systems/system-header.= jspf" %> + +

                                      + + + + + + + + + + + + + + + + <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/schedu= le/kernel-options.jspf" %> + <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/schedu= le/profile-sync.jspf" %> +
                                      + = + <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/schedul= e/virt-options.jspf" %> + +
                                      + + + + = + + + + diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/sche= dule/kernel-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/= kickstart/schedule/kernel-options.jspf new file mode 100644 index 0000000..602b346 --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ke= rnel-options.jspf @@ -0,0 +1,66 @@ +<%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> +<%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> + + + + + + + + + = + = diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/sche= dule/profile-sync.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/ki= ckstart/schedule/profile-sync.jspf new file mode 100644 index 0000000..23ae53a --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/pr= ofile-sync.jspf @@ -0,0 +1,41 @@ +<%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> +<%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> + + + + + diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/sche= dule/virt-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/ki= ckstart/schedule/virt-options.jspf new file mode 100644 index 0000000..890159a --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/vi= rt-options.jspf @@ -0,0 +1,52 @@ +<%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> +<%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> + +

                                      + +

                                      +
                                      + " onclick=3D"setStep('first');moveNext();" /> = + " onclick=3D"setStep('third');moveNext();" /> +
                                      : + ${requestScope.profile.label= } + + + ${requestScope.distro.label} + + + ${requestScope.distro.label} + + + = + + + :
                                      + ${requestScope.distro_kernel_params} + () + + = +

                                      + + + :
                                      + ${requestScope.profile_kernel_params} + () + +

                                      + = + + + :   

                                      + = = +
                                      : + + + :
                                      + ${requestScope.distro_post_kernel_params} + () +

                                      + = + + + :
                                      + ${requestScope.profile_post_kernel_params} + () +

                                      + = + + + :   

                                      = + +
                                      : + + + +

                                      +
                                      + + + :   + + + +

                                      + + + :   + = + + +

                                      = + +
                                      = +
                                      + + + + + + + + + + + + = + + + + = + + + = +
                                      + + +
                                      + +
                                      + +
                                      + + + +
                                      : + + + = +
                                      : + + +
                                      + +

                                      +
                                      diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/secon= d.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/second.jsp index 408f29b..2572970 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/second.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/second.jsp @@ -1,184 +1,4 @@ <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> -<%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> -<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> -<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> - - - - - - - - - - - -<%@ include file=3D"/WEB-INF/pages/common/fragments/systems/system-header.= jspf" %> - -
                                      -

                                      - - - - - - - - - - - - - - - - - = - - - - - - - - = - = - = - - - - -
                                      : - ${requestScope.profile.label= } - - - ${requestScope.distro.label} - - - ${requestScope.distro.label} - - - = - - - :
                                      - ${requestScope.distro_kernel_params} - () - - = -

                                      - - - :
                                      - ${requestScope.profile_kernel_params} - () - -

                                      - = - - - :   

                                      - = = -
                                      : - - - :
                                      - ${requestScope.distro_post_kernel_params} - () -

                                      - = - - - :
                                      - ${requestScope.profile_post_kernel_params} - () -

                                      - = - - - :   

                                      = - -
                                      : - - -

                                      - - - :   - - - -

                                      - - - :   - - - -

                                      = - -
                                      = -
                                      -
                                      - - - - = - - - - + + +<%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/schedule/adv= anced.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/= provision/second.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtu= alization/provision/second.jsp index 915e760..05fe14a 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provisi= on/second.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provisi= on/second.jsp @@ -1,169 +1,3 @@ <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> -<%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> -<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> -<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> - - - - - - - - - - - - - - - - - - -<%@ include file=3D"/WEB-INF/pages/common/fragments/systems/system-header.= jspf" %> - -

                                      - - - - - - - - - - - - - - -
                                      - " onclick=3D"setStep('first');moveNext();" /> = - " onclick=3D"setStep('third');moveNext();" /> -
                                      = - - - - - - - - -
                                      :
                                      : - - - -

                                      = - - - :   - - - -

                                      - - - :   - - - -
                                      - = -

                                      - -

                                      - - - - - - - - - - - - - = - - - - = - - - = - = -
                                      - - -
                                      - -
                                      - -
                                      - - - -
                                      : - - - = -
                                      : - - -
                                      - -
                                      - = - = -
                                      - - - - = - - - - + +<%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/schedule/adv= anced.jspf" %> \ No newline at end of file --===============0221772275865694254==-- From partha at fedoraproject.org Thu Aug 20 11:57:24 2015 Content-Type: multipart/mixed; boundary="===============7947521401168094352==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 4 commits - java/code Date: Mon, 08 Jun 2009 23:18:07 +0000 Message-ID: <20090608231807.AF38E120197@lists.fedorahosted.org> --===============7947521401168094352== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/util/StringUtil.java = | 12 = java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEdi= tAction.java | 15 = java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartVariableAc= tion.java | 2 = java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWi= zardAction.java | 145 +++++++- java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/Provis= ionVirtualizationWizardAction.java | 6 = java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xm= l | 9 = java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml= | 126 ++----- java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.ja= va | 112 +++--- java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand.java= | 4 = java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileComma= nd.java | 16 = java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreate= Command.java | 29 + java/code/src/org/cobbler/CobblerObject.java = | 2 = java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advance= d.jspf | 60 +++ java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-= options.jspf | 66 +++ java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile= -sync.jspf | 41 ++ java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/virt-op= tions.jspf | 52 +++ java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp = | 2 = java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp = | 5 = java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/second.jsp = | 121 ------- java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/se= cond.jsp | 170 ---------- java/code/webapp/WEB-INF/struts-config.xml = | 5 = 21 files changed, 514 insertions(+), 486 deletions(-) New commits: commit bea52fa08d616188ad5c8abe242b7689b73e83a5 Author: Partha Aji Date: Mon Jun 8 19:17:17 2009 -0400 501388 - Fixed the guest provisioning side of things also to conform to= the new UI diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Schedul= eKickstartWizardAction.java b/java/code/src/com/redhat/rhn/frontend/action/= kickstart/ScheduleKickstartWizardAction.java index 50b1afe..1524c6e 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickst= artWizardAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickst= artWizardAction.java @@ -47,6 +47,7 @@ import org.apache.struts.action.ActionMapping; import org.apache.struts.action.DynaActionForm; import org.cobbler.CobblerConnection; import org.cobbler.Distro; +import org.cobbler.SystemRecord; = import java.lang.reflect.Method; import java.util.Collections; @@ -95,6 +96,7 @@ public class ScheduleKickstartWizardAction extends RhnWiz= ardAction { public static final String HOST_SID =3D "hostSid"; public static final String VIRT_HOST_IS_REGISTERED =3D "virtHostIsRegi= stered"; = + public static final String TARGET_PROFILE_TYPE =3D "targetProfileType"; /** * {@inheritDoc} */ @@ -293,10 +295,15 @@ public class ScheduleKickstartWizardAction extends Rh= nWizardAction { form.set(USE_EXISTING_PROFILE, Boolean.TRUE.toString()); } = + if (StringUtils.isEmpty(form.getString(TARGET_PROFILE_TYPE))) { + form.set(TARGET_PROFILE_TYPE, = + KickstartScheduleCommand.TARGET_PROFILE_TYPE_EXIST= ING); + } + = if (StringUtils.isEmpty(form.getString(KERNEL_PARAMS_TYPE))) { form.set(KERNEL_PARAMS_TYPE, KERNEL_PARAMS_DISTRO); } - = + if (StringUtils.isEmpty(form.getString(POST_KERNEL_PARAMS_TYPE))) { form.set(POST_KERNEL_PARAMS_TYPE, KERNEL_PARAMS_DISTRO); } @@ -330,7 +337,20 @@ public class ScheduleKickstartWizardAction extends Rhn= WizardAction { profile.getKernelOptionsString()); ctx.getRequest().setAttribute("profile_post_kernel_params", profile.getKernelPostOptionsString= ()); - + if (cmd.getServer().getCobblerId() !=3D null) { + SystemRecord rec =3D SystemRecord. + lookupById(con, cmd.getServer().getCobblerId()); + if (rec !=3D null && profile.getName().equals(rec.getProfi= le())) { + if (StringUtils.isBlank(form.getString(KERNEL_PARAMS_T= YPE))) { + form.set(KERNEL_PARAMS_TYPE, KERNEL_PARAMS_CUSTOM); + form.set(KERNEL_PARAMS, rec.getKernelOptionsString= ()); + } + if (StringUtils.isBlank(form.getString(POST_KERNEL_PAR= AMS_TYPE))) { + form.set(POST_KERNEL_PARAMS_TYPE, KERNEL_PARAMS_CU= STOM); + form.set(POST_KERNEL_PARAMS, rec.getKernelPostOpti= onsString()); + } + } + } } } = @@ -437,7 +457,7 @@ public class ScheduleKickstartWizardAction extends RhnW= izardAction { * through advanced config and there is no package profile= to * sync in the kickstart profile */ - cmd.setProfileType(form.getString("targetProfileType")); + cmd.setProfileType(form.getString(TARGET_PROFILE_TYPE)); cmd.setServerProfileId((Long) form.get("targetProfile")); cmd.setProfileId((Long) form.get("targetProfile")); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualiz= ation/ProvisionVirtualizationWizardAction.java b/java/code/src/com/redhat/r= hn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardActi= on.java index 0f3f94b..eaaf417 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/P= rovisionVirtualizationWizardAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/P= rovisionVirtualizationWizardAction.java @@ -119,6 +119,10 @@ public class ProvisionVirtualizationWizardAction exten= ds ScheduleKickstartWizard form.set(VIRTUAL_BRIDGE, String.valueOf(pf.getVirtBridge())); } = + if (StringUtils.isEmpty(form.getString(TARGET_PROFILE_TYPE))) { + form.set(TARGET_PROFILE_TYPE, = + KickstartScheduleCommand.TARGET_PROFILE_TYPE_NONE); + } = return super.runSecond(mapping, form, ctx, response, step); } = diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSchedu= leCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSc= heduleCommand.java index 3f95d81..ea0650b 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java @@ -950,8 +950,7 @@ public class KickstartScheduleCommand extends BaseSyste= mOperation { return ""; } StringBuilder retval =3D new StringBuilder(); - - String extraParams =3D " ksdevice=3Deth0"; + String kOptions =3D StringUtils.defaultString(kernelOptions); /** Some examples: dhcp:eth0 , dhcp:eth2, static:10.1.4.75 static:146.108.30.184, static:auto, static:eth0 @@ -960,27 +959,30 @@ public class KickstartScheduleCommand extends BaseSys= temOperation { staticDevice =3D this.getKsdata().getStaticDevice(); if (staticDevice.indexOf("dhcp:") >=3D 0) { // Get rid of the dhcp: - extraParams =3D " ksdevice=3D" + staticDevice.substring( + String params =3D " ksdevice=3D" + staticDevice.substring( staticDevice.indexOf("dhcp:") + "dhcp:".length()); - log.debug("extraParams: " + extraParams); + if (!kOptions.contains("ksdevice=3Deth0")) { + retval.append(" ksdevice=3Deth0 "); + } + = + if (!kOptions.contains(params)) { + retval.append(params); + } staticDevice =3D ""; } else if (staticDevice.indexOf("static:") >=3D 0) { // Get rid of the static: staticDevice =3D staticDevice.substring( staticDevice.indexOf("static:") + "static:".length= ()); - extraParams =3D ""; + = + } + else { + if (!kOptions.contains("ksdevice=3Deth0")) { + retval.append("ksdevice=3Deth0"); + } } } - if (!StringUtils.isBlank(kernelOptions)) { - extraParams =3D extraParams + " " + this.kernelOptions; - } - retval.append(extraParams); - = - log.debug("extraParams: " + extraParams); - log.debug("staticDevice: " + staticDevice); - log.debug("retval: " + retval); - = + retval.append(" ").append(kOptions); return retval.toString(); } = diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/sche= dule/advanced.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickst= art/schedule/advanced.jspf new file mode 100644 index 0000000..3840730 --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ad= vanced.jspf @@ -0,0 +1,60 @@ +<%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> +<%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> + + + + + + + + + + +<%@ include file=3D"/WEB-INF/pages/common/fragments/systems/system-header.= jspf" %> + +

                                      + + + + + + + + + + + + + + +
                                      - " onclick=3D"setStep('first');moveNext();" /> = - " onclick=3D"setStep('third');moveNext();" /> -
                                      + <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/schedu= le/kernel-options.jspf" %> + <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/schedu= le/profile-sync.jspf" %> +
                                      + = + <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/schedul= e/virt-options.jspf" %> + +
                                      + + + + = + + + + diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/sche= dule/kernel-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/= kickstart/schedule/kernel-options.jspf new file mode 100644 index 0000000..602b346 --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ke= rnel-options.jspf @@ -0,0 +1,66 @@ +<%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> +<%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> + + + + + + + + + = + = diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/sche= dule/profile-sync.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/ki= ckstart/schedule/profile-sync.jspf new file mode 100644 index 0000000..23ae53a --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/pr= ofile-sync.jspf @@ -0,0 +1,41 @@ +<%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> +<%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> + + + + + diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/sche= dule/virt-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/ki= ckstart/schedule/virt-options.jspf new file mode 100644 index 0000000..890159a --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/vi= rt-options.jspf @@ -0,0 +1,52 @@ +<%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> +<%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> + +

                                      + +

                                      +
                                      + " onclick=3D"setStep('first');moveNext();" /> = + " onclick=3D"setStep('third');moveNext();" /> +
                                      : + ${requestScope.profile.label= } + + + ${requestScope.distro.label} + + + ${requestScope.distro.label} + + + = + + + :
                                      + ${requestScope.distro_kernel_params} + () + + = +

                                      + + + :
                                      + ${requestScope.profile_kernel_params} + () + +

                                      + = + + + :   

                                      + = = +
                                      : + + + :
                                      + ${requestScope.distro_post_kernel_params} + () +

                                      + = + + + :
                                      + ${requestScope.profile_post_kernel_params} + () +

                                      + = + + + :   

                                      = + +
                                      : + + + +

                                      +
                                      + + + :   + + + +

                                      + + + :   + = + + +

                                      = + +
                                      = +
                                      + + + + + + + + + + + + = + + + + = + + + = +
                                      + + +
                                      + +
                                      + +
                                      + + + +
                                      : + + + = +
                                      : + + +
                                      + +

                                      +
                                      diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/secon= d.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/second.jsp index 408f29b..2572970 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/second.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/second.jsp @@ -1,184 +1,4 @@ <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> -<%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> -<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> -<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> - - - - - - - - - - - -<%@ include file=3D"/WEB-INF/pages/common/fragments/systems/system-header.= jspf" %> - -
                                      -

                                      - - - - - - - - - - - - - - - - - = - - - - - - - - = - = - = - - - - -
                                      : - ${requestScope.profile.label= } - - - ${requestScope.distro.label} - - - ${requestScope.distro.label} - - - = - - - :
                                      - ${requestScope.distro_kernel_params} - () - - = -

                                      - - - :
                                      - ${requestScope.profile_kernel_params} - () - -

                                      - = - - - :   

                                      - = = -
                                      : - - - :
                                      - ${requestScope.distro_post_kernel_params} - () -

                                      - = - - - :
                                      - ${requestScope.profile_post_kernel_params} - () -

                                      - = - - - :   

                                      = - -
                                      : - - -

                                      - - - :   - - - -

                                      - - - :   - - - -

                                      = - -
                                      = -
                                      -
                                      - - - - = - - - - + + +<%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/schedule/adv= anced.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/= provision/second.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtu= alization/provision/second.jsp index 915e760..05fe14a 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provisi= on/second.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provisi= on/second.jsp @@ -1,169 +1,3 @@ <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> -<%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> -<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> -<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> - - - - - - - - - - - - - - - - - - -<%@ include file=3D"/WEB-INF/pages/common/fragments/systems/system-header.= jspf" %> - -

                                      - - - - - - - - - - - - - - -
                                      - " onclick=3D"setStep('first');moveNext();" /> = - " onclick=3D"setStep('third');moveNext();" /> -
                                      = - - - - - - - - -
                                      :
                                      : - - - -

                                      = - - - :   - - - -

                                      - - - :   - - - -
                                      - = -

                                      - -

                                      - - - - - - - - - - - - - = - - - - = - - - = - = -
                                      - - -
                                      - -
                                      - -
                                      - - - -
                                      : - - - = -
                                      : - - -
                                      - -
                                      - = - = -
                                      - - - - = - - - - + +<%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/schedule/adv= anced.jspf" %> \ No newline at end of file commit 66d26d0a9c6c3c75ffc9681655574d4dbec7c144 Author: Justin Sherrill Date: Mon Jun 8 16:14:24 2009 -0400 501388 - fixing kernel options on profile and scheduling pages to use n= ewer CobblerObject based parsing diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Kicksta= rtDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kic= kstart/KickstartDetailsEditAction.java index 94838b3..e52e191 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetai= lsEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetai= lsEditAction.java @@ -16,7 +16,6 @@ package com.redhat.rhn.frontend.action.kickstart; = = import com.redhat.rhn.common.conf.Config; -import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.domain.kickstart.KickstartData; @@ -144,10 +143,8 @@ public class KickstartDetailsEditAction extends BaseKi= ckstartEditAction { Profile prof =3D Profile.lookupById(helper.getConnection(ctx.getLo= ggedInUser()), = data.getCobblerId()); if (prof !=3D null) { - form.set(KERNEL_OPTIONS, StringUtil.convertMapToString( - prof.getKernelOptions(), " ")); - form.set(POST_KERNEL_OPTIONS, StringUtil.convertMapToString( - prof.getKernelPostOptions(), " ")); + form.set(KERNEL_OPTIONS, prof.getKernelOptionsString()); + form.set(POST_KERNEL_OPTIONS, prof.getKernelPostOptionsString(= )); } = if (prof =3D=3D null) { @@ -290,11 +287,10 @@ public class KickstartDetailsEditAction extends BaseK= ickstartEditAction { public static void processCobblerFormValues(KickstartData ksdata, = DynaActionForm form, User user= ) { CobblerProfileEditCommand cmd =3D new CobblerProfileEditCommand(ks= data, user); - cmd.setKernelOptions(StringUtil.convertOptionsToMap( - form.getString(KERNEL_OPTIONS), "kickstart.jsp.error.inval= idoption", " ")); - cmd.setPostKernelOptions(StringUtil.convertOptionsToMap( - form.getString(POST_KERNEL_OPTIONS), = - "kickstart.jsp.error.invalidoption= ", " ")); + + cmd.setKernelOptions(StringUtils.defaultString(form.getString(KERN= EL_OPTIONS))); + cmd.setPostKernelOptions(StringUtils.defaultString( + form.getString(POST_KERNEL_OPTIONS))); cmd.store(); = CobblerXMLRPCHelper helper =3D new CobblerXMLRPCHelper(); diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSchedu= leCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSc= heduleCommand.java index 5f56e6d..3f95d81 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java @@ -950,17 +950,7 @@ public class KickstartScheduleCommand extends BaseSyst= emOperation { return ""; } StringBuilder retval =3D new StringBuilder(); - = - retval.append("ks=3D"); - if (this.proxyHost !=3D null) { - retval.append(kickstartSession.getUrl(this.proxyHost, = - this.scheduleDate)); - } - else { - retval.append(kickstartSession.getUrl(this.kickstartServerName= , = - this.scheduleDate)); - } = - = + String extraParams =3D " ksdevice=3Deth0"; /** Some examples: dhcp:eth0 , dhcp:eth2, static:10.1.4.75 diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= ProfileCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobble= r/CobblerProfileCommand.java index b19ac62..5928490 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfile= Command.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfile= Command.java @@ -40,8 +40,8 @@ public abstract class CobblerProfileCommand extends Cobbl= erCommand { = private static Logger log =3D Logger.getLogger(CobblerProfileCommand.c= lass); = - private Map kernelOptions; - private Map postKernelOptions; + private String kernelOptions; + private String postKernelOptions; = = protected KickstartData ksData; @@ -147,7 +147,7 @@ public abstract class CobblerProfileCommand extends Cob= blerCommand { /** * @param kernelOptionsIn The kernelOptions to set. */ - public void setKernelOptions(Map kernelOptionsIn) { + public void setKernelOptions(String kernelOptionsIn) { this.kernelOptions =3D kernelOptionsIn; } = @@ -156,7 +156,7 @@ public abstract class CobblerProfileCommand extends Cob= blerCommand { /** * @param postKernelOptionsIn The postKernelOptions to set. */ - public void setPostKernelOptions(Map postKernelOptionsIn) { + public void setPostKernelOptions(String postKernelOptionsIn) { this.postKernelOptions =3D postKernelOptionsIn; } = diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= SystemCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/c= obbler/CobblerSystemCreateCommand.java index b456db6..c87cdc2 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemC= reateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemC= reateCommand.java @@ -14,9 +14,7 @@ */ package com.redhat.rhn.manager.kickstart.cobbler; = -import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.common.validator.ValidatorError; -import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.server.NetworkInterface; import com.redhat.rhn.domain.server.Server; @@ -33,7 +31,6 @@ import org.cobbler.SystemRecord; = import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; @@ -243,33 +240,7 @@ public class CobblerSystemCreateCommand extends Cobble= rCommand { invokeXMLRPC("modify_system", handle, "server", "", xmlRpcToken); } - try { - if (!StringUtils.isBlank(kernelOptions)) { - invokeXMLRPC("modify_system", handle, "kopts", - StringUtil.convertOptionsToMap( - kernelOptions, "kickstart.jsp.error.invali= doption", " "), - xmlRpcToken); - } - else { - invokeXMLRPC("modify_system", handle, "kopts", - Collections.EMPTY_MAP, xmlRpcToken); - } - = - if (!StringUtils.isBlank(postKernelOptions)) { - invokeXMLRPC("modify_system", handle, "kopts-post", - StringUtil.convertOptionsToMap( - postKernelOptions, - "kickstart.jsp.error.invalidoption", " "), - xmlRpcToken); - } - else { - invokeXMLRPC("modify_system", handle, "kopts-post", - Collections.EMPTY_MAP, xmlRpcToken); - } = - } - catch (ValidatorException ve) { - return ve.getResult().getErrors().get(0); - } + // Setup the kickstart metadata so the URLs and activation key are= setup Map ksmeta =3D new HashMap(); if (!StringUtils.isBlank(mediaPath)) { @@ -292,6 +263,11 @@ public class CobblerSystemCreateCommand extends Cobble= rCommand { cSystem =3D getSystemMapByName(); } server.setCobblerId((String)cSystem.get("uid")); = + SystemRecord record =3D SystemRecord.lookupById(getCobblerConnecti= on(), + server.getCobblerId()); + record.setKernelOptions(kernelOptions); + record.setKernelPostOptions(postKernelOptions); + record.save(); return null; } = commit 0ecf2aa6f02c91f0a5e8f70ced7577491597bca2 Author: Partha Aji Date: Mon Jun 8 14:03:01 2009 -0400 Fixed a compile error diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualiz= ation/ProvisionVirtualizationWizardAction.java b/java/code/src/com/redhat/r= hn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardActi= on.java index 56ceb30..0f3f94b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/P= rovisionVirtualizationWizardAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/P= rovisionVirtualizationWizardAction.java @@ -168,7 +168,7 @@ public class ProvisionVirtualizationWizardAction extend= s ScheduleKickstartWizard cmd.setActivationKeyId((Long) form.get(ACTIVATION_KEY)); } = - cmd.setKernelParams(form.getString(KERNEL_PARAMS)); + cmd.setKernelOptions(form.getString(KERNEL_PARAMS)); = cmd.setProfileType(form.getString("targetProfileType")); cmd.setServerProfileId((Long) form.get("targetProfile")); commit 9cf5734ad85473035835e90da820dc7c311d0cfc Author: Partha Aji Date: Sun Jun 7 23:02:27 2009 -0400 501388 - kernel options and post kernel options redesign = A bunch of bugs were fixed in this one commit, including kernel parameters in the UI never getting copied to cobbler post kernel options missing. wrong error reported when you specify more than one kernel options This commit basically pertains to the kernel options and post kernel op= tions on the system-> provision-> schedule -> advanced options page more to come when we add this login to the system -> virtualization->s= chedule page diff --git a/java/code/src/com/redhat/rhn/common/util/StringUtil.java b/jav= a/code/src/com/redhat/rhn/common/util/StringUtil.java index f04a55c..5f7d246 100644 --- a/java/code/src/com/redhat/rhn/common/util/StringUtil.java +++ b/java/code/src/com/redhat/rhn/common/util/StringUtil.java @@ -710,22 +710,24 @@ public class StringUtil { } = /** - * Convert a string of options (name value pairs seperated by '=3D', w= here the - * pairs are seperated by whitespace), into a map. + * Convert a string of options (name value pairs separated by '=3D', w= here the + * pairs are seperated by 'separator'), into a map. * @param options the string of options * @param errorKey the localization key of the error message to throw = if we * can't parse it correctly + * @param separator the separator the separates different name value p= airs = * @return a map containing name value pairs of options * @throws ValidatorException if there isn't an '=3D' sign seperating = the * pairs */ - public static Map convertOptionsToMap(String options, String errorKey) + public static Map convertOptionsToMap(String options, String errorKey, + String sep= arator) throws ValidatorException { Map toReturn =3D new HashMap(); - StringTokenizer token =3D new StringTokenizer(options, "\n"); + StringTokenizer token =3D new StringTokenizer(options, separator); while (token.hasMoreElements()) { String option =3D token.nextToken(); - if (option.trim().length() > 0) { //Skip blank lines + if (!StringUtils.isBlank(option)) { //Skip blank lines String[] args =3D option.split("=3D"); if (args.length !=3D 2) { ValidatorException.raiseException(errorKey, option); diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Kicksta= rtDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kic= kstart/KickstartDetailsEditAction.java index 328d68b..94838b3 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetai= lsEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetai= lsEditAction.java @@ -291,9 +291,10 @@ public class KickstartDetailsEditAction extends BaseKi= ckstartEditAction { DynaActionForm form, User user= ) { CobblerProfileEditCommand cmd =3D new CobblerProfileEditCommand(ks= data, user); cmd.setKernelOptions(StringUtil.convertOptionsToMap( - form.getString(KERNEL_OPTIONS), "kickstart.jsp.error.inval= idvariable")); + form.getString(KERNEL_OPTIONS), "kickstart.jsp.error.inval= idoption", " ")); cmd.setPostKernelOptions(StringUtil.convertOptionsToMap( - form.getString(POST_KERNEL_OPTIONS), "kickstart.jsp.error.= invalidoption")); + form.getString(POST_KERNEL_OPTIONS), = + "kickstart.jsp.error.invalidoption= ", " ")); cmd.store(); = CobblerXMLRPCHelper helper =3D new CobblerXMLRPCHelper(); diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Kicksta= rtVariableAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickst= art/KickstartVariableAction.java index d2be147..7a00879 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartVaria= bleAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartVaria= bleAction.java @@ -119,7 +119,7 @@ public abstract class KickstartVariableAction extends R= hnAction { = CobblerObject cobj =3D getCobblerObject(cId, ctx.getLoggedInUs= er()); cobj.setKsMeta(StringUtil.convertOptionsToMap((String)form.get= (VARIABLES), = - "kickstart.jsp.error.invalidvariable")); + "kickstart.jsp.error.invalidvariable", "\n")); cobj.save(); = return null; diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Schedul= eKickstartWizardAction.java b/java/code/src/com/redhat/rhn/frontend/action/= kickstart/ScheduleKickstartWizardAction.java index d54004a..50b1afe 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickst= artWizardAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickst= artWizardAction.java @@ -14,25 +14,6 @@ */ package com.redhat.rhn.frontend.action.kickstart; = -import java.lang.reflect.Method; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.lang.BooleanUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -import org.apache.struts.action.ActionErrors; -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.DataResult; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.util.DatePicker; @@ -57,6 +38,27 @@ import com.redhat.rhn.manager.kickstart.cobbler.CobblerS= ystemCreateCommand; import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper; import com.redhat.rhn.manager.system.SystemManager; = +import org.apache.commons.lang.BooleanUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.DynaActionForm; +import org.cobbler.CobblerConnection; +import org.cobbler.Distro; + +import java.lang.reflect.Method; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletResponse; + /** * blah blah * = @@ -79,6 +81,13 @@ public class ScheduleKickstartWizardAction extends RhnWi= zardAction { public static final String SYNC_SYSTEM_DISABLED =3D "syncSystemDisable= d"; public static final String PROXIES =3D "proxies"; public static final String KERNEL_PARAMS =3D "kernelParams"; + public static final String KERNEL_PARAMS_TYPE =3D "kernelParamsType"; + public static final String KERNEL_PARAMS_DISTRO =3D "distro"; + public static final String KERNEL_PARAMS_PROFILE =3D "profile"; + public static final String KERNEL_PARAMS_CUSTOM =3D "custom"; + = + public static final String POST_KERNEL_PARAMS =3D "postKernelParams"; + public static final String POST_KERNEL_PARAMS_TYPE =3D "postKernelPara= msType"; public static final String PROXY_HOST =3D "proxyHost"; public static final String USE_EXISTING_PROFILE =3D "useExistingProfil= e"; public static final String ACTIVATION_KEY =3D "activationKey"; @@ -199,7 +208,7 @@ public class ScheduleKickstartWizardAction extends RhnW= izardAction { Boolean.FALSE.toString()); } = - addRequestAttributes(ctx, cmd); + addRequestAttributes(ctx, cmd, form); checkForKickstart(form, cmd, ctx); List proxies =3D getProxies(cmd); if (proxies !=3D null && proxies.size() > 0) { @@ -259,7 +268,7 @@ public class ScheduleKickstartWizardAction extends RhnW= izardAction { KickstartScheduleCommand cmd =3D getScheduleCommand(form, ctx, nul= l, null); = checkForKickstart(form, cmd, ctx); - addRequestAttributes(ctx, cmd); + addRequestAttributes(ctx, cmd, form); form.set(ACTIVATION_KEYS, cmd.getActivationKeys()); DataResult packageProfiles =3D cmd.getProfiles(); form.set(SYNCH_PACKAGES, packageProfiles); @@ -283,17 +292,50 @@ public class ScheduleKickstartWizardAction extends Rh= nWizardAction { if (StringUtils.isEmpty(form.getString(USE_EXISTING_PROFILE))) { form.set(USE_EXISTING_PROFILE, Boolean.TRUE.toString()); } + = + if (StringUtils.isEmpty(form.getString(KERNEL_PARAMS_TYPE))) { + form.set(KERNEL_PARAMS_TYPE, KERNEL_PARAMS_DISTRO); + } + = + if (StringUtils.isEmpty(form.getString(POST_KERNEL_PARAMS_TYPE))) { + form.set(POST_KERNEL_PARAMS_TYPE, KERNEL_PARAMS_DISTRO); + } + = SdcHelper.ssmCheck(ctx.getRequest(), sid, user); return mapping.findForward("second"); } = protected void addRequestAttributes(RequestContext ctx, - KickstartScheduleCommand cmd) { + KickstartScheduleCommand cmd, DynaActionForm form) { ctx.getRequest().setAttribute(RequestContext.SYSTEM, cmd.getServer= ()); ctx.getRequest() .setAttribute(RequestContext.KICKSTART, cmd.getKsdata()); + if (cmd.getKsdata() !=3D null) { + ctx.getRequest().setAttribute("profile", cmd.getKsdata()); + ctx.getRequest().setAttribute("distro", cmd.getKsdata().getTre= e()); + CobblerConnection con =3D CobblerXMLRPCHelper. + getConnection(ctx.getLoggedInUser()); + = + Distro distro =3D Distro.lookupById(con, + cmd.getKsdata().getTree().getCobblerId()); + + ctx.getRequest().setAttribute("distro_kernel_params", + distro.getKernelOptionsString(= )); + ctx.getRequest().setAttribute("distro_post_kernel_params", + distro.getKernelPostOption= sString()); + + org.cobbler.Profile profile =3D org.cobbler.Profile. + lookupById(con, cmd.getKsdata().getCobbler= Id()); + ctx.getRequest().setAttribute("profile_kernel_params", + profile.getKernelOptionsString()); + ctx.getRequest().setAttribute("profile_post_kernel_params", + profile.getKernelPostOptionsString= ()); + + } } = + = + = /** * The third step in the wizard * @param mapping ActionMapping for struts @@ -324,8 +366,41 @@ public class ScheduleKickstartWizardAction extends Rhn= WizardAction { KickstartHelper helper =3D new KickstartHelper(ctx.getRequest()); KickstartScheduleCommand cmd =3D getScheduleCommand(form, ctx, scheduleTime, helper.getKickstartHost()); - - cmd.setKernelParams(form.getString(KERNEL_PARAMS)); + = + CobblerConnection con =3D CobblerXMLRPCHelper. + getConnection(ctx.getLoggedInUser()); + = + String type =3D form.getString(KERNEL_PARAMS_TYPE); + if (KERNEL_PARAMS_CUSTOM.equals(type)) { + cmd.setKernelOptions(form.getString(KERNEL_PARAMS)); + } + else if (KERNEL_PARAMS_DISTRO.equals(type)) { + Distro distro =3D Distro. + lookupById(con, cmd.getKsdata().getTree().getCobblerId= ()); + cmd.setKernelOptions(distro.getKernelOptionsString()); + } + else { + org.cobbler.Profile profile =3D org.cobbler.Profile. + lookupById(con, cmd.getKsdata().ge= tCobblerId()); + cmd.setKernelOptions(profile.getKernelOptionsString()); + } + = + type =3D form.getString(POST_KERNEL_PARAMS_TYPE); + if (KERNEL_PARAMS_CUSTOM.equals(type)) { + cmd.setPostKernelOptions(form.getString(POST_KERNEL_PARAMS)); + } + else if (KERNEL_PARAMS_DISTRO.equals(type)) { + Distro distro =3D Distro. + lookupById(con, cmd.getKsdata().getTree().getCobblerId= ()); + cmd.setPostKernelOptions(distro.getKernelPostOptionsString()); + } + else { + org.cobbler.Profile profile =3D org.cobbler.Profile. + lookupById(con, cmd.getKsdata().ge= tCobblerId()); + cmd.setPostKernelOptions(profile.getKernelPostOptionsString()); + } + = + = boolean advancedConfig =3D false; // if existing profile is not set then actions froms from normal c= onfig // page diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResou= rce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringRe= source_en_US.xml index d3ea29c..493afba 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml @@ -185,7 +185,6 @@ http://www.oasis-open.org/committees/xliff/documents/xl= iff-core-1.1.xsd" General Stufff - Yes @@ -206,7 +205,13 @@ http://www.oasis-open.org/committees/xliff/documents/x= liff-core-1.1.xsd" Warning - = + + + Custom + + + none specified + = diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResour= ce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringReso= urce_en_US.xml index f71671e..ea75762 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml @@ -10889,9 +10889,6 @@ the <strong>Red Hat Enterprise Linux System A= dministration Guide.</stro Snippet Type = - - Custom - Custom kickstart snippets will be only available to the &l= t;strong>{0}</strong> organization. @@ -16396,81 +16393,56 @@ the <a href=3D"/rhn/kickstart/ActivationK= eysList.do?ksid=3D{0}">Acti /rhn/systems/details/kick= start/ScheduleWizard.do - = - - Advanced Kickstart Configuration - - /rhn/systems/details/kick= start/ScheduleWizard.do - - - - Bootloader - - /rhn/systems/details/kick= start/ScheduleWizard.do - - - - Extra Kernel<br />Parameters - - /rhn/systems/details/kick= start/ScheduleWizard.do - - - - @@PRODUCT_NAME@@ System<br />Profile - - /rhn/systems/details/kick= start/ScheduleWizard.do - - - - Sync Package<br />Profile - - /rhn/systems/details/kick= start/ScheduleWizard.do - - - Use this system's existing @@PRODUCT_NAME@@ Profile - - /rhn/systems/details/kick= start/ScheduleWizard.do - - - - Use the default guest profile - - /rhn/systems/details/virt= ualization/ProvisionVirtualizationWizard.do - - - - Use an activation key (select below): - - /rhn/systems/details/kick= start/ScheduleWizard.do - - - - With system's existing package profile - - /rhn/systems/details/kick= start/ScheduleWizard.do - - - - With Package Profile - - /rhn/systems/details/kick= start/ScheduleWizard.do - - - - With System Profile - - /rhn/systems/details/kick= start/ScheduleWizard.do - - - - Do not sync package profile - - /rhn/systems/details/kick= start/ScheduleWizard.do - - - - + = + + + + /rhn/systems/details/kicksta= rt/ScheduleWizard.do + + + Advanced Kickstart Configuration + + + Bootloader + + + <strong>As specified by Kickstart Distribution</= strong>({0}) + + + <strong>As specified by Kickstart Profile</stron= g>({0}) + + + If you would not like any kernel options, select '{0}' an= d leave the form field blank. + + + @@PRODUCT_NAME@@ System<br />Profile + + + Sync Package<br />Profile + + + Use this system's existing @@PRODUCT_NAME@@ Profile + + + Use the default guest profile + + + Use an activation key (select below): + + + With system's existing package profile + + + With Package Profile + + + With System Profile + + + Do not sync package profile + + = Confirm Kickstart Script Deletion diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSchedu= leCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSc= heduleCommand.java index 28bf6a5..5f56e6d 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java @@ -14,20 +14,6 @@ */ package com.redhat.rhn.manager.kickstart; = -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -import org.cobbler.SystemRecord; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.SelectMode; @@ -71,6 +57,20 @@ import com.redhat.rhn.manager.system.BaseSystemOperation; import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.manager.token.ActivationKeyManager; = +import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; +import org.cobbler.SystemRecord; + +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * Provides frequently used data for scheduling a kickstart * @@ -141,8 +141,10 @@ public class KickstartScheduleCommand extends BaseSyst= emOperation { private Profile createdProfile; // Static device private String staticDevice; - // extra kernel params set in the UI - private String kernelParams; + + private String kernelOptions; + private String postKernelOptions; = + = = // The server who serves the kickstarts private String kickstartServerName; @@ -593,6 +595,8 @@ public class KickstartScheduleCommand extends BaseSyste= mOperation { getKickstartMediaPath(kickstartSession), tokenList); cmd.setKickstartHost(host); + cmd.setKernelOptions(getExtraOptions()); + cmd.setPostKernelOptions(postKernelOptions); ValidatorError cobblerError =3D cmd.store(); if (cobblerError !=3D null) { return cobblerError; @@ -603,6 +607,8 @@ public class KickstartScheduleCommand extends BaseSyste= mOperation { new CobblerSystemCreateCommand(user, = server, cobblerProfileLabel); cmd.setKickstartHost(host); + cmd.setKernelOptions(kernelOptions); + cmd.setPostKernelOptions(postKernelOptions); = ValidatorError cobblerError =3D cmd.store(); if (cobblerError !=3D null) { return cobblerError; @@ -943,7 +949,8 @@ public class KickstartScheduleCommand extends BaseSyste= mOperation { if (isCobblerOnly()) { return ""; } - StringBuffer retval =3D new StringBuffer(); + StringBuilder retval =3D new StringBuilder(); + = retval.append("ks=3D"); if (this.proxyHost !=3D null) { retval.append(kickstartSession.getUrl(this.proxyHost, = @@ -952,9 +959,9 @@ public class KickstartScheduleCommand extends BaseSyste= mOperation { else { retval.append(kickstartSession.getUrl(this.kickstartServerName= , = this.scheduleDate)); - } - - String extraParams =3D new String(" ksdevice=3Deth0"); + } = + = + String extraParams =3D " ksdevice=3Deth0"; /** Some examples: dhcp:eth0 , dhcp:eth2, static:10.1.4.75 static:146.108.30.184, static:auto, static:eth0 @@ -975,11 +982,8 @@ public class KickstartScheduleCommand extends BaseSyst= emOperation { extraParams =3D ""; } } - if (this.kernelParams !=3D null) { - extraParams =3D extraParams + " " + this.kernelParams; - } - if (this.getKsdata().getKernelParams() !=3D null) { - extraParams =3D extraParams + " " + this.getKsdata().getKernel= Params(); = + if (!StringUtils.isBlank(kernelOptions)) { + extraParams =3D extraParams + " " + this.kernelOptions; } retval.append(extraParams); = @@ -1419,22 +1423,6 @@ public class KickstartScheduleCommand extends BaseSy= stemOperation { return createdProfile; } = - = - /** - * @return Returns the kernelParams. - */ - public String getKernelParams() { - return kernelParams; - } - - = - /** - * @param kernelParamsIn The kernelParams to set. - */ - public void setKernelParams(String kernelParamsIn) { - this.kernelParams =3D kernelParamsIn; - } - /** * Set the activationkey id to use * @param idIn to add to the Kickstart @@ -1550,4 +1538,18 @@ public class KickstartScheduleCommand extends BaseSy= stemOperation { public boolean isCobblerOnly() { return cobblerOnly; } + = + /** + * @param kernelOptionsIn The kernelOptions to set. + */ + public void setKernelOptions(String kernelOptionsIn) { + this.kernelOptions =3D kernelOptionsIn; + } + = + /** + * @param postKernelOptionsIn The postKernelOptions to set. + */ + public void setPostKernelOptions(String postKernelOptionsIn) { + this.postKernelOptions =3D postKernelOptionsIn; + } = } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= Command.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbl= erCommand.java index c76f886..7793d07 100755 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand= .java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand= .java @@ -253,6 +253,10 @@ public abstract class CobblerCommand { } = protected CobblerConnection getCobblerConnection() { + return getCobblerConnection(user); + } + = + protected static CobblerConnection getCobblerConnection(User user) { if (user =3D=3D null) { return CobblerXMLRPCHelper.getAutomatedConnection(); } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= ProfileCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobble= r/CobblerProfileCommand.java index aed5b69..b19ac62 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfile= Command.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfile= Command.java @@ -171,13 +171,7 @@ public abstract class CobblerProfileCommand extends Co= bblerCommand { */ public static Distro getCobblerDistroForVirtType(KickstartableTree tre= e, = KickstartVirtualizationType virtType, User user) { - CobblerConnection con; - if (user =3D=3D null) { - con =3D CobblerXMLRPCHelper.getAutomatedConnection(); - } - else { - con =3D CobblerXMLRPCHelper.getConnection(user); - } + CobblerConnection con =3D getCobblerConnection(user); if (virtType.equals(KickstartFactory.VIRT_TYPE_XEN_PV)) { if (tree.getCobblerXenId() =3D=3D null) { return null; diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= SystemCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/c= obbler/CobblerSystemCreateCommand.java index 504c3c2..b456db6 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemC= reateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemC= reateCommand.java @@ -14,7 +14,9 @@ */ package com.redhat.rhn.manager.kickstart.cobbler; = +import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.common.validator.ValidatorError; +import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.server.NetworkInterface; import com.redhat.rhn.domain.server.Server; @@ -31,6 +33,7 @@ import org.cobbler.SystemRecord; = import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; @@ -52,6 +55,8 @@ public class CobblerSystemCreateCommand extends CobblerCo= mmand { private String profileName; private String activationKeys; private String kickstartHost; + private String kernelOptions; + private String postKernelOptions; = /** * Constructor @@ -230,7 +235,7 @@ public class CobblerSystemCreateCommand extends Cobbler= Command { } = = - if (!StringUtils.isEmpty(getKickstartHost())) { + if (!StringUtils.isBlank(getKickstartHost())) { invokeXMLRPC("modify_system", handle, "server", getKickstartHost(), xmlRpcToken); } @@ -238,9 +243,33 @@ public class CobblerSystemCreateCommand extends Cobble= rCommand { invokeXMLRPC("modify_system", handle, "server", "", xmlRpcToken); } - - - = + try { + if (!StringUtils.isBlank(kernelOptions)) { + invokeXMLRPC("modify_system", handle, "kopts", + StringUtil.convertOptionsToMap( + kernelOptions, "kickstart.jsp.error.invali= doption", " "), + xmlRpcToken); + } + else { + invokeXMLRPC("modify_system", handle, "kopts", + Collections.EMPTY_MAP, xmlRpcToken); + } + = + if (!StringUtils.isBlank(postKernelOptions)) { + invokeXMLRPC("modify_system", handle, "kopts-post", + StringUtil.convertOptionsToMap( + postKernelOptions, + "kickstart.jsp.error.invalidoption", " "), + xmlRpcToken); + } + else { + invokeXMLRPC("modify_system", handle, "kopts-post", + Collections.EMPTY_MAP, xmlRpcToken); + } = + } + catch (ValidatorException ve) { + return ve.getResult().getErrors().get(0); + } // Setup the kickstart metadata so the URLs and activation key are= setup Map ksmeta =3D new HashMap(); if (!StringUtils.isBlank(mediaPath)) { @@ -257,13 +286,12 @@ public class CobblerSystemCreateCommand extends Cobbl= erCommand { invokeXMLRPC("modify_system", Arrays.asList(args)); = invokeXMLRPC("save_system", handle, xmlRpcToken); - = Map cSystem =3D getSystemMapByMac(); // Virt system records have no mac/interfaces setup so we search o= n name if (cSystem =3D=3D null) { cSystem =3D getSystemMapByName(); } - server.setCobblerId((String)cSystem.get("uid")); + server.setCobblerId((String)cSystem.get("uid")); = return null; } = @@ -323,5 +351,18 @@ public class CobblerSystemCreateCommand extends Cobble= rCommand { public void setKickstartHost(String kickstartHostIn) { this.kickstartHost =3D kickstartHostIn; } - = + + /** + * @param kernelOptionsIn The kernelOptions to set. + */ + public void setKernelOptions(String kernelOptionsIn) { + this.kernelOptions =3D kernelOptionsIn; + } + = + /** + * @param postKernelOptionsIn The postKernelOptions to set. + */ + public void setPostKernelOptions(String postKernelOptionsIn) { + this.postKernelOptions =3D postKernelOptionsIn; + } = } diff --git a/java/code/src/org/cobbler/CobblerObject.java b/java/code/src/o= rg/cobbler/CobblerObject.java index 34566bf..fcb2d0e 100644 --- a/java/code/src/org/cobbler/CobblerObject.java +++ b/java/code/src/org/cobbler/CobblerObject.java @@ -40,7 +40,7 @@ public abstract class CobblerObject { protected static final String OWNERS =3D "owners"; protected static final String CTIME =3D "ctime"; protected static final String KERNEL_OPTIONS_POST =3D "kernel_options_= post"; - protected static final String SET_KERNEL_OPTIONS_POST =3D "kopts-post"; + protected static final String SET_KERNEL_OPTIONS_POST =3D "kopts_post"; protected static final String DEPTH =3D "depth"; protected static final String KERNEL_OPTIONS =3D "kernel_options"; protected static final String SET_KERNEL_OPTIONS =3D "kopts"; diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetail= s.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp index dc89d2c..fe5e969 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp @@ -85,7 +85,7 @@ : diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first= .jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp index e637eb7..6c05b7d 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp @@ -61,7 +61,10 @@ function setStep(stepName) { - + = + + + = diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/secon= d.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/second.jsp index c1d0122..408f29b 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/second.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/second.jsp @@ -76,16 +76,77 @@ function setInitialState() {
                                      - " onclick=3D"setStep('first');moveNext();" /> = - " onclick=3D"setStep('third');moveNext();" /> -
                                      -
                                      +
                                      =
                                      = - - + + + + + = + = + = +
                                      :: + ${requestScope.profile.label= } + + + ${requestScope.distro.label} + + + ${requestScope.distro.label} + + + = + + + :
                                      + ${requestScope.distro_kernel_params} + () + + = +

                                      + + + :
                                      + ${requestScope.profile_kernel_params} + () + +

                                      + = + + + :   

                                      + = = +
                                      : + + + :
                                      + ${requestScope.distro_post_kernel_params} + () +

                                      + = + + + :
                                      + ${requestScope.profile_post_kernel_params} + () +

                                      + = + + + :   

                                      = + +
                                      : - +

                                      - + :   @@ -93,7 +154,9 @@ function setInitialState() { label=3D"name" value=3D"id"/>

                                      - + :   @@ -101,7 +164,9 @@ function setInitialState() { label=3D"name" value=3D"id"/>

                                      = -
                                      = + +
                                      =
                                      diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/= WEB-INF/struts-config.xml index 1b8023b..b20292e 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -729,11 +729,14 @@ - + + + + = --===============7947521401168094352==-- From jdob at fedoraproject.org Thu Aug 20 11:57:24 2015 Content-Type: multipart/mixed; boundary="===============8067001220641525213==" MIME-Version: 1.0 From: jdob To: spacewalk-commits at lists.fedorahosted.org Subject: client/tools Date: Tue, 09 Jun 2009 15:05:28 +0000 Message-ID: <20090609150528.E0457120194@lists.fedorahosted.org> --===============8067001220641525213== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 56f08c2422cd9d06f7def90f20c70e26666dd9aa Author: Jason Dobies Date: Tue Jun 9 11:00:16 2009 -0400 503996 - Added some information on the error message to the status retu= rned to the server. diff --git a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py b/c= lient/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py index 4bccfa5..ef1115a 100644 --- a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py +++ b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py @@ -136,7 +136,7 @@ def initiate_guest(kickstart_host, cobbler_system_name,= virt_type, name, mem_kb, print xa print xb print string.join(traceback.format_list(traceback.extract_tb(t= b))) - error_messages['koan'] =3D string.join(traceback.format_list(t= raceback.extract_tb(tb))) + error_messages['koan'] =3D xb.get_error_message() + ' ' + stri= ng.join(traceback.format_list(traceback.extract_tb(tb))) return (1, "Virtual kickstart failed. Koan error.", error_messages) = return (0, "Virtual kickstart initiate succeeded", error_messages) --===============8067001220641525213==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:24 2015 Content-Type: multipart/mixed; boundary="===============7485197431066132293==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - selinux/spacewalk-monitoring-selinux Date: Tue, 09 Jun 2009 15:06:58 +0000 Message-ID: <20090609150658.93683120194@lists.fedorahosted.org> --===============7485197431066132293== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | = 35 +++++++++- 1 file changed, 33 insertions(+), 2 deletions(-) New commits: commit 37b97c3db9bd1df5f4e6184140fde0177fa26058 Author: Miroslav Such=C3=BD Date: Tue Jun 9 17:04:37 2009 +0200 498611 - Require all monitoring packages so the files already exist whe= n we run restorecon. = We can not directly require monitoring package since that already requi= re this package and we will get circular dependecy which can yum/rpm cut wh= erever he wants to. diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-seli= nux.spec b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinu= x.spec index da1a448..dd6e62e 100644 --- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec +++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec @@ -30,11 +30,41 @@ Requires: selinux-policy >=3D %{selinux_policyver} %endif Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/selinuxe= nabled Requires(postun): /usr/sbin/semodule, /sbin/restorecon -Requires: SatConfig-general -Requires: NPalert Requires: oracle-instantclient-selinux -Requires: tsdb +Requires: nocpulse-common +Requires: nocpulse-db-perl +Requires: eventReceivers +Requires: MessageQueue +Requires: NOCpulsePlugins +Requires: NPalert +Requires: perl-NOCpulse-CLAC +Requires: perl-NOCpulse-Debug +Requires: perl-NOCpulse-Gritch +Requires: perl-NOCpulse-Object +Requires: perl-NOCpulse-OracleDB +Requires: perl-NOCpulse-PersistentConnection +Requires: perl-NOCpulse-Probe +Requires: perl-NOCpulse-ProcessPool Requires: perl-NOCpulse-Scheduler +Requires: perl-NOCpulse-SetID +Requires: perl-NOCpulse-Utils +Requires: ProgAGoGo +Requires: SatConfig-bootstrap +Requires: SatConfig-bootstrap-server +Requires: SatConfig-cluster +Requires: SatConfig-dbsynch +Requires: SatConfig-general +Requires: SatConfig-generator +Requires: SatConfig-installer +Requires: SatConfig-spread +Requires: scdb +Requires: SNMPAlerts +Requires: SputLite-client +Requires: SputLite-server +Requires: ssl_bridge +Requires: status_log_acceptor +Requires: tsdb + = %description SELinux policy module supporting Spacewalk monitoring. commit 23b1245ac0f3f28a267c780e9be2f85f8b9f7345 Author: Miroslav Such=C3=BD Date: Mon Jun 8 15:19:07 2009 +0200 498611 - Require perl-NOCpulse-Scheduler so /var/lib/nocpulse/NPkernel.= out already exist when we run restorecon. = Addressing: type=3DAVC msg=3Daudit(1244462056.211:1892): avc: denied { append } f= or pid=3D29025 comm=3D"ifconfig" path=3D"/var/lib/nocpulse/NPkernel.out/29= 020.STDERR" dev=3Dxvda1 ino=3D979377 scontext=3Duser_u:system_r:ifconfig_t:= s0 tcontext=3Duser_u:object_r:var_lib_t:s0 tclass=3Dfile diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-seli= nux.spec b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinu= x.spec index f1601d3..da1a448 100644 --- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec +++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec @@ -34,6 +34,7 @@ Requires: SatConfig-general Requires: NPalert Requires: oracle-instantclient-selinux Requires: tsdb +Requires: perl-NOCpulse-Scheduler = %description SELinux policy module supporting Spacewalk monitoring. --===============7485197431066132293==-- From jdob at fedoraproject.org Thu Aug 20 11:57:24 2015 Content-Type: multipart/mixed; boundary="===============2991641217176656216==" MIME-Version: 1.0 From: jdob To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - client/tools Date: Tue, 09 Jun 2009 15:07:06 +0000 Message-ID: <20090609150706.8A369120194@lists.fedorahosted.org> --===============2991641217176656216== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a29d0fa0890c283c8b881ce4d12d31223e987f44 Author: Jason Dobies Date: Tue Jun 9 11:00:16 2009 -0400 503996 - Added some information on the error message to the status retu= rned to the server. diff --git a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py b/c= lient/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py index 4bccfa5..ef1115a 100644 --- a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py +++ b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py @@ -136,7 +136,7 @@ def initiate_guest(kickstart_host, cobbler_system_name,= virt_type, name, mem_kb, print xa print xb print string.join(traceback.format_list(traceback.extract_tb(t= b))) - error_messages['koan'] =3D string.join(traceback.format_list(t= raceback.extract_tb(tb))) + error_messages['koan'] =3D xb.get_error_message() + ' ' + stri= ng.join(traceback.format_list(traceback.extract_tb(tb))) return (1, "Virtual kickstart failed. Koan error.", error_messages) = return (0, "Virtual kickstart initiate succeeded", error_messages) --===============2991641217176656216==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:24 2015 Content-Type: multipart/mixed; boundary="===============2317040278300464522==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 2 commits - selinux/spacewalk-monitoring-selinux Date: Tue, 09 Jun 2009 15:08:39 +0000 Message-ID: <20090609150839.5660D120194@lists.fedorahosted.org> --===============2317040278300464522== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | = 35 +++++++++- 1 file changed, 33 insertions(+), 2 deletions(-) New commits: commit 249f66e71268a8f05ee376c989a51d1cdc719bce Author: Miroslav Such=C3=BD Date: Tue Jun 9 17:04:37 2009 +0200 498611 - Require all monitoring packages so the files already exist whe= n we run restorecon. = We can not directly require monitoring package since that already requi= re this package and we will get circular dependecy which can yum/rpm cut wh= erever he wants to. (cherry picked from commit 37b97c3db9bd1df5f4e6184140fde0177fa26058) diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-seli= nux.spec b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinu= x.spec index 5cef196..d86d038 100644 --- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec +++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec @@ -30,11 +30,41 @@ Requires: selinux-policy >=3D %{selinux_policyver} %endif Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/selinuxe= nabled Requires(postun): /usr/sbin/semodule, /sbin/restorecon -Requires: SatConfig-general -Requires: NPalert Requires: oracle-instantclient-selinux -Requires: tsdb +Requires: nocpulse-common +Requires: nocpulse-db-perl +Requires: eventReceivers +Requires: MessageQueue +Requires: NOCpulsePlugins +Requires: NPalert +Requires: perl-NOCpulse-CLAC +Requires: perl-NOCpulse-Debug +Requires: perl-NOCpulse-Gritch +Requires: perl-NOCpulse-Object +Requires: perl-NOCpulse-OracleDB +Requires: perl-NOCpulse-PersistentConnection +Requires: perl-NOCpulse-Probe +Requires: perl-NOCpulse-ProcessPool Requires: perl-NOCpulse-Scheduler +Requires: perl-NOCpulse-SetID +Requires: perl-NOCpulse-Utils +Requires: ProgAGoGo +Requires: SatConfig-bootstrap +Requires: SatConfig-bootstrap-server +Requires: SatConfig-cluster +Requires: SatConfig-dbsynch +Requires: SatConfig-general +Requires: SatConfig-generator +Requires: SatConfig-installer +Requires: SatConfig-spread +Requires: scdb +Requires: SNMPAlerts +Requires: SputLite-client +Requires: SputLite-server +Requires: ssl_bridge +Requires: status_log_acceptor +Requires: tsdb + = %description SELinux policy module supporting Spacewalk monitoring. commit 76bdc6d40df51d085b0ba78866ba65c2344df757 Author: Miroslav Such=C3=BD Date: Mon Jun 8 15:19:07 2009 +0200 498611 - Require perl-NOCpulse-Scheduler so /var/lib/nocpulse/NPkernel.= out already exist when we run restorecon. = Addressing: type=3DAVC msg=3Daudit(1244462056.211:1892): avc: denied { append } f= or pid=3D29025 comm=3D"ifconfig" path=3D"/var/lib/nocpulse/NPkernel.out/29= 020.STDERR" dev=3Dxvda1 ino=3D979377 scontext=3Duser_u:system_r:ifconfig_t:= s0 tcontext=3Duser_u:object_r:var_lib_t:s0 tclass=3Dfile (cherry picked from commit 23b1245ac0f3f28a267c780e9be2f85f8b9f7345) diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-seli= nux.spec b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinu= x.spec index 1cef412..5cef196 100644 --- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec +++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec @@ -34,6 +34,7 @@ Requires: SatConfig-general Requires: NPalert Requires: oracle-instantclient-selinux Requires: tsdb +Requires: perl-NOCpulse-Scheduler = %description SELinux policy module supporting Spacewalk monitoring. --===============2317040278300464522==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:24 2015 Content-Type: multipart/mixed; boundary="===============6169256150781336839==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - proxy/installer Date: Tue, 09 Jun 2009 15:12:06 +0000 Message-ID: <20090609151206.58F6B120194@lists.fedorahosted.org> --===============6169256150781336839== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/installer/configure-proxy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0bf2853a9fdc0659d31273b381476abc522fed02 Author: Miroslav Such=C3=BD Date: Tue Jun 9 17:11:56 2009 +0200 504660 - fix typo in message diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure= -proxy.sh index 9819436..bcf3410 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -191,7 +191,7 @@ HOSTNAME=3D$(hostname) = SSL_BUILD_DIR=3D${SSL_BUILD_DIR:-/root/ssl-build} if ! [ -d $SSL_BUILD_DIR ] && [ 0$FORCE_OWN_CA -eq 0 ]; then - echo "Error: ssl build directory $SSL_BUILD_DIR do not exist. Please crea= te this directory." + echo "Error: ssl build directory $SSL_BUILD_DIR does not exist. Please cr= eate this directory." exit 1 fi = --===============6169256150781336839==-- From jmrodri at fedoraproject.org Thu Aug 20 11:57:24 2015 Content-Type: multipart/mixed; boundary="===============3204670366007576619==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/spacewalk-java.spec Date: Tue, 09 Jun 2009 15:14:05 +0000 Message-ID: <20090609151405.BA63D120194@lists.fedorahosted.org> --===============3204670366007576619== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/spacewalk-java.spec | 2 ++ 1 file changed, 2 insertions(+) New commits: commit 9c9d899a8cad7c697a3f2deee3f8ad6214f1811e Author: jesus m. rodriguez Date: Tue Jun 9 11:11:10 2009 -0400 470991 - spacewalk-java requires jakarta-commons-io and spacewalk-brand= ing. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 26e82cd..2dc102a 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -29,6 +29,7 @@ Requires: java-devel >=3D 0:1.6.0 Requires: jakarta-commons-lang >=3D 0:2.1 Requires: jakarta-commons-codec Requires: jakarta-commons-cli +Requires: jakarta-commons-io Requires: jakarta-commons-logging Requires: jakarta-taglibs-standard Requires: jasper5 @@ -49,6 +50,7 @@ Requires: sitemesh Requires: stringtree-json Requires: spacewalk-java-config Requires: spacewalk-java-lib +Requires: spacewalk-branding Requires: jpackage-utils >=3D 0:1.5 Requires: cobbler >=3D 1.4.3 BuildRequires: ant --===============3204670366007576619==-- From jmrodri at fedoraproject.org Thu Aug 20 11:57:24 2015 Content-Type: multipart/mixed; boundary="===============4611221963466573492==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: java/spacewalk-java.spec Date: Tue, 09 Jun 2009 15:15:04 +0000 Message-ID: <20090609151504.8A119120194@lists.fedorahosted.org> --===============4611221963466573492== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/spacewalk-java.spec | 2 ++ 1 file changed, 2 insertions(+) New commits: commit b32ba70fbbb34de411cbe26d162ec55b1d42649a Author: jesus m. rodriguez Date: Tue Jun 9 11:11:10 2009 -0400 470991 - spacewalk-java requires jakarta-commons-io and spacewalk-brand= ing. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index e4300a0..53a9122 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -29,6 +29,7 @@ Requires: java-devel >=3D 0:1.6.0 Requires: jakarta-commons-lang >=3D 0:2.1 Requires: jakarta-commons-codec Requires: jakarta-commons-cli +Requires: jakarta-commons-io Requires: jakarta-commons-logging Requires: jakarta-taglibs-standard Requires: jasper5 @@ -49,6 +50,7 @@ Requires: sitemesh Requires: stringtree-json Requires: spacewalk-java-config Requires: spacewalk-java-lib +Requires: spacewalk-branding Requires: jpackage-utils >=3D 0:1.5 Requires: cobbler >=3D 1.6.3 BuildRequires: ant --===============4611221963466573492==-- From jmrodri at fedoraproject.org Thu Aug 20 11:57:24 2015 Content-Type: multipart/mixed; boundary="===============8178609559294890332==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-java-0.6.25-1' Date: Tue, 09 Jun 2009 15:24:17 +0000 Message-ID: <20090609152417.2D9CC12022C@lists.fedorahosted.org> --===============8178609559294890332== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-java-0.6.25-1' created by jesus m. rodriguez at 2009-06-09 15:23 +0000 Tagging package [spacewalk-java] version [0.6.25-1] in directory [java/]. Changes since SatConfig: --- 0 files changed --- --===============8178609559294890332==-- From jmrodri at fedoraproject.org Thu Aug 20 11:57:24 2015 Content-Type: multipart/mixed; boundary="===============3276319276574298852==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: java/spacewalk-java.spec rel-eng/packages Date: Tue, 09 Jun 2009 15:24:13 +0000 Message-ID: <20090609152413.8EBEF120194@lists.fedorahosted.org> --===============3276319276574298852== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/spacewalk-java.spec | 25 ++++++++++++++++++++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 25 insertions(+), 2 deletions(-) New commits: commit db85e30dc1c3a112c308311d39ed92ddabb4e174 Author: jesus m. rodriguez Date: Tue Jun 9 11:23:41 2009 -0400 Automatic commit of package [spacewalk-java] release [0.6.25-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 53a9122..5be5731 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -11,7 +11,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 0.6.24 +Version: 0.6.25 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{versi= on}.tar.gz = @@ -250,6 +250,29 @@ fi %attr(644, root, root) %{_datadir}/rhn/lib/rhn.jar = %changelog +* Tue Jun 09 2009 jesus m. rodriguez 0.6.25-1 +- 470991 - spacewalk-java requires jakarta-commons-io and spacewalk-brandi= ng. + (jesusr(a)redhat.com) +- 501388 - Fixed the guest provisioning side of things also to conform to = the + new UI (paji(a)redhat.com) +- 501388 - fixing kernel options on profile and scheduling pages to use ne= wer + CobblerObject based parsing (jsherril(a)redhat.com) +- 504652 - remove default column from rhnchanneldist map query + (shughes(a)redhat.com) +- Update for python 2.5+ (jmatthew(a)redhat.com) +- 501388 - kernel options and post kernel options redesign (paji(a)redhat.= com) +- Fix to include html:errors wherever html:messages is used so that errors= can + be reported. (paji(a)redhat.com) +- 504049 - adding functionality to keep the cobbler profile and system re= cords + redhat managemnet keys in line with whats set in the Kickstart Profile on + satellite (jsherril(a)redhat.com) +- 499471 - list default org in subscription list (shughes(a)redhat.com) +- 504014 - Fix to show an error message on No Kicktstart tree on KS OS page + (paji(a)redhat.com) +- 504227 - apidoc - kickstart handler - add 'none' as a supported virt type + (bbuckingham(a)redhat.com) +- 500505 - apidoc - packages.findByNvrea - update docs (bbuckingham(a)redh= at.com) + * Fri Jun 05 2009 jesus m. rodriguez 0.6.24-1 - good bye StrutsDelegateImpl and StrutsDelegateFactory (paji(a)redhat.com) - 502959 - skip null date values for taskomatic status (shughes(a)redhat.c= om) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-j= ava index cd584c7..e9d6f28 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -0.6.24-1 java/ +0.6.25-1 java/ --===============3276319276574298852==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:24 2015 Content-Type: multipart/mixed; boundary="===============7797117036431423711==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Tue, 09 Jun 2009 15:25:57 +0000 Message-ID: <20090609152557.24AA2120194@lists.fedorahosted.org> --===============7797117036431423711== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java | = 2 -- 1 file changed, 2 deletions(-) New commits: commit ba23f87cad5763107528b27ba693ec743e3365aa Author: Brad Buckingham Date: Tue Jun 9 11:12:25 2009 -0400 503801 - update channel details edit to not refresh package cache = Performing an edit of the basic channel details (i.e. channels/manage/E= dit.do) such as channel name, description, contact info...etc was resulting in a refresh of the 'new package' cache. This isn't needed for the 'edit' s= ince we are not altering the package content of the channel. Including this logic actually causes a timeout at run-time followed by a 500 ISE. diff --git a/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelComm= and.java b/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelComman= d.java index 1cb2ff5..576fcc9 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java +++ b/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java @@ -80,8 +80,6 @@ public class UpdateChannelCommand extends CreateChannelCo= mmand { = // need to save before calling stored proc below ChannelFactory.save(c); - = - ChannelFactory.refreshNewestPackageCache(c, WEB_CHANNEL_CREATED); = return c; } --===============7797117036431423711==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:24 2015 Content-Type: multipart/mixed; boundary="===============2677509755103238425==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Tue, 09 Jun 2009 15:28:34 +0000 Message-ID: <20090609152834.2D112120194@lists.fedorahosted.org> --===============2677509755103238425== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java | = 2 -- 1 file changed, 2 deletions(-) New commits: commit e3400ac47bc83676861b79867a1885f11ed208c9 Author: Brad Buckingham Date: Tue Jun 9 11:12:25 2009 -0400 503801 - update channel details edit to not refresh package cache = Performing an edit of the basic channel details (i.e. channels/manage/E= dit.do) such as channel name, description, contact info...etc was resulting in a refresh of the 'new package' cache. This isn't needed for the 'edit' s= ince we are not altering the package content of the channel. Including this logic actually causes a timeout at run-time followed by a 500 ISE. diff --git a/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelComm= and.java b/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelComman= d.java index 1cb2ff5..576fcc9 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java +++ b/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java @@ -80,8 +80,6 @@ public class UpdateChannelCommand extends CreateChannelCo= mmand { = // need to save before calling stored proc below ChannelFactory.save(c); - = - ChannelFactory.refreshNewestPackageCache(c, WEB_CHANNEL_CREATED); = return c; } --===============2677509755103238425==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:24 2015 Content-Type: multipart/mixed; boundary="===============1559941266909442529==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: proxy/installer Date: Tue, 09 Jun 2009 15:33:58 +0000 Message-ID: <20090609153358.3E127120194@lists.fedorahosted.org> --===============1559941266909442529== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/installer/configure-proxy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4230c4de7f60b3770429248536f621cb29d1afe1 Author: Miroslav Such=C3=BD Date: Tue Jun 9 17:11:56 2009 +0200 504660 - fix typo in message diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure= -proxy.sh index f5efff2..c4d4371 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -191,7 +191,7 @@ HOSTNAME=3D$(hostname) = SSL_BUILD_DIR=3D${SSL_BUILD_DIR:-/root/ssl-build} if ! [ -d $SSL_BUILD_DIR ] && [ 0$FORCE_OWN_CA -eq 0 ]; then - echo "Error: ssl build directory $SSL_BUILD_DIR do not exist. Please crea= te this directory." + echo "Error: ssl build directory $SSL_BUILD_DIR does not exist. Please cr= eate this directory." exit 1 fi = --===============1559941266909442529==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:24 2015 Content-Type: multipart/mixed; boundary="===============1941286502756700717==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Tue, 09 Jun 2009 17:14:25 +0000 Message-ID: <20090609171425.E9654120194@lists.fedorahosted.org> --===============1941286502756700717== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xm= l | 16 = java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java = | 43 ++ java/code/src/com/redhat/rhn/manager/channel/MultipleChannelsWithPackageEx= ception.java | 59 +++ java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java = | 59 +++ java/code/src/com/redhat/rhn/manager/system/SystemManager.java = | 167 ++++++---- 5 files changed, 287 insertions(+), 57 deletions(-) New commits: commit cdbb55d521c01dea7b95ea23f9c1a471bd361108 Author: Devan Goodwin Date: Wed Jun 3 16:58:53 2009 -0300 490770 - Skip and warn if multiple virt channels are found. = Involves some big changes to the logic involved in auto-subscribing a system to child channels when given a virtualization entitlement. = The old logic was convoluted and possibly somewhat busted for Spacewalk in particular. The new logic is essentially: = - If Satellite, search for VT channel. - If none found, warn user but continue entitling. - If multiple found, warn user to manually sub to one but continue entitling. - If multiple found but system already subscribed to one, or if only one is found, subscribe the system and continue normally. - Search for channel with rhn-virtualization-host (which would be RHN Tools in the case of Satellite) - If Satellite and none found, warn user RHN Tools is missing and continue entitling. - If Spacewalk and none found, warn user rhn-virtualization-host is missing and continue entitling. - If multiple found, warn user to manually subscribe to one and continue entitling. - If multiple found but system already has one, or only one result is found, subscribe the system and schedule the package for installation. diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResou= rce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringRe= source_en_US.xml index 493afba..ad356ad 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml @@ -7518,12 +7518,26 @@ Follow this url to see the full list of inactive sy= stems:
                                      -Could not automatically subscribe the system to the @@PRODUCT_NAME= @@ Tools Channel. This channel contains packages required for virtualizati= on. This is most likely caused by a lack of channel entitlements. +Could not automatically subscribe the system to the RHN Tools Chan= nel. This channel contains packages required for virtualization. This is = most likely caused by a lack of channel entitlements. /rhn/systems/details/Overvi= ew.do = + + Found multiple child channels with package: {0}. Please = manually subscribe this system to the appropriate child channel. + + /rhn/systems/details/Overvi= ew.do + + + + + Found multiple child channels with package: {0}. Please = manually subscribe this system to the appropriate child channel, and schedu= le this package for installation. + + /rhn/systems/details/Overvi= ew.do + + + Could not automatically subscribe the system to the RHEL Virtualiz= ation Channel. This channel contains packages required for virtualization.= This is most likely caused by a lack of channel entitlements. diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.ja= va b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java index 2f05f7f..526b4e7 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -1450,18 +1450,28 @@ public class ChannelManager extends BaseManager { params.put("package", packageName); params.put("org_id", org.getId()); = - //whittle down until we have the piece we want. DataResult dr =3D m.execute(params); if (dr.size() =3D=3D 0) { return null; } + if (dr.size() > 1) { + List channelIds =3D new LinkedList(); + for (Iterator it =3D dr.iterator(); it.hasNext();) { + channelIds.add((Long)((Map)it.next()).get("id")); + } + // Multiple channels have this package, highly unlikely we can= guess which + // one is the right one so we'll raise an exception and let th= e caller + // decide what to do. + throw new MultipleChannelsWithPackageException(channelIds); + } + Map dm =3D (Map)dr.get(0); return (Long) dm.get("id"); } = = /** - * Finds the id of a child channel that contains + * Finds the ids of all child channels that contain * a package with the given name. Will only all the child channels. * @param packageName The exact name of the package sought for. * @return The list of ids = @@ -1503,15 +1513,38 @@ public class ChannelManager extends BaseManager { return null; } = - //we know its the channel we want if it has the rhncfg package in = it. + // We know its the channel we want if it has the package in it: Long bcid =3D current.getBaseChannel().getId(); log.debug("found basechannel: " + bcid); - Long cid =3D ChannelManager.findChildChannelWithPackage(user.getOr= g(), bcid, - packageName); + + Long cid =3D null; + + try { + cid =3D ChannelManager.findChildChannelWithPackage(user.getOrg= (), bcid, + packageName); + } + catch (MultipleChannelsWithPackageException e) { + // If multiple channels have the package we're looking for, se= e if the server + // already has access to one of them before raising this excep= tion. + for (Long channelId : e.getChannelIds()) { + Channel c =3D ChannelManager.lookupByIdAndUser(channelId, = user); + if (current.isSubscribed(c)) { + // found a channel already subscribed + cid =3D channelId; + break; + } + } + if (cid =3D=3D null) { + // Didn't find one, re-throw the exception: + throw e; + } + } + if (cid =3D=3D null) { // Didnt find it .. log.debug("didnt find a child channel with the package."); return null; } + Channel channel =3D ChannelManager.lookupByIdAndUser(cid, user); boolean canSubscribe =3D false; = diff --git a/java/code/src/com/redhat/rhn/manager/channel/MultipleChannelsW= ithPackageException.java b/java/code/src/com/redhat/rhn/manager/channel/Mul= tipleChannelsWithPackageException.java new file mode 100644 index 0000000..613aab5 --- /dev/null +++ b/java/code/src/com/redhat/rhn/manager/channel/MultipleChannelsWithPack= ageException.java @@ -0,0 +1,59 @@ +/** + * Copyright (c) 2009 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.manager.channel; + +import com.redhat.rhn.common.RhnRuntimeException; + +import java.util.List; + +/** + * MultipleChannelsWithPackageException + * @version $Rev$ + */ +public class MultipleChannelsWithPackageException extends RhnRuntimeExcept= ion { + + private List channelIds; + + /** + * Constructor + * + * @param channelIdsIn List of channel IDs which have the package in q= uestion. + */ + public MultipleChannelsWithPackageException(List channelIdsIn) { + super(); + channelIds =3D channelIdsIn; + } + + + /** + * Return the list of channel IDs that were found to have this package. + * + * @return the channelIds + */ + public List getChannelIds() { + return channelIds; + } + + /** + * Constructor + * @param cause the cause (which is saved for later retrieval + * by the Throwable.getCause() method). (A null value is + * permitted, and indicates that the cause is nonexistent or + * unknown.) + */ + public MultipleChannelsWithPackageException(Throwable cause) { + super(cause); + } +} diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManag= erTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelMana= gerTest.java index 35a4441..cef8092 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java +++ b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java @@ -48,6 +48,7 @@ import com.redhat.rhn.frontend.dto.SystemsPerChannelDto; import com.redhat.rhn.frontend.xmlrpc.NoSuchChannelException; import com.redhat.rhn.manager.channel.ChannelEntitlementCounter; import com.redhat.rhn.manager.channel.ChannelManager; +import com.redhat.rhn.manager.channel.MultipleChannelsWithPackageException; import com.redhat.rhn.manager.entitlement.EntitlementManager; import com.redhat.rhn.manager.errata.ErrataManager; import com.redhat.rhn.manager.rhnpackage.test.PackageManagerTest; @@ -556,6 +557,64 @@ public class ChannelManagerTest extends BaseTestCaseWi= thUser { = } = + public void testSubscribeToChildChannelWithPackageNameMultipleResults() + throws Exception { + + UserTestUtils.addVirtualization(user.getOrg()); + Server s =3D ServerTestUtils.createTestSystem(user); + Channel[] chans =3D ChannelTestUtils. + setupBaseChannelForVirtualization(s.getCreator(), s.getBaseCha= nnel()); + // Repeat to ensure there's multiple child channels created: + chans =3D ChannelTestUtils. + setupBaseChannelForVirtualization(s.getCreator(), s.getBaseCha= nnel()); + Config.get().setString(ChannelEntitlementCounter.class.getName(), + TestChannelCounter.class.getName()); + + int channelCountBefore =3D s.getChannels().size(); + try { + ChannelManager.subscribeToChildChannelWithPackageName(user, + s, ChannelManager.TOOLS_CHANNEL_PACKAGE_NAME); + fail(); + } + catch (MultipleChannelsWithPackageException e) { + // expected + } + assertEquals(channelCountBefore, s.getChannels().size()); + + Config.get().setString(ChannelEntitlementCounter.class.getName(), + ChannelEntitlementCounter.class.getName()); + + } + + public void testSubscribeToChildChannelWithPackageNameMultipleResultsA= lreadySubbed() + throws Exception { + + UserTestUtils.addVirtualization(user.getOrg()); + Server s =3D ServerTestUtils.createTestSystem(user); + Channel[] chans =3D ChannelTestUtils. + setupBaseChannelForVirtualization(s.getCreator(), s.getBaseChannel= ()); + // Repeat to ensure there's multiple child channels created: + chans =3D ChannelTestUtils. + setupBaseChannelForVirtualization(s.getCreator(), s.getBaseChannel= ()); + Config.get().setString(ChannelEntitlementCounter.class.getName(), + TestChannelCounter.class.getName()); + + // Subscribe to one set of the child channels but not the other, t= his should *not* + // generate the multiple channels with package exception: + s.addChannel(chans[0]); + s.addChannel(chans[1]); + TestUtils.saveAndReload(s); + + int channelCountBefore =3D s.getChannels().size(); + assertNotNull(ChannelManager.subscribeToChildChannelWithPackageNam= e(user, + s, ChannelManager.TOOLS_CHANNEL_PACKAGE_NAME)); + assertEquals(channelCountBefore, s.getChannels().size()); + + Config.get().setString(ChannelEntitlementCounter.class.getName(), + ChannelEntitlementCounter.class.getName()); + + } + public void testsubscribeToChildChannelByOSProduct() throws Exception { UserTestUtils.addVirtualization(user.getOrg()); = Server s =3D ServerTestUtils.createTestSystem(user); diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java= b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java index 2b10053..4696473 100644 --- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java +++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java @@ -36,8 +36,10 @@ import com.redhat.rhn.domain.entitlement.Entitlement; import com.redhat.rhn.domain.entitlement.VirtualizationEntitlement; import com.redhat.rhn.domain.errata.Errata; import com.redhat.rhn.domain.org.Org; +import com.redhat.rhn.domain.rhnpackage.PackageFactory; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.domain.server.CPU; +import com.redhat.rhn.domain.server.InstalledPackage; import com.redhat.rhn.domain.server.Note; import com.redhat.rhn.domain.server.ProxyInfo; import com.redhat.rhn.domain.server.Server; @@ -63,6 +65,7 @@ import com.redhat.rhn.frontend.xmlrpc.ProxySystemIsSatell= iteException; import com.redhat.rhn.manager.BaseManager; import com.redhat.rhn.manager.action.ActionManager; import com.redhat.rhn.manager.channel.ChannelManager; +import com.redhat.rhn.manager.channel.MultipleChannelsWithPackageException; import com.redhat.rhn.manager.entitlement.EntitlementManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.user.UserManager; @@ -1536,77 +1539,139 @@ public class SystemManager extends BaseManager { return result; } = - = - = // Need to do some extra logic here // 1) Subscribe system to rhel-i386-server-vt-5 channel // 2) Subscribe system to rhn-tools-rhel-i386-server-5 // 3) Schedule package install of rhn-virtualization-host // Return a map with errors and warnings: // warnings -> list of ValidationWarnings - // errors -> list of ValidationErrors (usually just one but a lis= t just in case) + // errors -> list of ValidationErrors private static ValidatorResult setupSystemForVirtualization(Org orgIn,= Long sid) { = Server server =3D ServerFactory.lookupById(sid); User user =3D UserFactory.findRandomOrgAdmin(orgIn); - Channel toolsChannel =3D ChannelManager.subscribeToChildChannelWit= hPackageName( - user, server, ChannelManager.TOOLS_CHANNEL_PACKAGE_NAME); - ValidatorResult result =3D new ValidatorResult(); - = - // Check for RHN Tools and VT Channels in Satellite, error out if = not found: - // Skip these checks in Spacewalk, there are no tools and virt cha= nnels here. + + // If this is a Satellite, subscribe to the virt channel if possib= le: if (!Config.get().isSpacewalk()) { - if (toolsChannel =3D=3D null) { - log.debug("no tools channel found"); - result.addError(new ValidatorError("system.entitle.notools= channel")); - return result; - } + subscribeToVirtChannel(server, user, result); + } + + // Before we start looking to subscribe to a 'tools' channel for + // rhn-virtualization-host, check if the server already has a pack= age by this + // name installed and leave it be if so. + InstalledPackage rhnVirtHost =3D PackageFactory.lookupByNameAndSer= ver( + ChannelManager.RHN_VIRT_HOST_PACKAGE_NAME, server); + if (rhnVirtHost !=3D null) { + // System already has the package, we can stop here. + log.debug("System already has " + + ChannelManager.RHN_VIRT_HOST_PACKAGE_NAME + " installe= d."); + return result; + } + else { + scheduleVirtualizationHostPackageInstall(server, user, result); + } = - Channel virtChannel =3D ChannelManager.subscribeToChildChannel= ByOSProduct( - user, server, ChannelManager.VT_OS_PRODUCT); - log.debug("did we get back a virt channel: " + virtChannel); - // Try by package name - if (virtChannel =3D=3D null) { - log.debug("Couldnt find a virt channel by OS/Product mappi= ngs, " + - "trying package"); - virtChannel =3D ChannelManager.subscribeToChildChannelWith= PackageName( - user, server, ChannelManager.VIRT_CHANNEL_PACKAGE_= NAME); - } + return result; + } = - // If we couldn't find a virt channel, error out. This must on= ly be done for - // RHEL systems. - if (virtChannel =3D=3D null) { - log.debug("no virt channel"); - result.addError(new ValidatorError("system.entitle.novirtc= hannel")); - return result; + /** + * Schedule installation of rhn-virtualization-host package. + * + * Implies that we locate a child channel with this package and automa= tically + * subscribe the system to it if possible. If multiple child channels = have the package + * and the server is not already subscribed to one, we report the disc= repancy and + * instruct the user to deal with this manually. + * + * @param server Server to schedule install for. + * @param user User performing the operation. + * @param result Validation result we'll be returning for the UI to re= nder. + */ + private static void scheduleVirtualizationHostPackageInstall(Server se= rver, + User user, ValidatorResult result) { + // Now subscribe to a child channel with rhn-virtualization-host (= RHN Tools in the + // case of Satellite) and schedule it for installation, or warn if= we cannot find + // a child with the package: + Channel toolsChannel =3D null; + try { + toolsChannel =3D ChannelManager.subscribeToChildChannelWithPac= kageName( + user, server, ChannelManager.RHN_VIRT_HOST_PACKAGE_NAM= E); + + // If this is a Satellite and no RHN Tools channel is available + // report the error, but continue: + if (!Config.get().isSpacewalk() && toolsChannel =3D=3D null) { + log.warn("no tools channel found"); + result.addWarning(new ValidatorWarning("system.entitle.not= oolschannel")); + } + // If Spacewalk and no channel has the rhn-virtualization-host= package, + // warn but allow the operation to proceed. + else if (toolsChannel =3D=3D null) { + result.addWarning(new ValidatorWarning("system.entitle.nov= irtpackage", + ChannelManager.RHN_VIRT_HOST_PACKAGE_NAME)); + } + else { + List packageResults =3D ChannelManager.listLatestPackagesE= qual( + toolsChannel.getId(), ChannelManager.RHN_VIRT_HOST= _PACKAGE_NAME); + if (packageResults.size() > 0) { + Map row =3D (Map) packageResults.get(0); + Long nameId =3D (Long) row.get("name_id"); + Long evrId =3D (Long) row.get("evr_id"); + Long archId =3D (Long) row.get("package_arch_id"); + ActionManager.schedulePackageInstall( + user, server, nameId, evrId, archId); + } + else { + result.addWarning(new ValidatorWarning("system.entitle= .novirtpackage", + ChannelManager.RHN_VIRT_HOST_PACKA= GE_NAME)); + } } } - = - // Look for the rhn-virtualization-host package and display a warn= ing if it - // couldn't be found. - if (toolsChannel =3D=3D null) { - result.addWarning(new ValidatorWarning("system.entitle.novirtp= ackage", - ChannelManager.RHN_VIRT_HOST_PACKAGE_NAME)= ); + catch (MultipleChannelsWithPackageException e) { + log.warn("Found multiple child channels with package: " + + ChannelManager.RHN_VIRT_HOST_PACKAGE_NAME); + result.addWarning(new ValidatorWarning( + "system.entitle.multiplechannelswithpackagepleasei= nstall", + ChannelManager.RHN_VIRT_HOST_PACKAGE_NAME)); } - else { - List packageResults =3D ChannelManager.listLatestPackagesEqual( - toolsChannel.getId(), ChannelManager.RHN_VIRT_HOST_PAC= KAGE_NAME); - if (packageResults.size() > 0) { - Map row =3D (Map) packageResults.get(0); - Long nameId =3D (Long) row.get("name_id"); - Long evrId =3D (Long) row.get("evr_id"); - Long archId =3D (Long) row.get("package_arch_id"); - ActionManager.schedulePackageInstall( - user, server, nameId, evrId, archId); + } + + /** + * Subscribe the system to the Red Hat Virtualization channel if neces= sary. + * + * This method should only ever be called in Satellite. + * + * @param server Server to schedule install for. + * @param user User performing the operation. + * @param result Validation result we'll be returning for the UI to re= nder. + */ + private static void subscribeToVirtChannel(Server server, User user, + ValidatorResult result) { + Channel virtChannel =3D ChannelManager.subscribeToChildChannelByOS= Product( + user, server, ChannelManager.VT_OS_PRODUCT); + log.debug("virtChannel search by OS product found: " + virtChannel= ); + // Otherwise, try just searching by package name: (libvirt in this= case) + if (virtChannel =3D=3D null) { + log.debug("Couldnt find a virt channel by OS/Product mappings,= " + + "trying package"); + try { + virtChannel =3D ChannelManager.subscribeToChildChannelWith= PackageName( + user, server, ChannelManager.VIRT_CHANNEL_PACKAGE_= NAME); + + // If we couldn't find a virt channel, warn the user but c= ontinue: + if (virtChannel =3D=3D null) { + log.warn("no virt channel"); + result.addWarning(new ValidatorWarning( + "system.entitle.novirtchannel")); + } } - else { - result.addWarning(new ValidatorWarning("system.entitle.nov= irtpackage", - ChannelManager.RHN_VIRT_HOST_PACKAGE_N= AME)); + catch (MultipleChannelsWithPackageException e) { + log.warn("Found multiple child channels with package: " + + ChannelManager.VIRT_CHANNEL_PACKAGE_NAME); + result.addWarning(new ValidatorWarning( + "system.entitle.multiplechannelswithpackage", + ChannelManager.VIRT_CHANNEL_PACKAGE_NAME)); } } - = - return result; } = /** --===============1941286502756700717==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:25 2015 Content-Type: multipart/mixed; boundary="===============2063146618172748307==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Tue, 09 Jun 2009 17:15:05 +0000 Message-ID: <20090609171505.400B2120194@lists.fedorahosted.org> --===============2063146618172748307== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xm= l | 16 = java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java = | 43 ++ java/code/src/com/redhat/rhn/manager/channel/MultipleChannelsWithPackageEx= ception.java | 59 +++ java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java = | 59 +++ java/code/src/com/redhat/rhn/manager/system/SystemManager.java = | 167 ++++++---- 5 files changed, 287 insertions(+), 57 deletions(-) New commits: commit 283ae89083b7d802a5bc093c29ab65ee06e2e2fb Author: Devan Goodwin Date: Wed Jun 3 16:58:53 2009 -0300 490770 - Skip and warn if multiple virt channels are found. = Involves some big changes to the logic involved in auto-subscribing a system to child channels when given a virtualization entitlement. = The old logic was convoluted and possibly somewhat busted for Spacewalk in particular. The new logic is essentially: = - If Satellite, search for VT channel. - If none found, warn user but continue entitling. - If multiple found, warn user to manually sub to one but continue entitling. - If multiple found but system already subscribed to one, or if only one is found, subscribe the system and continue normally. - Search for channel with rhn-virtualization-host (which would be RHN Tools in the case of Satellite) - If Satellite and none found, warn user RHN Tools is missing and continue entitling. - If Spacewalk and none found, warn user rhn-virtualization-host is missing and continue entitling. - If multiple found, warn user to manually subscribe to one and continue entitling. - If multiple found but system already has one, or only one result is found, subscribe the system and schedule the package for installation. diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResou= rce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringRe= source_en_US.xml index 493afba..ad356ad 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml @@ -7518,12 +7518,26 @@ Follow this url to see the full list of inactive sy= stems: -Could not automatically subscribe the system to the @@PRODUCT_NAME= @@ Tools Channel. This channel contains packages required for virtualizati= on. This is most likely caused by a lack of channel entitlements. +Could not automatically subscribe the system to the RHN Tools Chan= nel. This channel contains packages required for virtualization. This is = most likely caused by a lack of channel entitlements. /rhn/systems/details/Overvi= ew.do = + + Found multiple child channels with package: {0}. Please = manually subscribe this system to the appropriate child channel. + + /rhn/systems/details/Overvi= ew.do + + + + + Found multiple child channels with package: {0}. Please = manually subscribe this system to the appropriate child channel, and schedu= le this package for installation. + + /rhn/systems/details/Overvi= ew.do + + + Could not automatically subscribe the system to the RHEL Virtualiz= ation Channel. This channel contains packages required for virtualization.= This is most likely caused by a lack of channel entitlements. diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.ja= va b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java index 2c323d6..2df1781 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -1473,18 +1473,28 @@ public class ChannelManager extends BaseManager { params.put("package", packageName); params.put("org_id", org.getId()); = - //whittle down until we have the piece we want. DataResult dr =3D m.execute(params); if (dr.size() =3D=3D 0) { return null; } + if (dr.size() > 1) { + List channelIds =3D new LinkedList(); + for (Iterator it =3D dr.iterator(); it.hasNext();) { + channelIds.add((Long)((Map)it.next()).get("id")); + } + // Multiple channels have this package, highly unlikely we can= guess which + // one is the right one so we'll raise an exception and let th= e caller + // decide what to do. + throw new MultipleChannelsWithPackageException(channelIds); + } + Map dm =3D (Map)dr.get(0); return (Long) dm.get("id"); } = = /** - * Finds the id of a child channel that contains + * Finds the ids of all child channels that contain * a package with the given name. Will only all the child channels. * @param packageName The exact name of the package sought for. * @return The list of ids = @@ -1526,15 +1536,38 @@ public class ChannelManager extends BaseManager { return null; } = - //we know its the channel we want if it has the rhncfg package in = it. + // We know its the channel we want if it has the package in it: Long bcid =3D current.getBaseChannel().getId(); log.debug("found basechannel: " + bcid); - Long cid =3D ChannelManager.findChildChannelWithPackage(user.getOr= g(), bcid, - packageName); + + Long cid =3D null; + + try { + cid =3D ChannelManager.findChildChannelWithPackage(user.getOrg= (), bcid, + packageName); + } + catch (MultipleChannelsWithPackageException e) { + // If multiple channels have the package we're looking for, se= e if the server + // already has access to one of them before raising this excep= tion. + for (Long channelId : e.getChannelIds()) { + Channel c =3D ChannelManager.lookupByIdAndUser(channelId, = user); + if (current.isSubscribed(c)) { + // found a channel already subscribed + cid =3D channelId; + break; + } + } + if (cid =3D=3D null) { + // Didn't find one, re-throw the exception: + throw e; + } + } + if (cid =3D=3D null) { // Didnt find it .. log.debug("didnt find a child channel with the package."); return null; } + Channel channel =3D ChannelManager.lookupByIdAndUser(cid, user); boolean canSubscribe =3D false; = diff --git a/java/code/src/com/redhat/rhn/manager/channel/MultipleChannelsW= ithPackageException.java b/java/code/src/com/redhat/rhn/manager/channel/Mul= tipleChannelsWithPackageException.java new file mode 100644 index 0000000..613aab5 --- /dev/null +++ b/java/code/src/com/redhat/rhn/manager/channel/MultipleChannelsWithPack= ageException.java @@ -0,0 +1,59 @@ +/** + * Copyright (c) 2009 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.manager.channel; + +import com.redhat.rhn.common.RhnRuntimeException; + +import java.util.List; + +/** + * MultipleChannelsWithPackageException + * @version $Rev$ + */ +public class MultipleChannelsWithPackageException extends RhnRuntimeExcept= ion { + + private List channelIds; + + /** + * Constructor + * + * @param channelIdsIn List of channel IDs which have the package in q= uestion. + */ + public MultipleChannelsWithPackageException(List channelIdsIn) { + super(); + channelIds =3D channelIdsIn; + } + + + /** + * Return the list of channel IDs that were found to have this package. + * + * @return the channelIds + */ + public List getChannelIds() { + return channelIds; + } + + /** + * Constructor + * @param cause the cause (which is saved for later retrieval + * by the Throwable.getCause() method). (A null value is + * permitted, and indicates that the cause is nonexistent or + * unknown.) + */ + public MultipleChannelsWithPackageException(Throwable cause) { + super(cause); + } +} diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManag= erTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelMana= gerTest.java index 35a4441..cef8092 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java +++ b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java @@ -48,6 +48,7 @@ import com.redhat.rhn.frontend.dto.SystemsPerChannelDto; import com.redhat.rhn.frontend.xmlrpc.NoSuchChannelException; import com.redhat.rhn.manager.channel.ChannelEntitlementCounter; import com.redhat.rhn.manager.channel.ChannelManager; +import com.redhat.rhn.manager.channel.MultipleChannelsWithPackageException; import com.redhat.rhn.manager.entitlement.EntitlementManager; import com.redhat.rhn.manager.errata.ErrataManager; import com.redhat.rhn.manager.rhnpackage.test.PackageManagerTest; @@ -556,6 +557,64 @@ public class ChannelManagerTest extends BaseTestCaseWi= thUser { = } = + public void testSubscribeToChildChannelWithPackageNameMultipleResults() + throws Exception { + + UserTestUtils.addVirtualization(user.getOrg()); + Server s =3D ServerTestUtils.createTestSystem(user); + Channel[] chans =3D ChannelTestUtils. + setupBaseChannelForVirtualization(s.getCreator(), s.getBaseCha= nnel()); + // Repeat to ensure there's multiple child channels created: + chans =3D ChannelTestUtils. + setupBaseChannelForVirtualization(s.getCreator(), s.getBaseCha= nnel()); + Config.get().setString(ChannelEntitlementCounter.class.getName(), + TestChannelCounter.class.getName()); + + int channelCountBefore =3D s.getChannels().size(); + try { + ChannelManager.subscribeToChildChannelWithPackageName(user, + s, ChannelManager.TOOLS_CHANNEL_PACKAGE_NAME); + fail(); + } + catch (MultipleChannelsWithPackageException e) { + // expected + } + assertEquals(channelCountBefore, s.getChannels().size()); + + Config.get().setString(ChannelEntitlementCounter.class.getName(), + ChannelEntitlementCounter.class.getName()); + + } + + public void testSubscribeToChildChannelWithPackageNameMultipleResultsA= lreadySubbed() + throws Exception { + + UserTestUtils.addVirtualization(user.getOrg()); + Server s =3D ServerTestUtils.createTestSystem(user); + Channel[] chans =3D ChannelTestUtils. + setupBaseChannelForVirtualization(s.getCreator(), s.getBaseChannel= ()); + // Repeat to ensure there's multiple child channels created: + chans =3D ChannelTestUtils. + setupBaseChannelForVirtualization(s.getCreator(), s.getBaseChannel= ()); + Config.get().setString(ChannelEntitlementCounter.class.getName(), + TestChannelCounter.class.getName()); + + // Subscribe to one set of the child channels but not the other, t= his should *not* + // generate the multiple channels with package exception: + s.addChannel(chans[0]); + s.addChannel(chans[1]); + TestUtils.saveAndReload(s); + + int channelCountBefore =3D s.getChannels().size(); + assertNotNull(ChannelManager.subscribeToChildChannelWithPackageNam= e(user, + s, ChannelManager.TOOLS_CHANNEL_PACKAGE_NAME)); + assertEquals(channelCountBefore, s.getChannels().size()); + + Config.get().setString(ChannelEntitlementCounter.class.getName(), + ChannelEntitlementCounter.class.getName()); + + } + public void testsubscribeToChildChannelByOSProduct() throws Exception { UserTestUtils.addVirtualization(user.getOrg()); = Server s =3D ServerTestUtils.createTestSystem(user); diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java= b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java index 2b10053..4696473 100644 --- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java +++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java @@ -36,8 +36,10 @@ import com.redhat.rhn.domain.entitlement.Entitlement; import com.redhat.rhn.domain.entitlement.VirtualizationEntitlement; import com.redhat.rhn.domain.errata.Errata; import com.redhat.rhn.domain.org.Org; +import com.redhat.rhn.domain.rhnpackage.PackageFactory; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.domain.server.CPU; +import com.redhat.rhn.domain.server.InstalledPackage; import com.redhat.rhn.domain.server.Note; import com.redhat.rhn.domain.server.ProxyInfo; import com.redhat.rhn.domain.server.Server; @@ -63,6 +65,7 @@ import com.redhat.rhn.frontend.xmlrpc.ProxySystemIsSatell= iteException; import com.redhat.rhn.manager.BaseManager; import com.redhat.rhn.manager.action.ActionManager; import com.redhat.rhn.manager.channel.ChannelManager; +import com.redhat.rhn.manager.channel.MultipleChannelsWithPackageException; import com.redhat.rhn.manager.entitlement.EntitlementManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.user.UserManager; @@ -1536,77 +1539,139 @@ public class SystemManager extends BaseManager { return result; } = - = - = // Need to do some extra logic here // 1) Subscribe system to rhel-i386-server-vt-5 channel // 2) Subscribe system to rhn-tools-rhel-i386-server-5 // 3) Schedule package install of rhn-virtualization-host // Return a map with errors and warnings: // warnings -> list of ValidationWarnings - // errors -> list of ValidationErrors (usually just one but a lis= t just in case) + // errors -> list of ValidationErrors private static ValidatorResult setupSystemForVirtualization(Org orgIn,= Long sid) { = Server server =3D ServerFactory.lookupById(sid); User user =3D UserFactory.findRandomOrgAdmin(orgIn); - Channel toolsChannel =3D ChannelManager.subscribeToChildChannelWit= hPackageName( - user, server, ChannelManager.TOOLS_CHANNEL_PACKAGE_NAME); - ValidatorResult result =3D new ValidatorResult(); - = - // Check for RHN Tools and VT Channels in Satellite, error out if = not found: - // Skip these checks in Spacewalk, there are no tools and virt cha= nnels here. + + // If this is a Satellite, subscribe to the virt channel if possib= le: if (!Config.get().isSpacewalk()) { - if (toolsChannel =3D=3D null) { - log.debug("no tools channel found"); - result.addError(new ValidatorError("system.entitle.notools= channel")); - return result; - } + subscribeToVirtChannel(server, user, result); + } + + // Before we start looking to subscribe to a 'tools' channel for + // rhn-virtualization-host, check if the server already has a pack= age by this + // name installed and leave it be if so. + InstalledPackage rhnVirtHost =3D PackageFactory.lookupByNameAndSer= ver( + ChannelManager.RHN_VIRT_HOST_PACKAGE_NAME, server); + if (rhnVirtHost !=3D null) { + // System already has the package, we can stop here. + log.debug("System already has " + + ChannelManager.RHN_VIRT_HOST_PACKAGE_NAME + " installe= d."); + return result; + } + else { + scheduleVirtualizationHostPackageInstall(server, user, result); + } = - Channel virtChannel =3D ChannelManager.subscribeToChildChannel= ByOSProduct( - user, server, ChannelManager.VT_OS_PRODUCT); - log.debug("did we get back a virt channel: " + virtChannel); - // Try by package name - if (virtChannel =3D=3D null) { - log.debug("Couldnt find a virt channel by OS/Product mappi= ngs, " + - "trying package"); - virtChannel =3D ChannelManager.subscribeToChildChannelWith= PackageName( - user, server, ChannelManager.VIRT_CHANNEL_PACKAGE_= NAME); - } + return result; + } = - // If we couldn't find a virt channel, error out. This must on= ly be done for - // RHEL systems. - if (virtChannel =3D=3D null) { - log.debug("no virt channel"); - result.addError(new ValidatorError("system.entitle.novirtc= hannel")); - return result; + /** + * Schedule installation of rhn-virtualization-host package. + * + * Implies that we locate a child channel with this package and automa= tically + * subscribe the system to it if possible. If multiple child channels = have the package + * and the server is not already subscribed to one, we report the disc= repancy and + * instruct the user to deal with this manually. + * + * @param server Server to schedule install for. + * @param user User performing the operation. + * @param result Validation result we'll be returning for the UI to re= nder. + */ + private static void scheduleVirtualizationHostPackageInstall(Server se= rver, + User user, ValidatorResult result) { + // Now subscribe to a child channel with rhn-virtualization-host (= RHN Tools in the + // case of Satellite) and schedule it for installation, or warn if= we cannot find + // a child with the package: + Channel toolsChannel =3D null; + try { + toolsChannel =3D ChannelManager.subscribeToChildChannelWithPac= kageName( + user, server, ChannelManager.RHN_VIRT_HOST_PACKAGE_NAM= E); + + // If this is a Satellite and no RHN Tools channel is available + // report the error, but continue: + if (!Config.get().isSpacewalk() && toolsChannel =3D=3D null) { + log.warn("no tools channel found"); + result.addWarning(new ValidatorWarning("system.entitle.not= oolschannel")); + } + // If Spacewalk and no channel has the rhn-virtualization-host= package, + // warn but allow the operation to proceed. + else if (toolsChannel =3D=3D null) { + result.addWarning(new ValidatorWarning("system.entitle.nov= irtpackage", + ChannelManager.RHN_VIRT_HOST_PACKAGE_NAME)); + } + else { + List packageResults =3D ChannelManager.listLatestPackagesE= qual( + toolsChannel.getId(), ChannelManager.RHN_VIRT_HOST= _PACKAGE_NAME); + if (packageResults.size() > 0) { + Map row =3D (Map) packageResults.get(0); + Long nameId =3D (Long) row.get("name_id"); + Long evrId =3D (Long) row.get("evr_id"); + Long archId =3D (Long) row.get("package_arch_id"); + ActionManager.schedulePackageInstall( + user, server, nameId, evrId, archId); + } + else { + result.addWarning(new ValidatorWarning("system.entitle= .novirtpackage", + ChannelManager.RHN_VIRT_HOST_PACKA= GE_NAME)); + } } } - = - // Look for the rhn-virtualization-host package and display a warn= ing if it - // couldn't be found. - if (toolsChannel =3D=3D null) { - result.addWarning(new ValidatorWarning("system.entitle.novirtp= ackage", - ChannelManager.RHN_VIRT_HOST_PACKAGE_NAME)= ); + catch (MultipleChannelsWithPackageException e) { + log.warn("Found multiple child channels with package: " + + ChannelManager.RHN_VIRT_HOST_PACKAGE_NAME); + result.addWarning(new ValidatorWarning( + "system.entitle.multiplechannelswithpackagepleasei= nstall", + ChannelManager.RHN_VIRT_HOST_PACKAGE_NAME)); } - else { - List packageResults =3D ChannelManager.listLatestPackagesEqual( - toolsChannel.getId(), ChannelManager.RHN_VIRT_HOST_PAC= KAGE_NAME); - if (packageResults.size() > 0) { - Map row =3D (Map) packageResults.get(0); - Long nameId =3D (Long) row.get("name_id"); - Long evrId =3D (Long) row.get("evr_id"); - Long archId =3D (Long) row.get("package_arch_id"); - ActionManager.schedulePackageInstall( - user, server, nameId, evrId, archId); + } + + /** + * Subscribe the system to the Red Hat Virtualization channel if neces= sary. + * + * This method should only ever be called in Satellite. + * + * @param server Server to schedule install for. + * @param user User performing the operation. + * @param result Validation result we'll be returning for the UI to re= nder. + */ + private static void subscribeToVirtChannel(Server server, User user, + ValidatorResult result) { + Channel virtChannel =3D ChannelManager.subscribeToChildChannelByOS= Product( + user, server, ChannelManager.VT_OS_PRODUCT); + log.debug("virtChannel search by OS product found: " + virtChannel= ); + // Otherwise, try just searching by package name: (libvirt in this= case) + if (virtChannel =3D=3D null) { + log.debug("Couldnt find a virt channel by OS/Product mappings,= " + + "trying package"); + try { + virtChannel =3D ChannelManager.subscribeToChildChannelWith= PackageName( + user, server, ChannelManager.VIRT_CHANNEL_PACKAGE_= NAME); + + // If we couldn't find a virt channel, warn the user but c= ontinue: + if (virtChannel =3D=3D null) { + log.warn("no virt channel"); + result.addWarning(new ValidatorWarning( + "system.entitle.novirtchannel")); + } } - else { - result.addWarning(new ValidatorWarning("system.entitle.nov= irtpackage", - ChannelManager.RHN_VIRT_HOST_PACKAGE_N= AME)); + catch (MultipleChannelsWithPackageException e) { + log.warn("Found multiple child channels with package: " + + ChannelManager.VIRT_CHANNEL_PACKAGE_NAME); + result.addWarning(new ValidatorWarning( + "system.entitle.multiplechannelswithpackage", + ChannelManager.VIRT_CHANNEL_PACKAGE_NAME)); } } - = - return result; } = /** --===============2063146618172748307==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:25 2015 Content-Type: multipart/mixed; boundary="===============6217548086978107081==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 2 commits - backend/server Date: Tue, 09 Jun 2009 17:17:46 +0000 Message-ID: <20090609171746.7192A120194@lists.fedorahosted.org> --===============6217548086978107081== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/test/test_errata_import.py | 345 -------------------------= ----- 1 file changed, 345 deletions(-) New commits: commit 82f6d64847b50cf116155c276e09148bbd968366 Merge: 0a0292a... cdbb55d... Author: Pradeep Kilambi Date: Tue Jun 9 13:17:39 2009 -0400 Merge branch 'VADER' of ssh://pkilambi(a)git.fedorahosted.org/git/space= walk into vader commit 0a0292a6df26d666353161a6e220261df7765992 Author: Pradeep Kilambi Date: Tue Jun 9 13:17:16 2009 -0400 removing bugzilla handler specific tests diff --git a/backend/server/test/test_errata_import.py b/backend/server/tes= t/test_errata_import.py deleted file mode 100755 index 0941b10..0000000 --- a/backend/server/test/test_errata_import.py +++ /dev/null @@ -1,345 +0,0 @@ -#!/usr/bin/python -# -# Copyright (c) 2008 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. = -# - -import sys -import xmlrpclib -import unittest - -SERVER =3D 'scripts.back-webdev.redhat.com' - -class ErrataImportTests(unittest.TestCase): - = - def testUtf8Erratum(self): - global SERVER - - - # To actually make this one repeatable, need to munge the erratum_= hash['advisory_name'] or erratum_hash['revision'] fields... - - erratum_hash =3D {'advisory_name': 'RHSA-2007:0008', - 'bugs': [{'id': 218055, - 'status': 'ON_QA', - 'summary': 'CVE-2006-6107 D-Bus denial o= f service'}], - 'crossref': '', - 'cve': 'CVE-2006-6107', - 'description': 'D-BUS is a system for sending mess= ages between applications. It is used\r\nboth for the systemwide message bu= s service, and as a\r\nper-user-login-session messaging facility.\r\n\r\nKi= mmo H\xc3\xa4m\xc3\xa4l\xc3\xa4inen discovered a flaw in the way D-BUS proc= esses certain\r\nmessages. It is possible for a local unprivileged D-BUS pr= ocess to disrupt\r\nthe ability of another D-BUS process to receive message= s. (CVE-2006-6107)\r\n\r\nUsers of dbus are advised to upgrade to these upd= ated packages, which\r\ncontain backported patches to correct this issue.', - 'errata_files': [{'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/SRPMS/dbus-0.22-12.EL.8.src.rpm', - 'md5sum': '379fdd3f9afb34124fa9b= 88deb440e3f', - 'rhn_channel': ['rh-x86_64-deskt= op-4', - 'rh-i386-desktop= -4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/x86_64/dbus-glib-0.22-12.EL.8.x86_64.rp= m', - 'md5sum': '8c41138bbf9127bbb2d79= 9f566ce3a8a', - 'rhn_channel': ['rh-x86_64-deskt= op-4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/x86_64/dbus-0.22-12.EL.8.x86_64.rpm', - 'md5sum': 'ac83105ce8b120ec537a3= ea54da1e37d', - 'rhn_channel': ['rh-x86_64-deskt= op-4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/x86_64/dbus-python-0.22-12.EL.8.x86_64.= rpm', - 'md5sum': '920cf9a273c521118e374= 230690a3df6', - 'rhn_channel': ['rh-x86_64-deskt= op-4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/x86_64/dbus-x11-0.22-12.EL.8.x86_64.rpm= ', - 'md5sum': '847b2400eee82a36e3542= b2f4f2d4947', - 'rhn_channel': ['rh-x86_64-deskt= op-4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/x86_64/dbus-devel-0.22-12.EL.8.x86_64.r= pm', - 'md5sum': '1b248af405670382e31b0= 6c4fa52fa36', - 'rhn_channel': ['rh-x86_64-deskt= op-4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/x86_64/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rh-x86_64-deskt= op-4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/x86_64/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rh-x86_64-deskt= op-4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/i386/dbus-devel-0.22-12.EL.8.i386.rpm', - 'md5sum': 'b8a46001a416b2e36f5da= 1e6868c91ec', - 'rhn_channel': ['rh-i386-desktop= -4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/i386/dbus-python-0.22-12.EL.8.i386.rpm', - 'md5sum': '8e5eadeb5be39e1398853= 36011551656', - 'rhn_channel': ['rh-i386-desktop= -4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/i386/dbus-x11-0.22-12.EL.8.i386.rpm', - 'md5sum': '2f9d064981b12a7f4cb8c= f74d6142de5', - 'rhn_channel': ['rh-i386-desktop= -4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/i386/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rh-i386-desktop= -4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/i386/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rh-i386-desktop= -4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/SRPMS/dbus-0.22-12.EL.8.src.rpm', - 'md5sum': '379fdd3f9afb34124fa9b= 88deb440e3f', - 'rhn_channel': ['rhel-x86_64-ws-= 4', - 'rhel-i386-ws-4', - 'rhel-ia64-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/x86_64/dbus-glib-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '8c41138bbf9127bbb2d79= 9f566ce3a8a', - 'rhn_channel': ['rhel-x86_64-ws-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/x86_64/dbus-0.22-12.EL.8.x86_64.rpm', - 'md5sum': 'ac83105ce8b120ec537a3= ea54da1e37d', - 'rhn_channel': ['rhel-x86_64-ws-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/x86_64/dbus-python-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '920cf9a273c521118e374= 230690a3df6', - 'rhn_channel': ['rhel-x86_64-ws-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/x86_64/dbus-x11-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '847b2400eee82a36e3542= b2f4f2d4947', - 'rhn_channel': ['rhel-x86_64-ws-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/x86_64/dbus-devel-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '1b248af405670382e31b0= 6c4fa52fa36', - 'rhn_channel': ['rhel-x86_64-ws-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/x86_64/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rhel-x86_64-ws-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/x86_64/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rhel-x86_64-ws-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/ia64/dbus-glib-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'b07996f3ebf2331958a1a= dfd230302cc', - 'rhn_channel': ['rhel-ia64-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/ia64/dbus-python-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'c7406fea694e12487aa82= 13142ed66ea', - 'rhn_channel': ['rhel-ia64-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/ia64/dbus-x11-0.22-12.EL.8.ia64.rpm', - 'md5sum': '7097ef62d6917170005f0= 00a14a54fe7', - 'rhn_channel': ['rhel-ia64-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/ia64/dbus-devel-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'a294a24161855aa73d4a9= d83e4f3a107', - 'rhn_channel': ['rhel-ia64-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/ia64/dbus-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'dd584d93cd98e8ebc3331= e5c5d938b87', - 'rhn_channel': ['rhel-ia64-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/ia64/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rhel-ia64-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/ia64/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rhel-ia64-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/i386/dbus-devel-0.22-12.EL.8.i386.rpm', - 'md5sum': 'b8a46001a416b2e36f5da= 1e6868c91ec', - 'rhn_channel': ['rhel-i386-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/i386/dbus-python-0.22-12.EL.8.i386.rpm', - 'md5sum': '8e5eadeb5be39e1398853= 36011551656', - 'rhn_channel': ['rhel-i386-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/i386/dbus-x11-0.22-12.EL.8.i386.rpm', - 'md5sum': '2f9d064981b12a7f4cb8c= f74d6142de5', - 'rhn_channel': ['rhel-i386-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/i386/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rhel-i386-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/i386/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rhel-i386-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/SRPMS/dbus-0.22-12.EL.8.src.rpm', - 'md5sum': '379fdd3f9afb34124fa9b= 88deb440e3f', - 'rhn_channel': ['rhel-x86_64-es-= 4', - 'rhel-i386-es-4', - 'rhel-ia64-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/x86_64/dbus-glib-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '8c41138bbf9127bbb2d79= 9f566ce3a8a', - 'rhn_channel': ['rhel-x86_64-es-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/x86_64/dbus-0.22-12.EL.8.x86_64.rpm', - 'md5sum': 'ac83105ce8b120ec537a3= ea54da1e37d', - 'rhn_channel': ['rhel-x86_64-es-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/x86_64/dbus-python-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '920cf9a273c521118e374= 230690a3df6', - 'rhn_channel': ['rhel-x86_64-es-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/x86_64/dbus-x11-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '847b2400eee82a36e3542= b2f4f2d4947', - 'rhn_channel': ['rhel-x86_64-es-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/x86_64/dbus-devel-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '1b248af405670382e31b0= 6c4fa52fa36', - 'rhn_channel': ['rhel-x86_64-es-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/x86_64/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rhel-x86_64-es-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/x86_64/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rhel-x86_64-es-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/ia64/dbus-glib-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'b07996f3ebf2331958a1a= dfd230302cc', - 'rhn_channel': ['rhel-ia64-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/ia64/dbus-python-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'c7406fea694e12487aa82= 13142ed66ea', - 'rhn_channel': ['rhel-ia64-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/ia64/dbus-x11-0.22-12.EL.8.ia64.rpm', - 'md5sum': '7097ef62d6917170005f0= 00a14a54fe7', - 'rhn_channel': ['rhel-ia64-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/ia64/dbus-devel-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'a294a24161855aa73d4a9= d83e4f3a107', - 'rhn_channel': ['rhel-ia64-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/ia64/dbus-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'dd584d93cd98e8ebc3331= e5c5d938b87', - 'rhn_channel': ['rhel-ia64-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/ia64/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rhel-ia64-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/ia64/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rhel-ia64-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/i386/dbus-devel-0.22-12.EL.8.i386.rpm', - 'md5sum': 'b8a46001a416b2e36f5da= 1e6868c91ec', - 'rhn_channel': ['rhel-i386-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/i386/dbus-python-0.22-12.EL.8.i386.rpm', - 'md5sum': '8e5eadeb5be39e1398853= 36011551656', - 'rhn_channel': ['rhel-i386-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/i386/dbus-x11-0.22-12.EL.8.i386.rpm', - 'md5sum': '2f9d064981b12a7f4cb8c= f74d6142de5', - 'rhn_channel': ['rhel-i386-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/i386/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rhel-i386-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/i386/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rhel-i386-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/SRPMS/dbus-0.22-12.EL.8.src.rpm', - 'md5sum': '379fdd3f9afb34124fa9b= 88deb440e3f', - 'rhn_channel': ['rhel-i386-as-4', - 'rhel-ia64-as-4', - 'rhel-ppc-as-4', - 'rhel-s390x-as-4= ', - 'rhel-s390-as-4', - 'rhel-x86_64-as-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ppc/dbus-devel-0.22-12.EL.8.ppc.rpm', - 'md5sum': 'd4adf9454e5303fdcaab8= c43805a212c', - 'rhn_channel': ['rhel-ppc-as-4']= }, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ppc/dbus-0.22-12.EL.8.ppc.rpm', - 'md5sum': 'acaed9d78ce157ef8b15e= 19692c832c1', - 'rhn_channel': ['rhel-ppc-as-4']= }, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ppc/dbus-python-0.22-12.EL.8.ppc.rpm', - 'md5sum': '60c70fee76a3a98c6cf46= 629901b2ed3', - 'rhn_channel': ['rhel-ppc-as-4']= }, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ppc/dbus-glib-0.22-12.EL.8.ppc.rpm', - 'md5sum': '1a66a5a36be6167dff255= 8866ab34d9c', - 'rhn_channel': ['rhel-ppc-as-4']= }, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ppc/dbus-x11-0.22-12.EL.8.ppc.rpm', - 'md5sum': '02a34c40ade9386f829e0= bbf12dc8036', - 'rhn_channel': ['rhel-ppc-as-4']= }, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ppc/dbus-0.22-12.EL.8.ppc64.rpm', - 'md5sum': '87db84625d2e27f3b0c16= 8e2f1e34a18', - 'rhn_channel': ['rhel-ppc-as-4']= }, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ppc/dbus-glib-0.22-12.EL.8.ppc64.rpm', - 'md5sum': 'e28bef04fa98091747dee= f3b121fec18', - 'rhn_channel': ['rhel-ppc-as-4']= }, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390x/dbus-python-0.22-12.EL.8.s390x.rpm', - 'md5sum': '6afc6054de436384a7195= 1c4ca7c1083', - 'rhn_channel': ['rhel-s390x-as-4= ']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390x/dbus-glib-0.22-12.EL.8.s390x.rpm', - 'md5sum': '5608a1394e595ee7560bc= 2080b54524e', - 'rhn_channel': ['rhel-s390x-as-4= ']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390x/dbus-0.22-12.EL.8.s390x.rpm', - 'md5sum': '38a9c1c9838f1fc0ffe7e= 8c62259a4e9', - 'rhn_channel': ['rhel-s390x-as-4= ']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390x/dbus-devel-0.22-12.EL.8.s390x.rpm', - 'md5sum': 'd17fd60137f8fc012826c= b5c2fb1c798', - 'rhn_channel': ['rhel-s390x-as-4= ']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390x/dbus-x11-0.22-12.EL.8.s390x.rpm', - 'md5sum': 'aa63335eff72a01edf6c3= c8709257100', - 'rhn_channel': ['rhel-s390x-as-4= ']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390x/dbus-0.22-12.EL.8.s390.rpm', - 'md5sum': '2aec70890676846f00be1= fd5ed9f4a9c', - 'rhn_channel': ['rhel-s390x-as-4= ']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390x/dbus-glib-0.22-12.EL.8.s390.rpm', - 'md5sum': '79ebed9e812ce4760fcbd= 4bb7fa8efb7', - 'rhn_channel': ['rhel-s390x-as-4= ']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/x86_64/dbus-glib-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '8c41138bbf9127bbb2d79= 9f566ce3a8a', - 'rhn_channel': ['rhel-x86_64-as-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/x86_64/dbus-0.22-12.EL.8.x86_64.rpm', - 'md5sum': 'ac83105ce8b120ec537a3= ea54da1e37d', - 'rhn_channel': ['rhel-x86_64-as-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/x86_64/dbus-python-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '920cf9a273c521118e374= 230690a3df6', - 'rhn_channel': ['rhel-x86_64-as-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/x86_64/dbus-x11-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '847b2400eee82a36e3542= b2f4f2d4947', - 'rhn_channel': ['rhel-x86_64-as-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/x86_64/dbus-devel-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '1b248af405670382e31b0= 6c4fa52fa36', - 'rhn_channel': ['rhel-x86_64-as-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/x86_64/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rhel-x86_64-as-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/x86_64/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rhel-x86_64-as-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390/dbus-python-0.22-12.EL.8.s390.rpm', - 'md5sum': 'f1be5d2e04c8e0698cadd= c9d0af40ab2', - 'rhn_channel': ['rhel-s390-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390/dbus-x11-0.22-12.EL.8.s390.rpm', - 'md5sum': '11ca54506fedf365fab62= e025d7b742b', - 'rhn_channel': ['rhel-s390-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390/dbus-0.22-12.EL.8.s390.rpm', - 'md5sum': '2aec70890676846f00be1= fd5ed9f4a9c', - 'rhn_channel': ['rhel-s390-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390/dbus-glib-0.22-12.EL.8.s390.rpm', - 'md5sum': '79ebed9e812ce4760fcbd= 4bb7fa8efb7', - 'rhn_channel': ['rhel-s390-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390/dbus-devel-0.22-12.EL.8.s390.rpm', - 'md5sum': 'ba507082ec7e13a57cbf9= d2addf18e9d', - 'rhn_channel': ['rhel-s390-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ia64/dbus-glib-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'b07996f3ebf2331958a1a= dfd230302cc', - 'rhn_channel': ['rhel-ia64-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ia64/dbus-python-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'c7406fea694e12487aa82= 13142ed66ea', - 'rhn_channel': ['rhel-ia64-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ia64/dbus-x11-0.22-12.EL.8.ia64.rpm', - 'md5sum': '7097ef62d6917170005f0= 00a14a54fe7', - 'rhn_channel': ['rhel-ia64-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ia64/dbus-devel-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'a294a24161855aa73d4a9= d83e4f3a107', - 'rhn_channel': ['rhel-ia64-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ia64/dbus-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'dd584d93cd98e8ebc3331= e5c5d938b87', - 'rhn_channel': ['rhel-ia64-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ia64/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rhel-ia64-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ia64/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rhel-ia64-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/i386/dbus-devel-0.22-12.EL.8.i386.rpm', - 'md5sum': 'b8a46001a416b2e36f5da= 1e6868c91ec', - 'rhn_channel': ['rhel-i386-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/i386/dbus-python-0.22-12.EL.8.i386.rpm', - 'md5sum': '8e5eadeb5be39e1398853= 36011551656', - 'rhn_channel': ['rhel-i386-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/i386/dbus-x11-0.22-12.EL.8.i386.rpm', - 'md5sum': '2f9d064981b12a7f4cb8c= f74d6142de5', - 'rhn_channel': ['rhel-i386-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/i386/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rhel-i386-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/i386/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rhel-i386-as-4'= ]}], - 'errata_type': 'RHSA', - 'erratum_deployed_by': 'jorris(a)redhat.com', - 'issue_date': '2007-02-07', - 'keywords': '', - 'multilib': '', - 'obsoletes': '', - 'oval': '\n\n\n \n Red Hat Errata System<= /oval:product_name>\n 5.2\n = 2007-02-07T12:21:43\n \n\n = \n \n \n RHSA-2007:= 0008: dbus security update (Moderate)\n \n \n Red Hat Enterprise Linux 4\n = \n \n D-BUS is a system for sending messages between applicat= ions. It is used\r\nboth for the systemwide message bus service, and as a\r= \nper-user-login-session messaging facility.\r\n\r\nKimmo H\xc3\xa4m\xc3\xa= 4l\xc3\xa4inen discovered a flaw in the way D-BUS processes certain\r\nmess= ages. It is possible for a local unprivileged D-BUS process to disrupt\r\nt= he ability of another D-BUS process to receive messages. (CVE-2006-6107)\r\= n\r\nUsers of dbus are advised to upgrade to these updated packages, which\= r\ncontain backported patches to correct this issue.\n\n\n\n\n\n Moderate\n\n Copyright 2007 Red Hat, Inc.\n \n \n = CVE-2006-6107\n CVE-2006-6107 D-Bus denial of service\n \n \n \n \n \n \n \n \n \n\n \n \n\n \n \n\n \n \n\n \n \n\n= \n\n \n \n \n \n \n \n \n\n \n \n\n \n \n\n \n \n\n \n \n\n \n \n\n \n \n\n \n \n\n \n \n\n \n \n\n \n \n\n \n\n <= objects>\n \n \n dbus-x11\n\n db= us-python\n\n dbus-devel\n\n redhat-release\n\n dbu= s\n\n dbus-glib\n\= n \n \n \n \n 219180cddb42a60e\n\n ^4\\D\n\n 0:0.22-12.EL.8\n= \n \n\n\n', - 'packages': '', - 'product': 'Red Hat Enterprise Linux', - 'reference': 'http://www.redhat.com/security/updat= es/classification/#moderate', - 'revision': 3, - 'security_impact': 'Moderate', - 'solution': 'Before applying this update, make sur= e all previously released errata\r\nrelevant to your system have been appli= ed.\r\n\r\nThis update is available via Red Hat Network. To use Red Hat Ne= twork,\r\nlaunch the Red Hat Update Agent with the following command:\r\n\r= \nup2date\r\n\r\nThis will start an interactive process that will result in= the appropriate\r\nRPMs being upgraded on your system.', - 'synopsis': 'Moderate: dbus security update', - 'topic': 'Updated dbus packages that fix a securit= y issue are now available for Red\r\nHat Enterprise Linux 4.\r\n\r\nThis up= date has been rated as having moderate security impact by the Red\r\nHat Se= curity Response Team.', - 'update_date': '2007-02-07'} - - url =3D "http://" + SERVER + "/BUGZILLA" - s =3D xmlrpclib.Server(url) - s.bugzilla_errata.submit_errata(erratum_hash) - -unittest.main() --===============6217548086978107081==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:26 2015 Content-Type: multipart/mixed; boundary="===============1306686883357390176==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: backend/server Date: Tue, 09 Jun 2009 17:18:24 +0000 Message-ID: <20090609171824.8CFDD120194@lists.fedorahosted.org> --===============1306686883357390176== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/test/test_errata_import.py | 345 -------------------------= ----- 1 file changed, 345 deletions(-) New commits: commit 7f268b8565810001e021b3f1d03c59948759cf88 Author: Pradeep Kilambi Date: Tue Jun 9 13:17:16 2009 -0400 removing bugzilla handler specific tests diff --git a/backend/server/test/test_errata_import.py b/backend/server/tes= t/test_errata_import.py deleted file mode 100755 index 0941b10..0000000 --- a/backend/server/test/test_errata_import.py +++ /dev/null @@ -1,345 +0,0 @@ -#!/usr/bin/python -# -# Copyright (c) 2008 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. = -# - -import sys -import xmlrpclib -import unittest - -SERVER =3D 'scripts.back-webdev.redhat.com' - -class ErrataImportTests(unittest.TestCase): - = - def testUtf8Erratum(self): - global SERVER - - - # To actually make this one repeatable, need to munge the erratum_= hash['advisory_name'] or erratum_hash['revision'] fields... - - erratum_hash =3D {'advisory_name': 'RHSA-2007:0008', - 'bugs': [{'id': 218055, - 'status': 'ON_QA', - 'summary': 'CVE-2006-6107 D-Bus denial o= f service'}], - 'crossref': '', - 'cve': 'CVE-2006-6107', - 'description': 'D-BUS is a system for sending mess= ages between applications. It is used\r\nboth for the systemwide message bu= s service, and as a\r\nper-user-login-session messaging facility.\r\n\r\nKi= mmo H\xc3\xa4m\xc3\xa4l\xc3\xa4inen discovered a flaw in the way D-BUS proc= esses certain\r\nmessages. It is possible for a local unprivileged D-BUS pr= ocess to disrupt\r\nthe ability of another D-BUS process to receive message= s. (CVE-2006-6107)\r\n\r\nUsers of dbus are advised to upgrade to these upd= ated packages, which\r\ncontain backported patches to correct this issue.', - 'errata_files': [{'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/SRPMS/dbus-0.22-12.EL.8.src.rpm', - 'md5sum': '379fdd3f9afb34124fa9b= 88deb440e3f', - 'rhn_channel': ['rh-x86_64-deskt= op-4', - 'rh-i386-desktop= -4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/x86_64/dbus-glib-0.22-12.EL.8.x86_64.rp= m', - 'md5sum': '8c41138bbf9127bbb2d79= 9f566ce3a8a', - 'rhn_channel': ['rh-x86_64-deskt= op-4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/x86_64/dbus-0.22-12.EL.8.x86_64.rpm', - 'md5sum': 'ac83105ce8b120ec537a3= ea54da1e37d', - 'rhn_channel': ['rh-x86_64-deskt= op-4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/x86_64/dbus-python-0.22-12.EL.8.x86_64.= rpm', - 'md5sum': '920cf9a273c521118e374= 230690a3df6', - 'rhn_channel': ['rh-x86_64-deskt= op-4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/x86_64/dbus-x11-0.22-12.EL.8.x86_64.rpm= ', - 'md5sum': '847b2400eee82a36e3542= b2f4f2d4947', - 'rhn_channel': ['rh-x86_64-deskt= op-4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/x86_64/dbus-devel-0.22-12.EL.8.x86_64.r= pm', - 'md5sum': '1b248af405670382e31b0= 6c4fa52fa36', - 'rhn_channel': ['rh-x86_64-deskt= op-4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/x86_64/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rh-x86_64-deskt= op-4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/x86_64/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rh-x86_64-deskt= op-4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/i386/dbus-devel-0.22-12.EL.8.i386.rpm', - 'md5sum': 'b8a46001a416b2e36f5da= 1e6868c91ec', - 'rhn_channel': ['rh-i386-desktop= -4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/i386/dbus-python-0.22-12.EL.8.i386.rpm', - 'md5sum': '8e5eadeb5be39e1398853= 36011551656', - 'rhn_channel': ['rh-i386-desktop= -4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/i386/dbus-x11-0.22-12.EL.8.i386.rpm', - 'md5sum': '2f9d064981b12a7f4cb8c= f74d6142de5', - 'rhn_channel': ['rh-i386-desktop= -4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/i386/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rh-i386-desktop= -4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/i386/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rh-i386-desktop= -4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/SRPMS/dbus-0.22-12.EL.8.src.rpm', - 'md5sum': '379fdd3f9afb34124fa9b= 88deb440e3f', - 'rhn_channel': ['rhel-x86_64-ws-= 4', - 'rhel-i386-ws-4', - 'rhel-ia64-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/x86_64/dbus-glib-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '8c41138bbf9127bbb2d79= 9f566ce3a8a', - 'rhn_channel': ['rhel-x86_64-ws-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/x86_64/dbus-0.22-12.EL.8.x86_64.rpm', - 'md5sum': 'ac83105ce8b120ec537a3= ea54da1e37d', - 'rhn_channel': ['rhel-x86_64-ws-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/x86_64/dbus-python-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '920cf9a273c521118e374= 230690a3df6', - 'rhn_channel': ['rhel-x86_64-ws-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/x86_64/dbus-x11-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '847b2400eee82a36e3542= b2f4f2d4947', - 'rhn_channel': ['rhel-x86_64-ws-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/x86_64/dbus-devel-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '1b248af405670382e31b0= 6c4fa52fa36', - 'rhn_channel': ['rhel-x86_64-ws-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/x86_64/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rhel-x86_64-ws-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/x86_64/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rhel-x86_64-ws-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/ia64/dbus-glib-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'b07996f3ebf2331958a1a= dfd230302cc', - 'rhn_channel': ['rhel-ia64-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/ia64/dbus-python-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'c7406fea694e12487aa82= 13142ed66ea', - 'rhn_channel': ['rhel-ia64-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/ia64/dbus-x11-0.22-12.EL.8.ia64.rpm', - 'md5sum': '7097ef62d6917170005f0= 00a14a54fe7', - 'rhn_channel': ['rhel-ia64-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/ia64/dbus-devel-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'a294a24161855aa73d4a9= d83e4f3a107', - 'rhn_channel': ['rhel-ia64-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/ia64/dbus-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'dd584d93cd98e8ebc3331= e5c5d938b87', - 'rhn_channel': ['rhel-ia64-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/ia64/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rhel-ia64-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/ia64/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rhel-ia64-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/i386/dbus-devel-0.22-12.EL.8.i386.rpm', - 'md5sum': 'b8a46001a416b2e36f5da= 1e6868c91ec', - 'rhn_channel': ['rhel-i386-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/i386/dbus-python-0.22-12.EL.8.i386.rpm', - 'md5sum': '8e5eadeb5be39e1398853= 36011551656', - 'rhn_channel': ['rhel-i386-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/i386/dbus-x11-0.22-12.EL.8.i386.rpm', - 'md5sum': '2f9d064981b12a7f4cb8c= f74d6142de5', - 'rhn_channel': ['rhel-i386-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/i386/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rhel-i386-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/i386/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rhel-i386-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/SRPMS/dbus-0.22-12.EL.8.src.rpm', - 'md5sum': '379fdd3f9afb34124fa9b= 88deb440e3f', - 'rhn_channel': ['rhel-x86_64-es-= 4', - 'rhel-i386-es-4', - 'rhel-ia64-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/x86_64/dbus-glib-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '8c41138bbf9127bbb2d79= 9f566ce3a8a', - 'rhn_channel': ['rhel-x86_64-es-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/x86_64/dbus-0.22-12.EL.8.x86_64.rpm', - 'md5sum': 'ac83105ce8b120ec537a3= ea54da1e37d', - 'rhn_channel': ['rhel-x86_64-es-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/x86_64/dbus-python-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '920cf9a273c521118e374= 230690a3df6', - 'rhn_channel': ['rhel-x86_64-es-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/x86_64/dbus-x11-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '847b2400eee82a36e3542= b2f4f2d4947', - 'rhn_channel': ['rhel-x86_64-es-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/x86_64/dbus-devel-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '1b248af405670382e31b0= 6c4fa52fa36', - 'rhn_channel': ['rhel-x86_64-es-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/x86_64/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rhel-x86_64-es-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/x86_64/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rhel-x86_64-es-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/ia64/dbus-glib-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'b07996f3ebf2331958a1a= dfd230302cc', - 'rhn_channel': ['rhel-ia64-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/ia64/dbus-python-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'c7406fea694e12487aa82= 13142ed66ea', - 'rhn_channel': ['rhel-ia64-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/ia64/dbus-x11-0.22-12.EL.8.ia64.rpm', - 'md5sum': '7097ef62d6917170005f0= 00a14a54fe7', - 'rhn_channel': ['rhel-ia64-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/ia64/dbus-devel-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'a294a24161855aa73d4a9= d83e4f3a107', - 'rhn_channel': ['rhel-ia64-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/ia64/dbus-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'dd584d93cd98e8ebc3331= e5c5d938b87', - 'rhn_channel': ['rhel-ia64-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/ia64/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rhel-ia64-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/ia64/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rhel-ia64-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/i386/dbus-devel-0.22-12.EL.8.i386.rpm', - 'md5sum': 'b8a46001a416b2e36f5da= 1e6868c91ec', - 'rhn_channel': ['rhel-i386-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/i386/dbus-python-0.22-12.EL.8.i386.rpm', - 'md5sum': '8e5eadeb5be39e1398853= 36011551656', - 'rhn_channel': ['rhel-i386-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/i386/dbus-x11-0.22-12.EL.8.i386.rpm', - 'md5sum': '2f9d064981b12a7f4cb8c= f74d6142de5', - 'rhn_channel': ['rhel-i386-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/i386/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rhel-i386-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/i386/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rhel-i386-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/SRPMS/dbus-0.22-12.EL.8.src.rpm', - 'md5sum': '379fdd3f9afb34124fa9b= 88deb440e3f', - 'rhn_channel': ['rhel-i386-as-4', - 'rhel-ia64-as-4', - 'rhel-ppc-as-4', - 'rhel-s390x-as-4= ', - 'rhel-s390-as-4', - 'rhel-x86_64-as-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ppc/dbus-devel-0.22-12.EL.8.ppc.rpm', - 'md5sum': 'd4adf9454e5303fdcaab8= c43805a212c', - 'rhn_channel': ['rhel-ppc-as-4']= }, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ppc/dbus-0.22-12.EL.8.ppc.rpm', - 'md5sum': 'acaed9d78ce157ef8b15e= 19692c832c1', - 'rhn_channel': ['rhel-ppc-as-4']= }, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ppc/dbus-python-0.22-12.EL.8.ppc.rpm', - 'md5sum': '60c70fee76a3a98c6cf46= 629901b2ed3', - 'rhn_channel': ['rhel-ppc-as-4']= }, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ppc/dbus-glib-0.22-12.EL.8.ppc.rpm', - 'md5sum': '1a66a5a36be6167dff255= 8866ab34d9c', - 'rhn_channel': ['rhel-ppc-as-4']= }, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ppc/dbus-x11-0.22-12.EL.8.ppc.rpm', - 'md5sum': '02a34c40ade9386f829e0= bbf12dc8036', - 'rhn_channel': ['rhel-ppc-as-4']= }, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ppc/dbus-0.22-12.EL.8.ppc64.rpm', - 'md5sum': '87db84625d2e27f3b0c16= 8e2f1e34a18', - 'rhn_channel': ['rhel-ppc-as-4']= }, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ppc/dbus-glib-0.22-12.EL.8.ppc64.rpm', - 'md5sum': 'e28bef04fa98091747dee= f3b121fec18', - 'rhn_channel': ['rhel-ppc-as-4']= }, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390x/dbus-python-0.22-12.EL.8.s390x.rpm', - 'md5sum': '6afc6054de436384a7195= 1c4ca7c1083', - 'rhn_channel': ['rhel-s390x-as-4= ']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390x/dbus-glib-0.22-12.EL.8.s390x.rpm', - 'md5sum': '5608a1394e595ee7560bc= 2080b54524e', - 'rhn_channel': ['rhel-s390x-as-4= ']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390x/dbus-0.22-12.EL.8.s390x.rpm', - 'md5sum': '38a9c1c9838f1fc0ffe7e= 8c62259a4e9', - 'rhn_channel': ['rhel-s390x-as-4= ']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390x/dbus-devel-0.22-12.EL.8.s390x.rpm', - 'md5sum': 'd17fd60137f8fc012826c= b5c2fb1c798', - 'rhn_channel': ['rhel-s390x-as-4= ']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390x/dbus-x11-0.22-12.EL.8.s390x.rpm', - 'md5sum': 'aa63335eff72a01edf6c3= c8709257100', - 'rhn_channel': ['rhel-s390x-as-4= ']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390x/dbus-0.22-12.EL.8.s390.rpm', - 'md5sum': '2aec70890676846f00be1= fd5ed9f4a9c', - 'rhn_channel': ['rhel-s390x-as-4= ']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390x/dbus-glib-0.22-12.EL.8.s390.rpm', - 'md5sum': '79ebed9e812ce4760fcbd= 4bb7fa8efb7', - 'rhn_channel': ['rhel-s390x-as-4= ']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/x86_64/dbus-glib-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '8c41138bbf9127bbb2d79= 9f566ce3a8a', - 'rhn_channel': ['rhel-x86_64-as-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/x86_64/dbus-0.22-12.EL.8.x86_64.rpm', - 'md5sum': 'ac83105ce8b120ec537a3= ea54da1e37d', - 'rhn_channel': ['rhel-x86_64-as-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/x86_64/dbus-python-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '920cf9a273c521118e374= 230690a3df6', - 'rhn_channel': ['rhel-x86_64-as-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/x86_64/dbus-x11-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '847b2400eee82a36e3542= b2f4f2d4947', - 'rhn_channel': ['rhel-x86_64-as-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/x86_64/dbus-devel-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '1b248af405670382e31b0= 6c4fa52fa36', - 'rhn_channel': ['rhel-x86_64-as-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/x86_64/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rhel-x86_64-as-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/x86_64/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rhel-x86_64-as-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390/dbus-python-0.22-12.EL.8.s390.rpm', - 'md5sum': 'f1be5d2e04c8e0698cadd= c9d0af40ab2', - 'rhn_channel': ['rhel-s390-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390/dbus-x11-0.22-12.EL.8.s390.rpm', - 'md5sum': '11ca54506fedf365fab62= e025d7b742b', - 'rhn_channel': ['rhel-s390-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390/dbus-0.22-12.EL.8.s390.rpm', - 'md5sum': '2aec70890676846f00be1= fd5ed9f4a9c', - 'rhn_channel': ['rhel-s390-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390/dbus-glib-0.22-12.EL.8.s390.rpm', - 'md5sum': '79ebed9e812ce4760fcbd= 4bb7fa8efb7', - 'rhn_channel': ['rhel-s390-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390/dbus-devel-0.22-12.EL.8.s390.rpm', - 'md5sum': 'ba507082ec7e13a57cbf9= d2addf18e9d', - 'rhn_channel': ['rhel-s390-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ia64/dbus-glib-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'b07996f3ebf2331958a1a= dfd230302cc', - 'rhn_channel': ['rhel-ia64-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ia64/dbus-python-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'c7406fea694e12487aa82= 13142ed66ea', - 'rhn_channel': ['rhel-ia64-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ia64/dbus-x11-0.22-12.EL.8.ia64.rpm', - 'md5sum': '7097ef62d6917170005f0= 00a14a54fe7', - 'rhn_channel': ['rhel-ia64-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ia64/dbus-devel-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'a294a24161855aa73d4a9= d83e4f3a107', - 'rhn_channel': ['rhel-ia64-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ia64/dbus-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'dd584d93cd98e8ebc3331= e5c5d938b87', - 'rhn_channel': ['rhel-ia64-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ia64/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rhel-ia64-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ia64/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rhel-ia64-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/i386/dbus-devel-0.22-12.EL.8.i386.rpm', - 'md5sum': 'b8a46001a416b2e36f5da= 1e6868c91ec', - 'rhn_channel': ['rhel-i386-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/i386/dbus-python-0.22-12.EL.8.i386.rpm', - 'md5sum': '8e5eadeb5be39e1398853= 36011551656', - 'rhn_channel': ['rhel-i386-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/i386/dbus-x11-0.22-12.EL.8.i386.rpm', - 'md5sum': '2f9d064981b12a7f4cb8c= f74d6142de5', - 'rhn_channel': ['rhel-i386-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/i386/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rhel-i386-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/i386/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rhel-i386-as-4'= ]}], - 'errata_type': 'RHSA', - 'erratum_deployed_by': 'jorris(a)redhat.com', - 'issue_date': '2007-02-07', - 'keywords': '', - 'multilib': '', - 'obsoletes': '', - 'oval': '\n\n\n \n Red Hat Errata System<= /oval:product_name>\n 5.2\n = 2007-02-07T12:21:43\n \n\n = \n \n \n RHSA-2007:= 0008: dbus security update (Moderate)\n \n \n Red Hat Enterprise Linux 4\n = \n \n D-BUS is a system for sending messages between applicat= ions. It is used\r\nboth for the systemwide message bus service, and as a\r= \nper-user-login-session messaging facility.\r\n\r\nKimmo H\xc3\xa4m\xc3\xa= 4l\xc3\xa4inen discovered a flaw in the way D-BUS processes certain\r\nmess= ages. It is possible for a local unprivileged D-BUS process to disrupt\r\nt= he ability of another D-BUS process to receive messages. (CVE-2006-6107)\r\= n\r\nUsers of dbus are advised to upgrade to these updated packages, which\= r\ncontain backported patches to correct this issue.\n\n\n\n\n\n Moderate\n\n Copyright 2007 Red Hat, Inc.\n \n \n = CVE-2006-6107\n CVE-2006-6107 D-Bus denial of service\n \n \n \n \n \n \n \n \n \n\n \n \n\n \n \n\n \n \n\n \n \n\n= \n\n \n \n \n \n \n \n \n\n \n \n\n \n \n\n \n \n\n \n \n\n \n \n\n \n \n\n \n \n\n \n \n\n \n \n\n \n \n\n \n\n <= objects>\n \n \n dbus-x11\n\n db= us-python\n\n dbus-devel\n\n redhat-release\n\n dbu= s\n\n dbus-glib\n\= n \n \n \n \n 219180cddb42a60e\n\n ^4\\D\n\n 0:0.22-12.EL.8\n= \n \n\n\n', - 'packages': '', - 'product': 'Red Hat Enterprise Linux', - 'reference': 'http://www.redhat.com/security/updat= es/classification/#moderate', - 'revision': 3, - 'security_impact': 'Moderate', - 'solution': 'Before applying this update, make sur= e all previously released errata\r\nrelevant to your system have been appli= ed.\r\n\r\nThis update is available via Red Hat Network. To use Red Hat Ne= twork,\r\nlaunch the Red Hat Update Agent with the following command:\r\n\r= \nup2date\r\n\r\nThis will start an interactive process that will result in= the appropriate\r\nRPMs being upgraded on your system.', - 'synopsis': 'Moderate: dbus security update', - 'topic': 'Updated dbus packages that fix a securit= y issue are now available for Red\r\nHat Enterprise Linux 4.\r\n\r\nThis up= date has been rated as having moderate security impact by the Red\r\nHat Se= curity Response Team.', - 'update_date': '2007-02-07'} - - url =3D "http://" + SERVER + "/BUGZILLA" - s =3D xmlrpclib.Server(url) - s.bugzilla_errata.submit_errata(erratum_hash) - -unittest.main() --===============1306686883357390176==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:26 2015 Content-Type: multipart/mixed; boundary="===============2962782198392932308==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - backend/server Date: Tue, 09 Jun 2009 17:19:20 +0000 Message-ID: <20090609171920.96A9B120194@lists.fedorahosted.org> --===============2962782198392932308== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/test/test_errata_import_webqa.py | 345 -------------------= ----- 1 file changed, 345 deletions(-) New commits: commit 56a4acd7b9bd3443496dbe1056a218b43a3d2bb5 Author: Pradeep Kilambi Date: Tue Jun 9 13:19:14 2009 -0400 removing bugzilla handler specific tests diff --git a/backend/server/test/test_errata_import_webqa.py b/backend/serv= er/test/test_errata_import_webqa.py deleted file mode 100755 index 7e9a57a..0000000 --- a/backend/server/test/test_errata_import_webqa.py +++ /dev/null @@ -1,345 +0,0 @@ -#!/usr/bin/python -# -# Copyright (c) 2008 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. = -# - -import sys -import xmlrpclib -import unittest - -SERVER =3D 'scripts.back-webqa.redhat.com' - -class ErrataImportTests(unittest.TestCase): - = - def testUtf8Erratum(self): - global SERVER - - - # To actually make this one repeatable, need to munge the erratum_= hash['advisory_name'] or erratum_hash['revision'] fields... - - erratum_hash =3D {'advisory_name': 'RHSA-2007:0008', - 'bugs': [{'id': 218055, - 'status': 'ON_QA', - 'summary': 'CVE-2006-6107 D-Bus denial o= f service'}], - 'crossref': '', - 'cve': 'CVE-2006-6107', - 'description': 'D-BUS is a system for sending mess= ages between applications. It is used\r\nboth for the systemwide message bu= s service, and as a\r\nper-user-login-session messaging facility.\r\n\r\nKi= mmo H\xc3\xa4m\xc3\xa4l\xc3\xa4inen discovered a flaw in the way D-BUS proc= esses certain\r\nmessages. It is possible for a local unprivileged D-BUS pr= ocess to disrupt\r\nthe ability of another D-BUS process to receive message= s. (CVE-2006-6107)\r\n\r\nUsers of dbus are advised to upgrade to these upd= ated packages, which\r\ncontain backported patches to correct this issue.', - 'errata_files': [{'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/SRPMS/dbus-0.22-12.EL.8.src.rpm', - 'md5sum': '379fdd3f9afb34124fa9b= 88deb440e3f', - 'rhn_channel': ['rh-x86_64-deskt= op-4', - 'rh-i386-desktop= -4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/x86_64/dbus-glib-0.22-12.EL.8.x86_64.rp= m', - 'md5sum': '8c41138bbf9127bbb2d79= 9f566ce3a8a', - 'rhn_channel': ['rh-x86_64-deskt= op-4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/x86_64/dbus-0.22-12.EL.8.x86_64.rpm', - 'md5sum': 'ac83105ce8b120ec537a3= ea54da1e37d', - 'rhn_channel': ['rh-x86_64-deskt= op-4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/x86_64/dbus-python-0.22-12.EL.8.x86_64.= rpm', - 'md5sum': '920cf9a273c521118e374= 230690a3df6', - 'rhn_channel': ['rh-x86_64-deskt= op-4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/x86_64/dbus-x11-0.22-12.EL.8.x86_64.rpm= ', - 'md5sum': '847b2400eee82a36e3542= b2f4f2d4947', - 'rhn_channel': ['rh-x86_64-deskt= op-4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/x86_64/dbus-devel-0.22-12.EL.8.x86_64.r= pm', - 'md5sum': '1b248af405670382e31b0= 6c4fa52fa36', - 'rhn_channel': ['rh-x86_64-deskt= op-4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/x86_64/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rh-x86_64-deskt= op-4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/x86_64/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rh-x86_64-deskt= op-4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/i386/dbus-devel-0.22-12.EL.8.i386.rpm', - 'md5sum': 'b8a46001a416b2e36f5da= 1e6868c91ec', - 'rhn_channel': ['rh-i386-desktop= -4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/i386/dbus-python-0.22-12.EL.8.i386.rpm', - 'md5sum': '8e5eadeb5be39e1398853= 36011551656', - 'rhn_channel': ['rh-i386-desktop= -4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/i386/dbus-x11-0.22-12.EL.8.i386.rpm', - 'md5sum': '2f9d064981b12a7f4cb8c= f74d6142de5', - 'rhn_channel': ['rh-i386-desktop= -4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/i386/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rh-i386-desktop= -4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4Desktop/en/os/i386/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rh-i386-desktop= -4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/SRPMS/dbus-0.22-12.EL.8.src.rpm', - 'md5sum': '379fdd3f9afb34124fa9b= 88deb440e3f', - 'rhn_channel': ['rhel-x86_64-ws-= 4', - 'rhel-i386-ws-4', - 'rhel-ia64-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/x86_64/dbus-glib-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '8c41138bbf9127bbb2d79= 9f566ce3a8a', - 'rhn_channel': ['rhel-x86_64-ws-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/x86_64/dbus-0.22-12.EL.8.x86_64.rpm', - 'md5sum': 'ac83105ce8b120ec537a3= ea54da1e37d', - 'rhn_channel': ['rhel-x86_64-ws-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/x86_64/dbus-python-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '920cf9a273c521118e374= 230690a3df6', - 'rhn_channel': ['rhel-x86_64-ws-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/x86_64/dbus-x11-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '847b2400eee82a36e3542= b2f4f2d4947', - 'rhn_channel': ['rhel-x86_64-ws-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/x86_64/dbus-devel-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '1b248af405670382e31b0= 6c4fa52fa36', - 'rhn_channel': ['rhel-x86_64-ws-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/x86_64/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rhel-x86_64-ws-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/x86_64/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rhel-x86_64-ws-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/ia64/dbus-glib-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'b07996f3ebf2331958a1a= dfd230302cc', - 'rhn_channel': ['rhel-ia64-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/ia64/dbus-python-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'c7406fea694e12487aa82= 13142ed66ea', - 'rhn_channel': ['rhel-ia64-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/ia64/dbus-x11-0.22-12.EL.8.ia64.rpm', - 'md5sum': '7097ef62d6917170005f0= 00a14a54fe7', - 'rhn_channel': ['rhel-ia64-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/ia64/dbus-devel-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'a294a24161855aa73d4a9= d83e4f3a107', - 'rhn_channel': ['rhel-ia64-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/ia64/dbus-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'dd584d93cd98e8ebc3331= e5c5d938b87', - 'rhn_channel': ['rhel-ia64-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/ia64/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rhel-ia64-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/ia64/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rhel-ia64-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/i386/dbus-devel-0.22-12.EL.8.i386.rpm', - 'md5sum': 'b8a46001a416b2e36f5da= 1e6868c91ec', - 'rhn_channel': ['rhel-i386-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/i386/dbus-python-0.22-12.EL.8.i386.rpm', - 'md5sum': '8e5eadeb5be39e1398853= 36011551656', - 'rhn_channel': ['rhel-i386-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/i386/dbus-x11-0.22-12.EL.8.i386.rpm', - 'md5sum': '2f9d064981b12a7f4cb8c= f74d6142de5', - 'rhn_channel': ['rhel-i386-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/i386/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rhel-i386-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4WS/en/os/i386/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rhel-i386-ws-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/SRPMS/dbus-0.22-12.EL.8.src.rpm', - 'md5sum': '379fdd3f9afb34124fa9b= 88deb440e3f', - 'rhn_channel': ['rhel-x86_64-es-= 4', - 'rhel-i386-es-4', - 'rhel-ia64-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/x86_64/dbus-glib-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '8c41138bbf9127bbb2d79= 9f566ce3a8a', - 'rhn_channel': ['rhel-x86_64-es-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/x86_64/dbus-0.22-12.EL.8.x86_64.rpm', - 'md5sum': 'ac83105ce8b120ec537a3= ea54da1e37d', - 'rhn_channel': ['rhel-x86_64-es-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/x86_64/dbus-python-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '920cf9a273c521118e374= 230690a3df6', - 'rhn_channel': ['rhel-x86_64-es-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/x86_64/dbus-x11-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '847b2400eee82a36e3542= b2f4f2d4947', - 'rhn_channel': ['rhel-x86_64-es-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/x86_64/dbus-devel-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '1b248af405670382e31b0= 6c4fa52fa36', - 'rhn_channel': ['rhel-x86_64-es-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/x86_64/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rhel-x86_64-es-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/x86_64/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rhel-x86_64-es-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/ia64/dbus-glib-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'b07996f3ebf2331958a1a= dfd230302cc', - 'rhn_channel': ['rhel-ia64-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/ia64/dbus-python-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'c7406fea694e12487aa82= 13142ed66ea', - 'rhn_channel': ['rhel-ia64-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/ia64/dbus-x11-0.22-12.EL.8.ia64.rpm', - 'md5sum': '7097ef62d6917170005f0= 00a14a54fe7', - 'rhn_channel': ['rhel-ia64-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/ia64/dbus-devel-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'a294a24161855aa73d4a9= d83e4f3a107', - 'rhn_channel': ['rhel-ia64-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/ia64/dbus-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'dd584d93cd98e8ebc3331= e5c5d938b87', - 'rhn_channel': ['rhel-ia64-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/ia64/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rhel-ia64-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/ia64/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rhel-ia64-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/i386/dbus-devel-0.22-12.EL.8.i386.rpm', - 'md5sum': 'b8a46001a416b2e36f5da= 1e6868c91ec', - 'rhn_channel': ['rhel-i386-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/i386/dbus-python-0.22-12.EL.8.i386.rpm', - 'md5sum': '8e5eadeb5be39e1398853= 36011551656', - 'rhn_channel': ['rhel-i386-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/i386/dbus-x11-0.22-12.EL.8.i386.rpm', - 'md5sum': '2f9d064981b12a7f4cb8c= f74d6142de5', - 'rhn_channel': ['rhel-i386-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/i386/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rhel-i386-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4ES/en/os/i386/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rhel-i386-es-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/SRPMS/dbus-0.22-12.EL.8.src.rpm', - 'md5sum': '379fdd3f9afb34124fa9b= 88deb440e3f', - 'rhn_channel': ['rhel-i386-as-4', - 'rhel-ia64-as-4', - 'rhel-ppc-as-4', - 'rhel-s390x-as-4= ', - 'rhel-s390-as-4', - 'rhel-x86_64-as-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ppc/dbus-devel-0.22-12.EL.8.ppc.rpm', - 'md5sum': 'd4adf9454e5303fdcaab8= c43805a212c', - 'rhn_channel': ['rhel-ppc-as-4']= }, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ppc/dbus-0.22-12.EL.8.ppc.rpm', - 'md5sum': 'acaed9d78ce157ef8b15e= 19692c832c1', - 'rhn_channel': ['rhel-ppc-as-4']= }, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ppc/dbus-python-0.22-12.EL.8.ppc.rpm', - 'md5sum': '60c70fee76a3a98c6cf46= 629901b2ed3', - 'rhn_channel': ['rhel-ppc-as-4']= }, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ppc/dbus-glib-0.22-12.EL.8.ppc.rpm', - 'md5sum': '1a66a5a36be6167dff255= 8866ab34d9c', - 'rhn_channel': ['rhel-ppc-as-4']= }, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ppc/dbus-x11-0.22-12.EL.8.ppc.rpm', - 'md5sum': '02a34c40ade9386f829e0= bbf12dc8036', - 'rhn_channel': ['rhel-ppc-as-4']= }, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ppc/dbus-0.22-12.EL.8.ppc64.rpm', - 'md5sum': '87db84625d2e27f3b0c16= 8e2f1e34a18', - 'rhn_channel': ['rhel-ppc-as-4']= }, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ppc/dbus-glib-0.22-12.EL.8.ppc64.rpm', - 'md5sum': 'e28bef04fa98091747dee= f3b121fec18', - 'rhn_channel': ['rhel-ppc-as-4']= }, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390x/dbus-python-0.22-12.EL.8.s390x.rpm', - 'md5sum': '6afc6054de436384a7195= 1c4ca7c1083', - 'rhn_channel': ['rhel-s390x-as-4= ']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390x/dbus-glib-0.22-12.EL.8.s390x.rpm', - 'md5sum': '5608a1394e595ee7560bc= 2080b54524e', - 'rhn_channel': ['rhel-s390x-as-4= ']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390x/dbus-0.22-12.EL.8.s390x.rpm', - 'md5sum': '38a9c1c9838f1fc0ffe7e= 8c62259a4e9', - 'rhn_channel': ['rhel-s390x-as-4= ']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390x/dbus-devel-0.22-12.EL.8.s390x.rpm', - 'md5sum': 'd17fd60137f8fc012826c= b5c2fb1c798', - 'rhn_channel': ['rhel-s390x-as-4= ']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390x/dbus-x11-0.22-12.EL.8.s390x.rpm', - 'md5sum': 'aa63335eff72a01edf6c3= c8709257100', - 'rhn_channel': ['rhel-s390x-as-4= ']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390x/dbus-0.22-12.EL.8.s390.rpm', - 'md5sum': '2aec70890676846f00be1= fd5ed9f4a9c', - 'rhn_channel': ['rhel-s390x-as-4= ']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390x/dbus-glib-0.22-12.EL.8.s390.rpm', - 'md5sum': '79ebed9e812ce4760fcbd= 4bb7fa8efb7', - 'rhn_channel': ['rhel-s390x-as-4= ']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/x86_64/dbus-glib-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '8c41138bbf9127bbb2d79= 9f566ce3a8a', - 'rhn_channel': ['rhel-x86_64-as-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/x86_64/dbus-0.22-12.EL.8.x86_64.rpm', - 'md5sum': 'ac83105ce8b120ec537a3= ea54da1e37d', - 'rhn_channel': ['rhel-x86_64-as-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/x86_64/dbus-python-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '920cf9a273c521118e374= 230690a3df6', - 'rhn_channel': ['rhel-x86_64-as-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/x86_64/dbus-x11-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '847b2400eee82a36e3542= b2f4f2d4947', - 'rhn_channel': ['rhel-x86_64-as-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/x86_64/dbus-devel-0.22-12.EL.8.x86_64.rpm', - 'md5sum': '1b248af405670382e31b0= 6c4fa52fa36', - 'rhn_channel': ['rhel-x86_64-as-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/x86_64/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rhel-x86_64-as-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/x86_64/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rhel-x86_64-as-= 4']}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390/dbus-python-0.22-12.EL.8.s390.rpm', - 'md5sum': 'f1be5d2e04c8e0698cadd= c9d0af40ab2', - 'rhn_channel': ['rhel-s390-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390/dbus-x11-0.22-12.EL.8.s390.rpm', - 'md5sum': '11ca54506fedf365fab62= e025d7b742b', - 'rhn_channel': ['rhel-s390-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390/dbus-0.22-12.EL.8.s390.rpm', - 'md5sum': '2aec70890676846f00be1= fd5ed9f4a9c', - 'rhn_channel': ['rhel-s390-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390/dbus-glib-0.22-12.EL.8.s390.rpm', - 'md5sum': '79ebed9e812ce4760fcbd= 4bb7fa8efb7', - 'rhn_channel': ['rhel-s390-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/s390/dbus-devel-0.22-12.EL.8.s390.rpm', - 'md5sum': 'ba507082ec7e13a57cbf9= d2addf18e9d', - 'rhn_channel': ['rhel-s390-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ia64/dbus-glib-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'b07996f3ebf2331958a1a= dfd230302cc', - 'rhn_channel': ['rhel-ia64-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ia64/dbus-python-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'c7406fea694e12487aa82= 13142ed66ea', - 'rhn_channel': ['rhel-ia64-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ia64/dbus-x11-0.22-12.EL.8.ia64.rpm', - 'md5sum': '7097ef62d6917170005f0= 00a14a54fe7', - 'rhn_channel': ['rhel-ia64-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ia64/dbus-devel-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'a294a24161855aa73d4a9= d83e4f3a107', - 'rhn_channel': ['rhel-ia64-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ia64/dbus-0.22-12.EL.8.ia64.rpm', - 'md5sum': 'dd584d93cd98e8ebc3331= e5c5d938b87', - 'rhn_channel': ['rhel-ia64-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ia64/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rhel-ia64-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/ia64/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rhel-ia64-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/i386/dbus-devel-0.22-12.EL.8.i386.rpm', - 'md5sum': 'b8a46001a416b2e36f5da= 1e6868c91ec', - 'rhn_channel': ['rhel-i386-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/i386/dbus-python-0.22-12.EL.8.i386.rpm', - 'md5sum': '8e5eadeb5be39e1398853= 36011551656', - 'rhn_channel': ['rhel-i386-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/i386/dbus-x11-0.22-12.EL.8.i386.rpm', - 'md5sum': '2f9d064981b12a7f4cb8c= f74d6142de5', - 'rhn_channel': ['rhel-i386-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/i386/dbus-glib-0.22-12.EL.8.i386.rpm', - 'md5sum': '5ba2eefce27c72524c7c5= cdb1b6e2224', - 'rhn_channel': ['rhel-i386-as-4'= ]}, - {'ftppath': '/ftp/pub/redhat/linu= x/updates/enterprise/4AS/en/os/i386/dbus-0.22-12.EL.8.i386.rpm', - 'md5sum': 'e81002d1ca5787e89458c= d7d5bb04dd5', - 'rhn_channel': ['rhel-i386-as-4'= ]}], - 'errata_type': 'RHSA', - 'erratum_deployed_by': 'jorris(a)redhat.com', - 'issue_date': '2007-02-07', - 'keywords': '', - 'multilib': '', - 'obsoletes': '', - 'oval': '\n\n\n \n Red Hat Errata System<= /oval:product_name>\n 5.2\n = 2007-02-07T12:21:43\n \n\n = \n \n \n RHSA-2007:= 0008: dbus security update (Moderate)\n \n \n Red Hat Enterprise Linux 4\n = \n \n D-BUS is a system for sending messages between applicat= ions. It is used\r\nboth for the systemwide message bus service, and as a\r= \nper-user-login-session messaging facility.\r\n\r\nKimmo H\xc3\xa4m\xc3\xa= 4l\xc3\xa4inen discovered a flaw in the way D-BUS processes certain\r\nmess= ages. It is possible for a local unprivileged D-BUS process to disrupt\r\nt= he ability of another D-BUS process to receive messages. (CVE-2006-6107)\r\= n\r\nUsers of dbus are advised to upgrade to these updated packages, which\= r\ncontain backported patches to correct this issue.\n\n\n\n\n\n Moderate\n\n Copyright 2007 Red Hat, Inc.\n \n \n = CVE-2006-6107\n CVE-2006-6107 D-Bus denial of service\n \n \n \n \n \n \n \n \n \n\n \n \n\n \n \n\n \n \n\n \n \n\n= \n\n \n \n \n \n \n \n \n\n \n \n\n \n \n\n \n \n\n \n \n\n \n \n\n \n \n\n \n \n\n \n \n\n \n \n\n \n \n\n \n\n <= objects>\n \n \n dbus-x11\n\n db= us-python\n\n dbus-devel\n\n redhat-release\n\n dbu= s\n\n dbus-glib\n\= n \n \n \n \n 219180cddb42a60e\n\n ^4\\D\n\n 0:0.22-12.EL.8\n= \n \n\n\n', - 'packages': '', - 'product': 'Red Hat Enterprise Linux', - 'reference': 'http://www.redhat.com/security/updat= es/classification/#moderate', - 'revision': 3, - 'security_impact': 'Moderate', - 'solution': 'Before applying this update, make sur= e all previously released errata\r\nrelevant to your system have been appli= ed.\r\n\r\nThis update is available via Red Hat Network. To use Red Hat Ne= twork,\r\nlaunch the Red Hat Update Agent with the following command:\r\n\r= \nup2date\r\n\r\nThis will start an interactive process that will result in= the appropriate\r\nRPMs being upgraded on your system.', - 'synopsis': 'Moderate: dbus security update', - 'topic': 'Updated dbus packages that fix a securit= y issue are now available for Red\r\nHat Enterprise Linux 4.\r\n\r\nThis up= date has been rated as having moderate security impact by the Red\r\nHat Se= curity Response Team.', - 'update_date': '2007-02-07'} - - url =3D "http://" + SERVER + "/BUGZILLA" - s =3D xmlrpclib.Server(url) - s.bugzilla_errata.submit_errata(erratum_hash) - -unittest.main() --===============2962782198392932308==-- From partha at fedoraproject.org Thu Aug 20 11:57:26 2015 Content-Type: multipart/mixed; boundary="===============7563765965547628906==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Tue, 09 Jun 2009 17:22:14 +0000 Message-ID: <20090609172214.81480120194@lists.fedorahosted.org> --===============7563765965547628906== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java | 5 +-= --- 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit 6d1890a6495a0be540a97db31929295b2c61f952 Author: Partha Aji Date: Tue Jun 9 13:24:33 2009 -0400 Backing out a fix to deal with Html errors from a previous iteration. diff --git a/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.ja= va b/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java index c1eb7d3..731c868 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java @@ -167,14 +167,11 @@ public class StrutsDelegate { HttpSession session =3D request.getSession(); = if ((messages =3D=3D null) || messages.isEmpty()) { - session.removeAttribute(Globals.ERROR_KEY); session.removeAttribute(Globals.MESSAGE_KEY); return; } String key =3D Globals.MESSAGE_KEY; - if (messages instanceof ActionErrors) { - key =3D Globals.ERROR_KEY; - } + = ActionMessages newMessages =3D new ActionMessages(); = --===============7563765965547628906==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:26 2015 Content-Type: multipart/mixed; boundary="===============2925332773825348957==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: java/code search-server/src Date: Tue, 09 Jun 2009 18:18:28 +0000 Message-ID: <20090609181828.DD90D120194@lists.fedorahosted.org> --===============2925332773825348957== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupActi= on.java | 31 +++------- search-server/src/config/search/rhn_search.conf = | 2 = 2 files changed, 11 insertions(+), 22 deletions(-) New commits: commit 95c80e84441497a3e342408da97ffc386d999c7a Author: John Matthews Date: Tue Jun 9 14:10:36 2009 -0400 487014 - SystemSearch remove score requirement to redirect to SDC on 1 = result Additionally lowered default config value for system search score thres= hold diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSea= rchSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/= SystemSearchSetupAction.java index 6c25cb5..eae4a97 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetu= pAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetu= pAction.java @@ -185,31 +185,20 @@ public class SystemSearchSetupAction extends RhnActio= n implements Listable { (results !=3D null ? results.size() : "null results")); if ((results !=3D null) && (results.size() =3D=3D 1)) { SystemSearchResult s =3D (SystemSearchResult) results.get= (0); - Double score =3D s.getScore(); - log.info("SystemSearch s.getScore() =3D " + s.getScore()); - if (score !=3D null) { - /** Adding a rule so we only redirect to a specific sy= stem id - * when we are pretty sure the search result is what t= he user - * expects. We are using the lucene score for this re= sult to - * gauge this. - */ - if (score > 0.50) { - try { - response.sendRedirect( - "/rhn/systems/details/Overview.do?sid= =3D" + - s.getId().toString()); - return null; - } - catch (IOException ioe) { - throw new RuntimeException( - "Exception while trying to redirect: "= + ioe); - } - } + try { + response.sendRedirect( + "/rhn/systems/details/Overview.do?sid=3D" + + s.getId().toString()); + return null; + } + catch (IOException ioe) { + throw new RuntimeException( + "Exception while trying to redirect: " + ioe); } } return getStrutsDelegate().forwardParams( mapping.findForward("default"), - request.getParameterMap()); = + request.getParameterMap()); } /** * Else the form was submitted, so we need to parse the form and t= urn it into = diff --git a/search-server/src/config/search/rhn_search.conf b/search-serve= r/src/config/search/rhn_search.conf index dd9d956..6a3cb7d 100644 --- a/search-server/src/config/search/rhn_search.conf +++ b/search-server/src/config/search/rhn_search.conf @@ -3,7 +3,7 @@ search.rpc_handlers=3Dindex:com.redhat.satellite.search.rpc= .handlers.IndexHandler, search.max_hits_returned=3D500 search.connection.driver_class=3Doracle.jdbc.driver.OracleDriver search.score_threshold=3D.10 -search.system_score_threshold=3D.05 +search.system_score_threshold=3D.01 search.errata_score_threshold=3D.20 search.errata.advisory_score_threshold=3D.30 search.min_ngram =3D 1 --===============2925332773825348957==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:26 2015 Content-Type: multipart/mixed; boundary="===============3496170763155930077==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code search-server/src Date: Tue, 09 Jun 2009 18:19:09 +0000 Message-ID: <20090609181909.2C1BB120194@lists.fedorahosted.org> --===============3496170763155930077== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupActi= on.java | 31 +++------- search-server/src/config/search/rhn_search.conf = | 2 = 2 files changed, 11 insertions(+), 22 deletions(-) New commits: commit a1f466e8b345e4dc6bd7fccb3feded486bee6faa Author: John Matthews Date: Tue Jun 9 14:10:36 2009 -0400 487014 - SystemSearch remove score requirement to redirect to SDC on 1 = result Additionally lowered default config value for system search score thres= hold diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSea= rchSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/= SystemSearchSetupAction.java index 6c25cb5..eae4a97 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetu= pAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetu= pAction.java @@ -185,31 +185,20 @@ public class SystemSearchSetupAction extends RhnActio= n implements Listable { (results !=3D null ? results.size() : "null results")); if ((results !=3D null) && (results.size() =3D=3D 1)) { SystemSearchResult s =3D (SystemSearchResult) results.get= (0); - Double score =3D s.getScore(); - log.info("SystemSearch s.getScore() =3D " + s.getScore()); - if (score !=3D null) { - /** Adding a rule so we only redirect to a specific sy= stem id - * when we are pretty sure the search result is what t= he user - * expects. We are using the lucene score for this re= sult to - * gauge this. - */ - if (score > 0.50) { - try { - response.sendRedirect( - "/rhn/systems/details/Overview.do?sid= =3D" + - s.getId().toString()); - return null; - } - catch (IOException ioe) { - throw new RuntimeException( - "Exception while trying to redirect: "= + ioe); - } - } + try { + response.sendRedirect( + "/rhn/systems/details/Overview.do?sid=3D" + + s.getId().toString()); + return null; + } + catch (IOException ioe) { + throw new RuntimeException( + "Exception while trying to redirect: " + ioe); } } return getStrutsDelegate().forwardParams( mapping.findForward("default"), - request.getParameterMap()); = + request.getParameterMap()); } /** * Else the form was submitted, so we need to parse the form and t= urn it into = diff --git a/search-server/src/config/search/rhn_search.conf b/search-serve= r/src/config/search/rhn_search.conf index dd9d956..6a3cb7d 100644 --- a/search-server/src/config/search/rhn_search.conf +++ b/search-server/src/config/search/rhn_search.conf @@ -3,7 +3,7 @@ search.rpc_handlers=3Dindex:com.redhat.satellite.search.rpc= .handlers.IndexHandler, search.max_hits_returned=3D500 search.connection.driver_class=3Doracle.jdbc.driver.OracleDriver search.score_threshold=3D.10 -search.system_score_threshold=3D.05 +search.system_score_threshold=3D.01 search.errata_score_threshold=3D.20 search.errata.advisory_score_threshold=3D.30 search.min_ngram =3D 1 --===============3496170763155930077==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:26 2015 Content-Type: multipart/mixed; boundary="===============3320243915026990764==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: proxy/installer Date: Tue, 09 Jun 2009 19:52:48 +0000 Message-ID: <20090609195248.84B1412022C@lists.fedorahosted.org> --===============3320243915026990764== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/installer/rhn_proxy_activate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d66e6f8b4917aef4b33ff6206a9a50c8557a32b7 Author: Miroslav Such=C3=BD Date: Tue Jun 9 21:51:11 2009 +0200 runtime error - global name 's' is not defined diff --git a/proxy/installer/rhn_proxy_activate.py b/proxy/installer/rhn_pr= oxy_activate.py index af5fe3c..3de27c2 100644 --- a/proxy/installer/rhn_proxy_activate.py +++ b/proxy/installer/rhn_proxy_activate.py @@ -398,7 +398,7 @@ def createMonitoringScout(options): use activateProxy_api_v3_x method instead. """ = - getServer(options, DEFAULT_WEBRPC_HANDLER_v3_x) + s =3D getServer(options, DEFAULT_WEBRPC_HANDLER_v3_x) systemid =3D getSystemId() = errorCode, errorString =3D 0, '' --===============3320243915026990764==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:26 2015 Content-Type: multipart/mixed; boundary="===============7421260586633593704==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - proxy/installer Date: Tue, 09 Jun 2009 19:53:26 +0000 Message-ID: <20090609195326.0832512022C@lists.fedorahosted.org> --===============7421260586633593704== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/installer/rhn_proxy_activate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 611081cc63c24b4e0dafb1347f64ace816aa377f Author: Miroslav Such=C3=BD Date: Tue Jun 9 21:51:11 2009 +0200 runtime error - global name 's' is not defined (cherry picked from commit d66e6f8b4917aef4b33ff6206a9a50c8557a32b7) diff --git a/proxy/installer/rhn_proxy_activate.py b/proxy/installer/rhn_pr= oxy_activate.py index ca620e1..adbe3be 100644 --- a/proxy/installer/rhn_proxy_activate.py +++ b/proxy/installer/rhn_proxy_activate.py @@ -394,7 +394,7 @@ def createMonitoringScout(options): use activateProxy_api_v3_x method instead. """ = - getServer(options, DEFAULT_WEBRPC_HANDLER_v3_x) + s =3D getServer(options, DEFAULT_WEBRPC_HANDLER_v3_x) systemid =3D getSystemId() = errorCode, errorString =3D 0, '' --===============7421260586633593704==-- From jortel at fedoraproject.org Thu Aug 20 11:57:26 2015 Content-Type: multipart/mixed; boundary="===============3446397995400302280==" MIME-Version: 1.0 From: Jeff Ortel To: spacewalk-commits at lists.fedorahosted.org Subject: schema/spacewalk Date: Tue, 09 Jun 2009 20:20:55 +0000 Message-ID: <20090609202055.3EB6212022C@lists.fedorahosted.org> --===============3446397995400302280== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable schema/spacewalk/rhnsat/views/rhnSharedChannelTreeView.sql = | 6 = schema/spacewalk/upgrade/spacewalk-0.4-spacewalk-0.5/190-rhnSharedChannelT= reeView.sql | 66 ++++++++++ 2 files changed, 69 insertions(+), 3 deletions(-) New commits: commit 4e9b0895f3aba3624d164399c21ad063b7de280a Author: Jeff Ortel Date: Tue Jun 9 15:07:22 2009 -0500 492588 - Provide for shared child channels with non-shared parent chann= els diff --git a/schema/spacewalk/rhnsat/views/rhnSharedChannelTreeView.sql b/s= chema/spacewalk/rhnsat/views/rhnSharedChannelTreeView.sql index 12ff3aa..dcd75d7 100644 --- a/schema/spacewalk/rhnsat/views/rhnSharedChannelTreeView.sql +++ b/schema/spacewalk/rhnsat/views/rhnSharedChannelTreeView.sql @@ -56,10 +56,10 @@ SELECT * FROM ( C.CHANNEL_ARCH_ID, C.LAST_MODIFIED, C.LABEL, - C.LABEL AS PARENT_OR_SELF_LABEL, - C.ID AS PARENT_OR_SELF_ID, + PC.LABEL AS PARENT_OR_SELF_LABEL, + PC.ID AS PARENT_OR_SELF_ID, C.END_OF_LIFE - FROM RHNSHAREDCHANNELVIEW PC, + FROM RHNCHANNEL PC, RHNSHAREDCHANNELVIEW C WHERE C.PARENT_CHANNEL =3D PC.ID ) ORDER BY PARENT_OR_SELF_LABEL, PARENT_OR_SELF_ID; diff --git a/schema/spacewalk/upgrade/spacewalk-0.4-spacewalk-0.5/190-rhnSh= aredChannelTreeView.sql b/schema/spacewalk/upgrade/spacewalk-0.4-spacewalk-= 0.5/190-rhnSharedChannelTreeView.sql new file mode 100644 index 0000000..dcd75d7 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-0.4-spacewalk-0.5/190-rhnSharedCha= nnelTreeView.sql @@ -0,0 +1,66 @@ +-- +-- Copyright (c) 2008 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 VIEW RHNSHAREDCHANNELTREEVIEW +( + ORG_ID, + ID, + DEPTH, + NAME, + PADDED_NAME, + CHANNEL_ARCH_ID, + LAST_MODIFIED, + LABEL, + PARENT_OR_SELF_LABEL, + PARENT_OR_SELF_ID, + END_OF_LIFE +) +AS +SELECT * FROM ( + SELECT + C.ORG_TRUST_ID AS ORG_ID, + C.ID, + 1 AS DEPTH, + C.NAME, + ' '||C.NAME AS PADDED_NAME, + C.CHANNEL_ARCH_ID, + C.LAST_MODIFIED, + C.LABEL, + C.LABEL AS PARENT_OR_SELF_LABEL, + C.ID AS PARENT_OR_SELF_ID, + C.END_OF_LIFE + FROM RHNSHAREDCHANNELVIEW C + WHERE C.PARENT_CHANNEL IS NULL + UNION + SELECT + C.ORG_TRUST_ID AS ORG_ID, + C.ID, + 2 AS DEPTH, + c.name, + ''||C.NAME AS PADDED_NAME, + C.CHANNEL_ARCH_ID, + C.LAST_MODIFIED, + C.LABEL, + PC.LABEL AS PARENT_OR_SELF_LABEL, + PC.ID AS PARENT_OR_SELF_ID, + C.END_OF_LIFE + FROM RHNCHANNEL PC, + RHNSHAREDCHANNELVIEW C + WHERE C.PARENT_CHANNEL =3D PC.ID +) ORDER BY PARENT_OR_SELF_LABEL, PARENT_OR_SELF_ID; + --===============3446397995400302280==-- From jortel at fedoraproject.org Thu Aug 20 11:57:26 2015 Content-Type: multipart/mixed; boundary="===============6453077872895495252==" MIME-Version: 1.0 From: Jeff Ortel To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - schema/spacewalk Date: Tue, 09 Jun 2009 20:22:40 +0000 Message-ID: <20090609202240.72B2E12022C@lists.fedorahosted.org> --===============6453077872895495252== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable schema/spacewalk/rhnsat/views/rhnSharedChannelTreeView.sql = | 6 = schema/spacewalk/upgrade/spacewalk-0.4-spacewalk-0.5/190-rhnSharedChannelT= reeView.sql | 66 ++++++++++ 2 files changed, 69 insertions(+), 3 deletions(-) New commits: commit f91358408ef1528f8298544188eabf3bff649509 Author: Jeff Ortel Date: Tue Jun 9 15:07:22 2009 -0500 492588 - Provide for shared child channels with non-shared parent chann= els diff --git a/schema/spacewalk/rhnsat/views/rhnSharedChannelTreeView.sql b/s= chema/spacewalk/rhnsat/views/rhnSharedChannelTreeView.sql index 12ff3aa..dcd75d7 100644 --- a/schema/spacewalk/rhnsat/views/rhnSharedChannelTreeView.sql +++ b/schema/spacewalk/rhnsat/views/rhnSharedChannelTreeView.sql @@ -56,10 +56,10 @@ SELECT * FROM ( C.CHANNEL_ARCH_ID, C.LAST_MODIFIED, C.LABEL, - C.LABEL AS PARENT_OR_SELF_LABEL, - C.ID AS PARENT_OR_SELF_ID, + PC.LABEL AS PARENT_OR_SELF_LABEL, + PC.ID AS PARENT_OR_SELF_ID, C.END_OF_LIFE - FROM RHNSHAREDCHANNELVIEW PC, + FROM RHNCHANNEL PC, RHNSHAREDCHANNELVIEW C WHERE C.PARENT_CHANNEL =3D PC.ID ) ORDER BY PARENT_OR_SELF_LABEL, PARENT_OR_SELF_ID; diff --git a/schema/spacewalk/upgrade/spacewalk-0.4-spacewalk-0.5/190-rhnSh= aredChannelTreeView.sql b/schema/spacewalk/upgrade/spacewalk-0.4-spacewalk-= 0.5/190-rhnSharedChannelTreeView.sql new file mode 100644 index 0000000..dcd75d7 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-0.4-spacewalk-0.5/190-rhnSharedCha= nnelTreeView.sql @@ -0,0 +1,66 @@ +-- +-- Copyright (c) 2008 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 VIEW RHNSHAREDCHANNELTREEVIEW +( + ORG_ID, + ID, + DEPTH, + NAME, + PADDED_NAME, + CHANNEL_ARCH_ID, + LAST_MODIFIED, + LABEL, + PARENT_OR_SELF_LABEL, + PARENT_OR_SELF_ID, + END_OF_LIFE +) +AS +SELECT * FROM ( + SELECT + C.ORG_TRUST_ID AS ORG_ID, + C.ID, + 1 AS DEPTH, + C.NAME, + ' '||C.NAME AS PADDED_NAME, + C.CHANNEL_ARCH_ID, + C.LAST_MODIFIED, + C.LABEL, + C.LABEL AS PARENT_OR_SELF_LABEL, + C.ID AS PARENT_OR_SELF_ID, + C.END_OF_LIFE + FROM RHNSHAREDCHANNELVIEW C + WHERE C.PARENT_CHANNEL IS NULL + UNION + SELECT + C.ORG_TRUST_ID AS ORG_ID, + C.ID, + 2 AS DEPTH, + c.name, + ''||C.NAME AS PADDED_NAME, + C.CHANNEL_ARCH_ID, + C.LAST_MODIFIED, + C.LABEL, + PC.LABEL AS PARENT_OR_SELF_LABEL, + PC.ID AS PARENT_OR_SELF_ID, + C.END_OF_LIFE + FROM RHNCHANNEL PC, + RHNSHAREDCHANNELVIEW C + WHERE C.PARENT_CHANNEL =3D PC.ID +) ORDER BY PARENT_OR_SELF_LABEL, PARENT_OR_SELF_ID; + --===============6453077872895495252==-- From jdob at fedoraproject.org Thu Aug 20 11:57:26 2015 Content-Type: multipart/mixed; boundary="===============6466127740191316346==" MIME-Version: 1.0 From: jdob To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Tue, 09 Jun 2009 20:35:37 +0000 Message-ID: <20090609203537.6FA0E12022C@lists.fedorahosted.org> --===============6466127740191316346== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.j= ava | 1 + 1 file changed, 1 insertion(+) New commits: commit 06790dedb83557cb1de13cb25d0c1f467d0e3c71 Author: Jason Dobies Date: Tue Jun 9 16:28:23 2009 -0400 504806 - Added missing channel_filter attribute that was being lost dur= ing pagination. diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSe= archAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/Pack= ageSearchAction.java index cccb13e..eb0a297 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAct= ion.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAct= ion.java @@ -235,6 +235,7 @@ public class PackageSearchAction extends RhnAction { request.setAttribute("channelArches", channelArches); request.setAttribute("channel_arch", selectedArches); request.setAttribute("allChannels", allChannels); + request.setAttribute("channel_filter", form.getString("channel_fil= ter")); = // Default where to search criteria request.setAttribute("whereCriteria", searchCriteria); --===============6466127740191316346==-- From jdob at fedoraproject.org Thu Aug 20 11:57:26 2015 Content-Type: multipart/mixed; boundary="===============5710122325803150018==" MIME-Version: 1.0 From: jdob To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Tue, 09 Jun 2009 20:37:13 +0000 Message-ID: <20090609203713.255D312022C@lists.fedorahosted.org> --===============5710122325803150018== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.j= ava | 1 + 1 file changed, 1 insertion(+) New commits: commit 8da09574f3d80d4f5bf3a24db069a96602b6d1e6 Author: Jason Dobies Date: Tue Jun 9 16:28:23 2009 -0400 504806 - Added missing channel_filter attribute that was being lost dur= ing pagination. diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSe= archAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/Pack= ageSearchAction.java index cccb13e..eb0a297 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAct= ion.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAct= ion.java @@ -235,6 +235,7 @@ public class PackageSearchAction extends RhnAction { request.setAttribute("channelArches", channelArches); request.setAttribute("channel_arch", selectedArches); request.setAttribute("allChannels", allChannels); + request.setAttribute("channel_filter", form.getString("channel_fil= ter")); = // Default where to search criteria request.setAttribute("whereCriteria", searchCriteria); --===============5710122325803150018==-- From mmccune at fedoraproject.org Thu Aug 20 11:57:26 2015 Content-Type: multipart/mixed; boundary="===============8975485887723789947==" MIME-Version: 1.0 From: Mike McCune To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - client/tools Date: Tue, 09 Jun 2009 23:42:42 +0000 Message-ID: <20090609234242.8FFD712022C@lists.fedorahosted.org> --===============8975485887723789947== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/spacewalk-koan/spacewalk-koan.spec | 2 - client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py | 22 ++++++--= ----- 2 files changed, 12 insertions(+), 12 deletions(-) New commits: commit 30acd96d9cbec50dfa7795877dbe55e83f057c89 Author: Mike McCune Date: Tue Jun 9 16:41:14 2009 -0700 497571 - switching to python 1.5 requires since we have to support 2.1 diff --git a/client/tools/spacewalk-koan/spacewalk-koan.spec b/client/tools= /spacewalk-koan/spacewalk-koan.spec index 96d9f57..acaaa21 100644 --- a/client/tools/spacewalk-koan/spacewalk-koan.spec +++ b/client/tools/spacewalk-koan/spacewalk-koan.spec @@ -10,7 +10,7 @@ URL: https://fedorahosted.org/spacewalk BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch BuildRequires: python -Requires: python >=3D 2.3 +Requires: python >=3D 1.5 Requires: koan >=3D 1.4.3 = Provides: rhn.kickstart.boot_image =3D 5.3.0 commit 657c1bc26d5c12267eed835bb74137002af5d533 Author: Mike McCune Date: Tue Jun 9 16:18:54 2009 -0700 497571 - switch from True/False to 0/1 to support rhel 2.1 and oldasspython diff --git a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py b/c= lient/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py index ef1115a..5908b0e 100644 --- a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py +++ b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py @@ -41,11 +41,11 @@ def initiate(kickstart_host, base, extra_append, static= _device=3DNone, system_reco = try: k =3D Koan() - k.list_items =3D False + k.list_items =3D 0 k.server =3D kickstart_host - k.is_virt =3D False - k.is_replace =3D True - k.is_display =3D False + k.is_virt =3D 0 + k.is_replace =3D 1 + k.is_display =3D 0 k.profile =3D None = if system_record !=3D "": @@ -58,7 +58,7 @@ def initiate(kickstart_host, base, extra_append, static_d= evice=3DNone, system_reco k.virt_path =3D None k.virt_type =3D None k.virt_bridge =3D None - k.no_gfx =3D True + k.no_gfx =3D 1 k.add_reinstall_entry =3D None k.kopts_override =3D None k.use_kexec =3D None @@ -108,22 +108,22 @@ def initiate_guest(kickstart_host, cobbler_system_nam= e, virt_type, name, mem_kb, if os.path.exists(disk_path): raise VirtDiskPathExistsError(disk_path) k =3D Koan() - k.list_items =3D False + k.list_items =3D 0 k.server =3D kickstart_host - k.is_virt =3D True - k.is_replace =3D False - k.is_display =3D False + k.is_virt =3D 1 + k.is_replace =3D 0 + k.is_display =3D 0 k.port =3D 443 k.profile =3D None k.system =3D cobbler_system_name - k.should_poll =3D False + k.should_poll =3D 0 k.image =3D None k.live_cd =3D None k.virt_name =3D name k.virt_path =3D disk_path k.virt_type =3D virt_type k.virt_bridge =3D virt_bridge - k.no_gfx =3D True + k.no_gfx =3D 1 k.add_reinstall_entry =3D None k.kopts_override =3D None k.run() --===============8975485887723789947==-- From mmccune at fedoraproject.org Thu Aug 20 11:57:26 2015 Content-Type: multipart/mixed; boundary="===============8162071864285023300==" MIME-Version: 1.0 From: Mike McCune To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - spacewalk/certs-tools Date: Tue, 09 Jun 2009 23:43:17 +0000 Message-ID: <20090609234317.54AD912022C@lists.fedorahosted.org> --===============8162071864285023300== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/certs-tools/rhn_bootstrap_strings.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) New commits: commit 3402efce7e1623bf57d6d4f81ba258803df025d3 Author: Satoru SATOH Date: Fri May 1 10:11:50 2009 -0700 adding optional way to specify profile name. = Simple change to make it obvious in the bootstrap script where you can specify the profilename for registration. diff --git a/spacewalk/certs-tools/rhn_bootstrap_strings.py b/spacewalk/cer= ts-tools/rhn_bootstrap_strings.py index d1676fa..8a57077 100644 --- a/spacewalk/certs-tools/rhn_bootstrap_strings.py +++ b/spacewalk/certs-tools/rhn_bootstrap_strings.py @@ -116,6 +116,14 @@ ALLOW_REMOTE_COMMANDS=3D%s = FULLY_UPDATE_THIS_BOX=3D%s = +# Set if you want to specify profilename for client systems. +# NOTE: Make sure it's set correctly if any external command is used. +# +# ex. PROFILENAME=3D"foo.example.com" # For specific clinet system +# PROFILENAME=3D`hostname -s` # Short hostname +# PROFILENAME=3D`hostname -f` # FQDN +PROFILENAME=3D"" # Empty by default to let it be set automatically. + # # ------------------------------------------------------------------------= ----- # DO NOT EDIT BEYOND THIS POINT ------------------------------------------= ----- @@ -348,7 +356,12 @@ if [ $REGISTER_THIS_BOX -eq 1 ] ; then [ -f /etc/sysconfig/rhn/allowed-actions/configfiles/all ] || files= =3D"$files /etc/sysconfig/rhn/allowed-actions/configfiles/all" [ -n "$files" ] && touch $files fi - /usr/sbin/rhnreg_ks --force --activationkey "$ACTIVATION_KEYS" + if [ -z "$PROFILENAME" ] ; then + profilename_opt=3D"" + else + profilename_opt=3D"--profilename=3D$PROFILENAME" + fi + /usr/sbin/rhnreg_ks --force --activationkey "$ACTIVATION_KEYS" $profil= ename_opt [ -n "$files" ] && rm -f $files [ -n "$directories" ] && rmdir $(echo $directories | rev) echo --===============8162071864285023300==-- From mmccune at fedoraproject.org Thu Aug 20 11:57:26 2015 Content-Type: multipart/mixed; boundary="===============2570625470680410759==" MIME-Version: 1.0 From: Mike McCune To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 2 commits - client/tools Date: Tue, 09 Jun 2009 23:44:06 +0000 Message-ID: <20090609234406.617DD12022C@lists.fedorahosted.org> --===============2570625470680410759== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/spacewalk-koan/spacewalk-koan.spec | 2 - client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py | 22 ++++++--= ----- 2 files changed, 12 insertions(+), 12 deletions(-) New commits: commit 7512b3441b17644062ab3c3057046c4b786da16b Author: Mike McCune Date: Tue Jun 9 16:41:14 2009 -0700 497571 - switching to python 1.5 requires since we have to support 2.1 diff --git a/client/tools/spacewalk-koan/spacewalk-koan.spec b/client/tools= /spacewalk-koan/spacewalk-koan.spec index d81a004..4e5f2ad 100644 --- a/client/tools/spacewalk-koan/spacewalk-koan.spec +++ b/client/tools/spacewalk-koan/spacewalk-koan.spec @@ -10,7 +10,7 @@ URL: https://fedorahosted.org/spacewalk BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch BuildRequires: python -Requires: python >=3D 2.3 +Requires: python >=3D 1.5 Requires: koan >=3D 1.4.3 = Provides: rhn.kickstart.boot_image =3D 5.3.0 commit 487523b0e28cd2321f72106d4c19a7288550baff Author: Mike McCune Date: Tue Jun 9 16:18:54 2009 -0700 497571 - switch from True/False to 0/1 to support rhel 2.1 and oldasspython diff --git a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py b/c= lient/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py index ef1115a..5908b0e 100644 --- a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py +++ b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py @@ -41,11 +41,11 @@ def initiate(kickstart_host, base, extra_append, static= _device=3DNone, system_reco = try: k =3D Koan() - k.list_items =3D False + k.list_items =3D 0 k.server =3D kickstart_host - k.is_virt =3D False - k.is_replace =3D True - k.is_display =3D False + k.is_virt =3D 0 + k.is_replace =3D 1 + k.is_display =3D 0 k.profile =3D None = if system_record !=3D "": @@ -58,7 +58,7 @@ def initiate(kickstart_host, base, extra_append, static_d= evice=3DNone, system_reco k.virt_path =3D None k.virt_type =3D None k.virt_bridge =3D None - k.no_gfx =3D True + k.no_gfx =3D 1 k.add_reinstall_entry =3D None k.kopts_override =3D None k.use_kexec =3D None @@ -108,22 +108,22 @@ def initiate_guest(kickstart_host, cobbler_system_nam= e, virt_type, name, mem_kb, if os.path.exists(disk_path): raise VirtDiskPathExistsError(disk_path) k =3D Koan() - k.list_items =3D False + k.list_items =3D 0 k.server =3D kickstart_host - k.is_virt =3D True - k.is_replace =3D False - k.is_display =3D False + k.is_virt =3D 1 + k.is_replace =3D 0 + k.is_display =3D 0 k.port =3D 443 k.profile =3D None k.system =3D cobbler_system_name - k.should_poll =3D False + k.should_poll =3D 0 k.image =3D None k.live_cd =3D None k.virt_name =3D name k.virt_path =3D disk_path k.virt_type =3D virt_type k.virt_bridge =3D virt_bridge - k.no_gfx =3D True + k.no_gfx =3D 1 k.add_reinstall_entry =3D None k.kopts_override =3D None k.run() --===============2570625470680410759==-- From mzazrivec at redhat.com Thu Aug 20 11:57:26 2015 Content-Type: multipart/mixed; boundary="===============2689406781145631961==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: Re: schema/spacewalk Date: Wed, 10 Jun 2009 10:52:13 +0200 Message-ID: <200906101052.13839.mzazrivec@redhat.com> In-Reply-To: 20090609202055.3EB6212022C@lists.fedorahosted.org --===============2689406781145631961== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable On Tuesday 09 June 2009 22:20:55 Jeff Ortel wrote: > schema/spacewalk/rhnsat/views/rhnSharedChannelTreeView.sql = = > | 6 > schema/spacewalk/upgrade/spacewalk-0.4-spacewalk-0.5/190-rhnSharedChannel= Tr >eeView.sql | 66 ++++++++++ 2 files changed, 69 insertions(+), 3 > deletions(-) > > New commits: > commit 4e9b0895f3aba3624d164399c21ad063b7de280a > Author: Jeff Ortel > Date: Tue Jun 9 15:07:22 2009 -0500 > > 492588 - Provide for shared child channels with non-shared parent > channels [...] > b/schema/spacewalk/upgrade/spacewalk-0.4-spacewalk-0.5/190-rhnSharedChann= el This schema upgrade script should have gone into spacewalk-schema-0.5-to-spacewalk-schema-0.6 directory. -Milan --===============2689406781145631961==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:26 2015 Content-Type: multipart/mixed; boundary="===============8742953916475582755==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - selinux/spacewalk-monitoring-selinux Date: Wed, 10 Jun 2009 08:57:49 +0000 Message-ID: <20090610085749.C70BD12035A@lists.fedorahosted.org> --===============8742953916475582755== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | = 2 +- selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.fc | = 1 + 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit e113e69a97d71b004738ceae81cace51887345a0 Author: Miroslav Such=C3=BD Date: Wed Jun 10 10:53:28 2009 +0200 fix rpmlint error = addressing: spacewalk-monitoring-selinux.src:156: W: macro-in-%changelog post diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-seli= nux.spec b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinu= x.spec index dd6e62e..bcbb386 100644 --- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec +++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec @@ -153,7 +153,7 @@ fi - 499189 - spacewalk-selinux is not needed, do not Require it = * Mon Apr 27 2009 Jan Pazdziora 0.6.3-1 -- move the %post SELinux activation to /usr/sbin/spacewalk-monitoring-seli= nux-enable +- move the %%post SELinux activation to /usr/sbin/spacewalk-monitoring-sel= inux-enable - use src.rpm packaging with single Source0 = * Thu Apr 09 2009 Jan Pazdziora 0.6.2-1 commit e496f9d745909d6d379d6ecfe618ceafe51e563d Author: Miroslav Such=C3=BD Date: Wed Jun 10 10:45:23 2009 +0200 504649 - give /var/tmp/escalator.state context of spacewalk_monitoring_= var_lib_t = Addressing: type=3DAVC msg=3Daudit(1244630463.726:33): avc: denied { getattr } fo= r pid=3D5805 comm=3D"notif-escalator" path=3D"/var/tmp/escalator.state" de= v=3Dxvda1 ino=3D94292 scontext=3Droot:system_r:spacewalk_monitoring_t:s0 tc= ontext=3Dsystem_u:object_r:tmp_t:s0 tclass=3Dfile type=3DAVC msg=3Daudit(1244630464.870:34): avc: denied { read } for = pid=3D5805 comm=3D"notif-escalator" name=3D"escalator.state" dev=3Dxvda1 in= o=3D94292 scontext=3Droot:system_r:spacewalk_monitoring_t:s0 tcontext=3Dsys= tem_u:object_r:tmp_t:s0 tclass=3Dfile type=3DAVC msg=3Daudit(1244630464.870:35): avc: denied { ioctl } for = pid=3D5805 comm=3D"notif-escalator" path=3D"/var/tmp/escalator.state" dev= =3Dxvda1 ino=3D94292 scontext=3Droot:system_r:spacewalk_monitoring_t:s0 tco= ntext=3Dsystem_u:object_r:tmp_t:s0 tclass=3Dfile diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.fc b= /selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.fc index 81cfab9..38dc99d 100644 --- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.fc +++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.fc @@ -15,3 +15,4 @@ = /var/lib/nocpulse(/.*)? gen_context(system_u:object_r:spacewalk_monitoring= _var_lib_t,s0) /var/lib/notification(/.*)? gen_context(system_u:object_r:spacewalk_monito= ring_var_lib_t,s0) +/var/tmp/escalator.state gen_context(system_u:object_r:spacewalk_monitorin= g_var_lib_t,s0) --===============8742953916475582755==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:26 2015 Content-Type: multipart/mixed; boundary="===============1341145128126441146==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - selinux/spacewalk-monitoring-selinux Date: Wed, 10 Jun 2009 09:00:21 +0000 Message-ID: <20090610090021.154EB12035A@lists.fedorahosted.org> --===============1341145128126441146== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.fc | 1 + 1 file changed, 1 insertion(+) New commits: commit 3fa178e00aa2ddf2bc07de2c26ee5c8612d286eb Author: Miroslav Such=C3=BD Date: Wed Jun 10 10:45:23 2009 +0200 504649 - give /var/tmp/escalator.state context of spacewalk_monitoring_= var_lib_t = Addressing: type=3DAVC msg=3Daudit(1244630463.726:33): avc: denied { getattr } fo= r pid=3D5805 comm=3D"notif-escalator" path=3D"/var/tmp/escalator.state" de= v=3Dxvda1 ino=3D94292 scontext=3Droot:system_r:spacewalk_monitoring_t:s0 tc= ontext=3Dsystem_u:object_r:tmp_t:s0 tclass=3Dfile type=3DAVC msg=3Daudit(1244630464.870:34): avc: denied { read } for = pid=3D5805 comm=3D"notif-escalator" name=3D"escalator.state" dev=3Dxvda1 in= o=3D94292 scontext=3Droot:system_r:spacewalk_monitoring_t:s0 tcontext=3Dsys= tem_u:object_r:tmp_t:s0 tclass=3Dfile type=3DAVC msg=3Daudit(1244630464.870:35): avc: denied { ioctl } for = pid=3D5805 comm=3D"notif-escalator" path=3D"/var/tmp/escalator.state" dev= =3Dxvda1 ino=3D94292 scontext=3Droot:system_r:spacewalk_monitoring_t:s0 tco= ntext=3Dsystem_u:object_r:tmp_t:s0 tclass=3Dfile (cherry picked from commit e496f9d745909d6d379d6ecfe618ceafe51e563d) diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.fc b= /selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.fc index 81cfab9..38dc99d 100644 --- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.fc +++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.fc @@ -15,3 +15,4 @@ = /var/lib/nocpulse(/.*)? gen_context(system_u:object_r:spacewalk_monitoring= _var_lib_t,s0) /var/lib/notification(/.*)? gen_context(system_u:object_r:spacewalk_monito= ring_var_lib_t,s0) +/var/tmp/escalator.state gen_context(system_u:object_r:spacewalk_monitorin= g_var_lib_t,s0) --===============1341145128126441146==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:26 2015 Content-Type: multipart/mixed; boundary="===============1180334913439896376==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - rel-eng/packages selinux/spacewalk-monitoring-selinux Date: Wed, 10 Jun 2009 09:24:03 +0000 Message-ID: <20090610092403.E2C7D12035A@lists.fedorahosted.org> --===============1180334913439896376== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/spacewalk-monitoring-selinux | = 2 +- selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | = 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) New commits: commit 2ee04dbdd3454feac05f5c121bff66f573bb02ca Author: Miroslav Such=C3=BD Date: Wed Jun 10 11:23:58 2009 +0200 Automatic commit of package [spacewalk-monitoring-selinux] release [0.6= .9-1]. diff --git a/rel-eng/packages/spacewalk-monitoring-selinux b/rel-eng/packag= es/spacewalk-monitoring-selinux index 232469d..848be64 100644 --- a/rel-eng/packages/spacewalk-monitoring-selinux +++ b/rel-eng/packages/spacewalk-monitoring-selinux @@ -1 +1 @@ -0.6.8-1 selinux/spacewalk-monitoring-selinux/ +0.6.9-1 selinux/spacewalk-monitoring-selinux/ diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-seli= nux.spec b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinu= x.spec index c51e816..7295377 100644 --- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec +++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec @@ -7,7 +7,7 @@ %define modulename spacewalk-monitoring = Name: spacewalk-monitoring-selinux -Version: 0.6.8 +Version: 0.6.9 Release: 1%{?dist} Summary: SELinux policy module supporting Spacewalk monitoring = @@ -134,7 +134,7 @@ fi %attr(0755,root,root) %{_sbindir}/%{name}-enable = %changelog -* Wed Jun 10 2009 Miroslav Suchy +* Wed Jun 10 2009 Miroslav Suchy 0.6.9-1 - 504649 - give /var/tmp/escalator.state context of spacewalk_monitoring_v= ar_lib_t - 498611 - Require all monitoring packages so the files already exist when= we run restorecon - 498611 - Require perl-NOCpulse-Scheduler so /var/lib/nocpulse/NPkernel.o= ut already exist when we run restorecon commit a43b559adb20294f9b7488dae6ab32b69a43b69d Author: Miroslav Such=C3=BD Date: Wed Jun 10 11:23:28 2009 +0200 add changelog entry diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-seli= nux.spec b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinu= x.spec index bcbb386..c51e816 100644 --- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec +++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec @@ -134,6 +134,14 @@ fi %attr(0755,root,root) %{_sbindir}/%{name}-enable = %changelog +* Wed Jun 10 2009 Miroslav Suchy +- 504649 - give /var/tmp/escalator.state context of spacewalk_monitoring_v= ar_lib_t +- 498611 - Require all monitoring packages so the files already exist when= we run restorecon +- 498611 - Require perl-NOCpulse-Scheduler so /var/lib/nocpulse/NPkernel.o= ut already exist when we run restorecon +- spacewalk_monitoring_conf_t for /etc/NOCpulse.ini (mzazrivec(a)redhat.co= m) +- 501546 - Require tsdb so that /var/log/nocpulse/TSDBLocalQueue already e= xists when we run restorecon (jpazdziora(a)redhat.com) +- 500330 - allow httpd_sys_script_t to bind to loopback as well (jpazdzior= a(a)redhat.com) + * Tue May 26 2009 Jan Pazdziora 0.6.8-1 - 498941 - allow monitoring to connect to ftp - 498930 - allow monitoring to do rpc --===============1180334913439896376==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:26 2015 Content-Type: multipart/mixed; boundary="===============8813629198068911631==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-monitoring-selinux-0.6.9-1' Date: Wed, 10 Jun 2009 09:24:11 +0000 Message-ID: <20090610092411.20995120375@lists.fedorahosted.org> --===============8813629198068911631== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-monitoring-selinux-0.6.9-1' created by Miroslav Such=C3=BD <= msuchy(a)redhat.com> at 2009-06-10 09:23 +0000 Tagging package [spacewalk-monitoring-selinux] version [0.6.9-1] in directo= ry [selinux/spacewalk-monitoring-selinux/]. Changes since spacewalk-java-0.6.25-1-13: --- 0 files changed --- --===============8813629198068911631==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:26 2015 Content-Type: multipart/mixed; boundary="===============0944902873135289766==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: proxy/proxy rel-eng/packages Date: Wed, 10 Jun 2009 09:25:43 +0000 Message-ID: <20090610092543.0348E12035A@lists.fedorahosted.org> --===============0944902873135289766== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/proxy/spacewalk-proxy.spec | 5 ++++- rel-eng/packages/spacewalk-proxy | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit b05b647a4093c5fc68c9947e3a9be2336caaa3a4 Author: Miroslav Such=C3=BD Date: Wed Jun 10 11:25:36 2009 +0200 Automatic commit of package [spacewalk-proxy] release [0.6.3-1]. diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy= .spec index 82540d2..efc2e15 100644 --- a/proxy/proxy/spacewalk-proxy.spec +++ b/proxy/proxy/spacewalk-proxy.spec @@ -4,7 +4,7 @@ Group: Applications/Internet License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz -Version: 0.6.2 +Version: 0.6.3 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) = BuildRequires: python @@ -288,6 +288,9 @@ fi = = %changelog +* Wed Jun 10 2009 Miroslav Suchy 0.6.3-1 +- 503187 - set MaxRequestsPerChild to 200 (Proxy CLI) + * Wed May 6 2009 Miroslav Such=C3=BD 0.6.2-1 - 493428 - require spacewalk-proxy-selinux so we can run in permissive mode = diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-= proxy index 56a2870..096d3b7 100644 --- a/rel-eng/packages/spacewalk-proxy +++ b/rel-eng/packages/spacewalk-proxy @@ -1 +1 @@ -0.6.2-1 proxy/proxy/ +0.6.3-1 proxy/proxy/ --===============0944902873135289766==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:26 2015 Content-Type: multipart/mixed; boundary="===============7594313369493044110==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-proxy-0.6.3-1' Date: Wed, 10 Jun 2009 09:25:54 +0000 Message-ID: <20090610092554.96BC4120376@lists.fedorahosted.org> --===============7594313369493044110== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-proxy-0.6.3-1' created by Miroslav Such=C3=BD at 2009-06-10 09:25 +0000 Tagging package [spacewalk-proxy] version [0.6.3-1] in directory [proxy/pro= xy/]. Changes since spacewalk-monitoring-selinux-0.6.9-1: Miroslav Such=C3=BD (1): Automatic commit of package [spacewalk-proxy] release [0.6.3-1]. --- proxy/proxy/spacewalk-proxy.spec | 5 ++++- rel-eng/packages/spacewalk-proxy | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) --- --===============7594313369493044110==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:26 2015 Content-Type: multipart/mixed; boundary="===============3836325045086306650==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: monitoring/NOCpulsePlugins rel-eng/packages Date: Wed, 10 Jun 2009 09:27:10 +0000 Message-ID: <20090610092710.151D312035A@lists.fedorahosted.org> --===============3836325045086306650== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable monitoring/NOCpulsePlugins/NOCpulsePlugins.spec | 5 ++++- rel-eng/packages/NOCpulsePlugins | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 63f349187c1f15c105a42858bf1fcb034f14ab96 Author: Miroslav Such=C3=BD Date: Wed Jun 10 11:27:01 2009 +0200 Automatic commit of package [NOCpulsePlugins] release [2.208.10-1]. diff --git a/monitoring/NOCpulsePlugins/NOCpulsePlugins.spec b/monitoring/N= OCpulsePlugins/NOCpulsePlugins.spec index 24a7983..3b994df 100644 --- a/monitoring/NOCpulsePlugins/NOCpulsePlugins.spec +++ b/monitoring/NOCpulsePlugins/NOCpulsePlugins.spec @@ -1,5 +1,5 @@ Name: NOCpulsePlugins -Version: 2.208.9 +Version: 2.208.10 Release: 1%{?dist} Summary: NOCpulse authored Plugins URL: https://fedorahosted.org/spacewalk @@ -65,6 +65,9 @@ fi rm -rf $RPM_BUILD_ROOT = %changelog +* Wed Jun 10 2009 Miroslav Suchy 2.208.10-1 +- 502595 - use ip instead of hostname + * Tue May 26 2009 Miroslav Such=C3=BD 2.208.9-1 - 474279 - rewrite TNSping probe (take 2) = diff --git a/rel-eng/packages/NOCpulsePlugins b/rel-eng/packages/NOCpulsePl= ugins index c5e42d6..656bc7e 100644 --- a/rel-eng/packages/NOCpulsePlugins +++ b/rel-eng/packages/NOCpulsePlugins @@ -1 +1 @@ -2.208.9-1 monitoring/NOCpulsePlugins/ +2.208.10-1 monitoring/NOCpulsePlugins/ --===============3836325045086306650==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:26 2015 Content-Type: multipart/mixed; boundary="===============9014326326270672926==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/NOCpulsePlugins-2.208.10-1' Date: Wed, 10 Jun 2009 09:27:18 +0000 Message-ID: <20090610092718.5622F12035A@lists.fedorahosted.org> --===============9014326326270672926== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'NOCpulsePlugins-2.208.10-1' created by Miroslav Such=C3=BD at 2009-06-10 09:27 +0000 Tagging package [NOCpulsePlugins] version [2.208.10-1] in directory [monito= ring/NOCpulsePlugins/]. Changes since spacewalk-proxy-0.6.3-1: Miroslav Such=C3=BD (1): Automatic commit of package [NOCpulsePlugins] release [2.208.10-1]. --- monitoring/NOCpulsePlugins/NOCpulsePlugins.spec | 5 ++++- rel-eng/packages/NOCpulsePlugins | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) --- --===============9014326326270672926==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:26 2015 Content-Type: multipart/mixed; boundary="===============7744145541140788269==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: proxy/installer rel-eng/packages Date: Wed, 10 Jun 2009 09:28:50 +0000 Message-ID: <20090610092850.0355B12035A@lists.fedorahosted.org> --===============7744145541140788269== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/installer/spacewalk-proxy-installer.spec | 6 +++++- rel-eng/packages/spacewalk-proxy-installer | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit d98615b60f7154d89315f67c8d8f6972ec6d3e2c Author: Miroslav Such=C3=BD Date: Wed Jun 10 11:28:44 2009 +0200 Automatic commit of package [spacewalk-proxy-installer] release [0.6.12= -1]. diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/install= er/spacewalk-proxy-installer.spec index a4fe959..b75cb64 100644 --- a/proxy/installer/spacewalk-proxy-installer.spec +++ b/proxy/installer/spacewalk-proxy-installer.spec @@ -2,7 +2,7 @@ Name: spacewalk-proxy-installer Summary: Spacewalk Proxy Server Installer Group: Applications/Internet License: GPLv2 -Version: 0.6.11 +Version: 0.6.12 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz @@ -84,6 +84,10 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE answers.txt = %changelog +* Wed Jun 10 2009 Miroslav Suchy 0.6.12-1 +- runtime error - global name 's' is not defined +- 504660 - fix typo in message + * Fri Jun 05 2009 jesus m. rodriguez 0.6.11-1 - 499399 - read SCOUT_SHARED_KEY value from api call proxy.createMonitoringScout (msuchy(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-proxy-installer b/rel-eng/packages/= spacewalk-proxy-installer index 3510c55..74b85da 100644 --- a/rel-eng/packages/spacewalk-proxy-installer +++ b/rel-eng/packages/spacewalk-proxy-installer @@ -1 +1 @@ -0.6.11-1 proxy/installer/ +0.6.12-1 proxy/installer/ --===============7744145541140788269==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:26 2015 Content-Type: multipart/mixed; boundary="===============3849363167630582681==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-proxy-installer-0.6.12-1' Date: Wed, 10 Jun 2009 09:28:57 +0000 Message-ID: <20090610092858.00841120377@lists.fedorahosted.org> --===============3849363167630582681== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-proxy-installer-0.6.12-1' created by Miroslav Such=C3=BD at 2009-06-10 09:28 +0000 Tagging package [spacewalk-proxy-installer] version [0.6.12-1] in directory= [proxy/installer/]. Changes since NOCpulsePlugins-2.208.10-1: Miroslav Such=C3=BD (1): Automatic commit of package [spacewalk-proxy-installer] release [0.6.= 12-1]. --- proxy/installer/spacewalk-proxy-installer.spec | 6 +++++- rel-eng/packages/spacewalk-proxy-installer | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) --- --===============3849363167630582681==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:27 2015 Content-Type: multipart/mixed; boundary="===============0549142352110648413==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: selinux/jabberd-selinux selinux/oracle-instantclient-selinux selinux/oracle-rhnsat-selinux selinux/oracle-selinux selinux/oracle-xe-selinux selinux/spacewalk-monitoring-selinux selinux/spacewalk-proxy-selinux selinux/spacewalk-selinux Date: Wed, 10 Jun 2009 13:00:53 +0000 Message-ID: <20090610130053.29F801201F2@lists.fedorahosted.org> --===============0549142352110648413== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable selinux/jabberd-selinux/jabberd-selinux.spec | = 4 ++-- selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec | = 2 +- selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | = 2 +- selinux/oracle-selinux/oracle-selinux.spec | = 6 +++--- selinux/oracle-xe-selinux/oracle-xe-selinux.spec | = 4 ++-- selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | = 2 +- selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec | = 4 ++-- selinux/spacewalk-selinux/spacewalk-selinux.spec | = 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) New commits: commit b4a7b0407d3d4470fa9ad3a5700329eff2e9e1d0 Author: Miroslav Such=C3=BD Date: Wed Jun 10 14:59:53 2009 +0200 498611 - run restorecon in %posttrans = if we run: yum install spacewalk-monitoring-selinux perl-NOCpulse-Scheduler then ls -ldZ /usr/lib/perl5/vendor_perl/5.8.8/NOCpulse/Scheduler drwxr-xr-x root root system_u:object_r:lib_t /usr/lib/perl5/v= endor_perl/5.8.8/NOCpulse/Scheduler will have wrong context. This seem to be bug in rpm or selinux. As work= around we run restorecon in %posttrans when all files are already installed. diff --git a/selinux/jabberd-selinux/jabberd-selinux.spec b/selinux/jabberd= -selinux/jabberd-selinux.spec index ea98f8e..51d1f70 100644 --- a/selinux/jabberd-selinux/jabberd-selinux.spec +++ b/selinux/jabberd-selinux/jabberd-selinux.spec @@ -63,14 +63,14 @@ install -p -m 644 %{modulename}.if \ # Hardlink identical policy module packages together /usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux = -# Install jabberd-selinux-enable which will be called in %post +# Install jabberd-selinux-enable which will be called in %posttrans install -d %{buildroot}%{_sbindir} install -p -m 755 %{name}-enable %{buildroot}%{_sbindir}/%{name}-enable = %clean rm -rf %{buildroot} = -%post +%posttrans if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable fi diff --git a/selinux/oracle-instantclient-selinux/oracle-instantclient-seli= nux.spec b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinu= x.spec index 57c64af..ced423a 100644 --- a/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec +++ b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec @@ -68,7 +68,7 @@ EOS %clean rm -rf $RPM_BUILD_ROOT = -%post +%posttrans if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable fi diff --git a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec b/sel= inux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec index cde2b42..c2b1861 100644 --- a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec +++ b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec @@ -74,7 +74,7 @@ install -p -m 755 %{name}-%{version}/%{name}-enable %{bui= ldroot}%{_sbindir}/%{na %clean rm -rf %{buildroot} = -%post +%posttrans if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable fi diff --git a/selinux/oracle-selinux/oracle-selinux.spec b/selinux/oracle-se= linux/oracle-selinux.spec index e00cbe3..23654ed 100644 --- a/selinux/oracle-selinux/oracle-selinux.spec +++ b/selinux/oracle-selinux/oracle-selinux.spec @@ -107,14 +107,14 @@ install -p -m 644 SELinux/%{modulename}-nofcontext.if= \ # Hardlink identical policy module packages together /usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux = -# Install oracle-nofcontext-selinux-enable which will be called in %post +# Install oracle-nofcontext-selinux-enable which will be called in %posttr= ans install -d %{buildroot}%{_sbindir} install -p -m 755 SELinux/oracle-nofcontext-selinux-enable %{buildroot}%{_= sbindir}/oracle-nofcontext-selinux-enable = %clean rm -rf %{buildroot} = -%post +%posttrans # Install SELinux policy modules for selinuxvariant in %{selinux_variants} do @@ -132,7 +132,7 @@ test ${SEPORT_STATUS} -lt 1 && semanage port -a -t orac= le_port_t -p tcp 1521 || /sbin/restorecon -R -v /etc || : /sbin/restorecon -R -v /var/tmp || : = -%post -n oracle-nofcontext-selinux +%posttrans -n oracle-nofcontext-selinux if /usr/sbin/selinuxenabled ; then %{_sbindir}/oracle-nofcontext-selinux-enable fi diff --git a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec b/selinux/ora= cle-xe-selinux/oracle-xe-selinux.spec index c4cd2c5..1b5d8fa 100644 --- a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec +++ b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec @@ -78,7 +78,7 @@ install -p -m 644 %{name}-%{version}/%{modulename}.if \ # Hardlink identical policy module packages together /usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux = -# Install oracle-xe-selinux-enable which will be called in %post +# Install oracle-xe-selinux-enable which will be called in %posttrans install -d %{buildroot}%{_sbindir} install -p -m 755 %{name}-%{version}/%{name}-enable %{buildroot}%{_sbindir= }/%{name}-enable = @@ -97,7 +97,7 @@ elif [ $ORACLE_UID -ge 500 ] ; then exit 1 fi = -%post +%posttrans if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable fi diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-seli= nux.spec b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinu= x.spec index 7295377..c7983f2 100644 --- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec +++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec @@ -108,7 +108,7 @@ install -p -m 755 %{name}-enable %{buildroot}%{_sbindir= }/%{name}-enable %clean rm -rf %{buildroot} = -%post +%posttrans if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable fi diff --git a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec b= /selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec index e16f815..49ff28e 100644 --- a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec +++ b/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec @@ -69,14 +69,14 @@ install -p -m 644 %{modulename}.if \ # Hardlink identical policy module packages together /usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux = -# Install spacewalk-proxy-selinux-enable which will be called in %post +# Install spacewalk-proxy-selinux-enable which will be called in %posttrans install -d %{buildroot}%{_sbindir} install -p -m 755 %{name}-enable %{buildroot}%{_sbindir}/%{name}-enable = %clean rm -rf %{buildroot} = -%post +%posttrans if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable fi diff --git a/selinux/spacewalk-selinux/spacewalk-selinux.spec b/selinux/spa= cewalk-selinux/spacewalk-selinux.spec index 3775c59..b833cdc 100644 --- a/selinux/spacewalk-selinux/spacewalk-selinux.spec +++ b/selinux/spacewalk-selinux/spacewalk-selinux.spec @@ -72,14 +72,14 @@ install -p -m 644 %{modulename}.if \ # Hardlink identical policy module packages together /usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux = -# Install spacewalk-selinux-enable which will be called in %post +# Install spacewalk-selinux-enable which will be called in %posttrans install -d %{buildroot}%{_sbindir} install -p -m 755 %{name}-enable %{buildroot}%{_sbindir}/%{name}-enable = %clean rm -rf %{buildroot} = -%post +%posttrans if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable --run-pure fi --===============0549142352110648413==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:27 2015 Content-Type: multipart/mixed; boundary="===============2252770386986511548==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: rel-eng/packages selinux/jabberd-selinux Date: Wed, 10 Jun 2009 13:03:34 +0000 Message-ID: <20090610130334.923E31201F2@lists.fedorahosted.org> --===============2252770386986511548== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/jabberd-selinux | 2 +- selinux/jabberd-selinux/jabberd-selinux.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 02678a5a06d1886c2175e931fcdaff9fc8e1451c Author: Miroslav Such=C3=BD Date: Wed Jun 10 15:03:23 2009 +0200 Automatic commit of package [jabberd-selinux] release [1.4.4-1]. diff --git a/rel-eng/packages/jabberd-selinux b/rel-eng/packages/jabberd-se= linux index 506c8f5..6257821 100644 --- a/rel-eng/packages/jabberd-selinux +++ b/rel-eng/packages/jabberd-selinux @@ -1 +1 @@ -1.4.3-1 selinux/jabberd-selinux/ +1.4.4-1 selinux/jabberd-selinux/ diff --git a/selinux/jabberd-selinux/jabberd-selinux.spec b/selinux/jabberd= -selinux/jabberd-selinux.spec index 51d1f70..f5f70a8 100644 --- a/selinux/jabberd-selinux/jabberd-selinux.spec +++ b/selinux/jabberd-selinux/jabberd-selinux.spec @@ -7,7 +7,7 @@ %define modulename jabber = Name: jabberd-selinux -Version: 1.4.3 +Version: 1.4.4 Release: 1%{?dist} Summary: SELinux policy module supporting jabberd = @@ -98,6 +98,9 @@ rpm -ql jabberd | xargs -n 1 /sbin/restorecon -ri {} || : %attr(0755,root,root) %{_sbindir}/%{name}-enable = %changelog +* Wed Jun 10 2009 Miroslav Suchy 1.4.4-1 +- 498611 - run restorecon in %posttrans + * Mon Apr 27 2009 Jan Pazdziora 1.4.3-1 - move the %post SELinux activation to /usr/sbin/jabberd-selinux-enable - use src.rpm packaging with single Source0 --===============2252770386986511548==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:27 2015 Content-Type: multipart/mixed; boundary="===============4749740612395707482==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - rel-eng/packages selinux/oracle-instantclient-selinux Date: Wed, 10 Jun 2009 13:05:00 +0000 Message-ID: <20090610130500.EB52C1201F2@lists.fedorahosted.org> --===============4749740612395707482== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/oracle-instantclient-selinux | = 2 +- selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec | = 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) New commits: commit 0505bdba3a23c5065fdb8a07beb427d3f0a233eb Author: Miroslav Such=C3=BD Date: Wed Jun 10 15:04:47 2009 +0200 Automatic commit of package [oracle-instantclient-selinux] release [10.= 3-1]. diff --git a/rel-eng/packages/oracle-instantclient-selinux b/rel-eng/packag= es/oracle-instantclient-selinux index 0dbe8ac..1167587 100644 --- a/rel-eng/packages/oracle-instantclient-selinux +++ b/rel-eng/packages/oracle-instantclient-selinux @@ -1 +1 @@ -10.2-13 selinux/oracle-instantclient-selinux/ +10.3-1 selinux/oracle-instantclient-selinux/ diff --git a/selinux/oracle-instantclient-selinux/oracle-instantclient-seli= nux.spec b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinu= x.spec index ae10493..74c9a63 100644 --- a/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec +++ b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec @@ -1,7 +1,7 @@ = Name: oracle-instantclient-selinux -Version: 10.2 -Release: 13%{?dist} +Version: 10.3 +Release: 1%{?dist} Summary: SELinux support for Oracle Instant Client Group: System Environment/Base License: GPLv2+ @@ -102,6 +102,9 @@ fi %attr(0755,root,root) %{_sbindir}/oracle-instantclient-sqlplus-selinux-ena= ble = %changelog +* Wed Jun 10 2009 Miroslav Suchy 10.3-1 +- 498611 - run restorecon in %posttrans + * Tue May 26 2009 Jan Pazdziora 10.2-13 - oracle-instantclient-selinux: use the correct oracle-instantclient-sqlplus-selinux-enable script name commit 58bb0bbfa3b6df17d21974b7edab747e5795370d Author: Miroslav Such=C3=BD Date: Wed Jun 10 15:04:21 2009 +0200 498611 - run restorecon in %posttrans = if we run: yum install spacewalk-monitoring-selinux perl-NOCpulse-Scheduler then ls -ldZ /usr/lib/perl5/vendor_perl/5.8.8/NOCpulse/Scheduler drwxr-xr-x root root system_u:object_r:lib_t /usr/lib/perl5/v= endor_perl/5.8.8/NOCpulse/Scheduler will have wrong context. This seem to be bug in rpm or selinux. As work= around we run restorecon in %posttrans when all files are already installed. diff --git a/selinux/oracle-instantclient-selinux/oracle-instantclient-seli= nux.spec b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinu= x.spec index ced423a..ae10493 100644 --- a/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec +++ b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec @@ -82,7 +82,7 @@ if [ $1 -eq 0 ]; then /sbin/restorecon -Rvv /usr/lib/oracle/10.2.*/client* || : fi = -%post -n oracle-instantclient-sqlplus-selinux +%posttrans -n oracle-instantclient-sqlplus-selinux if /usr/sbin/selinuxenabled ; then %{_sbindir}/oracle-instantclient-sqlplus-selinux-enable fi --===============4749740612395707482==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:27 2015 Content-Type: multipart/mixed; boundary="===============0523218754449185007==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: rel-eng/packages selinux/oracle-rhnsat-selinux Date: Wed, 10 Jun 2009 13:05:44 +0000 Message-ID: <20090610130544.341721201F2@lists.fedorahosted.org> --===============0523218754449185007== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/oracle-rhnsat-selinux | 2 +- selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) New commits: commit 0b24f7521b635f81c2846ea3e5c16b376a6acc7a Author: Miroslav Such=C3=BD Date: Wed Jun 10 15:05:36 2009 +0200 Automatic commit of package [oracle-rhnsat-selinux] release [10.3-1]. diff --git a/rel-eng/packages/oracle-rhnsat-selinux b/rel-eng/packages/orac= le-rhnsat-selinux index f0c2064..2b38899 100644 --- a/rel-eng/packages/oracle-rhnsat-selinux +++ b/rel-eng/packages/oracle-rhnsat-selinux @@ -1 +1 @@ -10.2-11 selinux/oracle-rhnsat-selinux/ +10.3-1 selinux/oracle-rhnsat-selinux/ diff --git a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec b/sel= inux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec index c2b1861..9d701e4 100644 --- a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec +++ b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec @@ -5,8 +5,8 @@ %define modulename oracle-rhnsat = Name: oracle-rhnsat-selinux -Version: 10.2 -Release: 11%{?dist} +Version: 10.3 +Release: 1%{?dist} Summary: SELinux policy module supporting Oracle Group: System Environment/Base License: GPLv2+ @@ -103,6 +103,9 @@ fi %attr(0755,root,root) %{_sbindir}/%{name}-enable = %changelog +* Wed Jun 10 2009 Miroslav Suchy 10.3-1 +- 498611 - run restorecon in %posttrans + * Wed Apr 29 2009 Jan Pazdziora 10.2-11 - move the %post SELinux activation to /usr/sbin/oracle-rhnsat-enable = --===============0523218754449185007==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:27 2015 Content-Type: multipart/mixed; boundary="===============6890577665086653787==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - rel-eng/packages selinux/oracle-selinux selinux/oracle-xe-selinux Date: Wed, 10 Jun 2009 13:07:27 +0000 Message-ID: <20090610130727.D00471201F2@lists.fedorahosted.org> --===============6890577665086653787== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/oracle-selinux | 2 +- rel-eng/packages/oracle-xe-selinux | 2 +- selinux/oracle-selinux/oracle-selinux.spec | 7 +++++-- selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 7 +++++-- 4 files changed, 12 insertions(+), 6 deletions(-) New commits: commit 9a7263f94161b24acfa012b4e36b55bd1931f644 Author: Miroslav Such=C3=BD Date: Wed Jun 10 15:07:11 2009 +0200 Automatic commit of package [oracle-xe-selinux] release [10.3-1]. diff --git a/rel-eng/packages/oracle-xe-selinux b/rel-eng/packages/oracle-x= e-selinux index a806a51..4477615 100644 --- a/rel-eng/packages/oracle-xe-selinux +++ b/rel-eng/packages/oracle-xe-selinux @@ -1 +1 @@ -10.2-10 selinux/oracle-xe-selinux/ +10.3-1 selinux/oracle-xe-selinux/ diff --git a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec b/selinux/ora= cle-xe-selinux/oracle-xe-selinux.spec index 1b5d8fa..ecddeae 100644 --- a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec +++ b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec @@ -5,8 +5,8 @@ %define modulename oracle-xe = Name: oracle-xe-selinux -Version: 10.2 -Release: 10%{?dist} +Version: 10.3 +Release: 1%{?dist} Summary: SELinux policy module supporting Oracle XE Group: System Environment/Base License: GPLv2+ @@ -128,6 +128,9 @@ fi %attr(0755,root,root) %{_sbindir}/%{name}-enable = %changelog +* Wed Jun 10 2009 Miroslav Suchy 10.3-1 +- 498611 - run restorecon in %posttrans + * Wed Apr 29 2009 Jan Pazdziora 10.2-10 - move the %post SELinux activation to /usr/sbin/oracle-xe-enable = commit 99507bd3f25da06653f3f65ed5939c88ba69d17d Author: Miroslav Such=C3=BD Date: Wed Jun 10 15:06:20 2009 +0200 Automatic commit of package [oracle-selinux] release [0.2-1]. diff --git a/rel-eng/packages/oracle-selinux b/rel-eng/packages/oracle-seli= nux index 23298be..32963e2 100644 --- a/rel-eng/packages/oracle-selinux +++ b/rel-eng/packages/oracle-selinux @@ -1 +1 @@ -0.1-23.8 selinux/oracle-selinux/ +0.2-1 selinux/oracle-selinux/ diff --git a/selinux/oracle-selinux/oracle-selinux.spec b/selinux/oracle-se= linux/oracle-selinux.spec index 23654ed..fbd8048 100644 --- a/selinux/oracle-selinux/oracle-selinux.spec +++ b/selinux/oracle-selinux/oracle-selinux.spec @@ -19,8 +19,8 @@ %endif = Name: oracle-selinux -Version: 0.1 -Release: 23.8%{?obtag}%{?dist}%{?repo} +Version: 0.2 +Release: 1%{?obtag}%{?dist}%{?repo} Summary: SELinux policy module supporting Oracle Group: System Environment/Base License: GPLv2+ @@ -185,6 +185,9 @@ fi %attr(0755,root,root) %{_sbindir}/oracle-nofcontext-selinux-enable = %changelog +* Wed Jun 10 2009 Miroslav Suchy 0.2-1 +- 498611 - run restorecon in %posttrans + * Wed Apr 29 2009 Jan Pazdziora 0.1-23.8 - fix the name of the SELinux enabling script = --===============6890577665086653787==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:27 2015 Content-Type: multipart/mixed; boundary="===============8270692304220338013==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: rel-eng/packages selinux/spacewalk-monitoring-selinux Date: Wed, 10 Jun 2009 13:08:05 +0000 Message-ID: <20090610130805.7400E1201F2@lists.fedorahosted.org> --===============8270692304220338013== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/spacewalk-monitoring-selinux | = 2 +- selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | = 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) New commits: commit b7fe7de6300bf39066c5018c27e5ddb01a8645a2 Author: Miroslav Such=C3=BD Date: Wed Jun 10 15:07:59 2009 +0200 Automatic commit of package [spacewalk-monitoring-selinux] release [0.6= .10-1]. diff --git a/rel-eng/packages/spacewalk-monitoring-selinux b/rel-eng/packag= es/spacewalk-monitoring-selinux index 848be64..6ea7c7a 100644 --- a/rel-eng/packages/spacewalk-monitoring-selinux +++ b/rel-eng/packages/spacewalk-monitoring-selinux @@ -1 +1 @@ -0.6.9-1 selinux/spacewalk-monitoring-selinux/ +0.6.10-1 selinux/spacewalk-monitoring-selinux/ diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-seli= nux.spec b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinu= x.spec index c7983f2..469f2a9 100644 --- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec +++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec @@ -7,7 +7,7 @@ %define modulename spacewalk-monitoring = Name: spacewalk-monitoring-selinux -Version: 0.6.9 +Version: 0.6.10 Release: 1%{?dist} Summary: SELinux policy module supporting Spacewalk monitoring = @@ -134,13 +134,14 @@ fi %attr(0755,root,root) %{_sbindir}/%{name}-enable = %changelog -* Wed Jun 10 2009 Miroslav Suchy 0.6.9-1 +* Wed Jun 10 2009 Miroslav Suchy 0.6.10-1 - 504649 - give /var/tmp/escalator.state context of spacewalk_monitoring_v= ar_lib_t - 498611 - Require all monitoring packages so the files already exist when= we run restorecon - 498611 - Require perl-NOCpulse-Scheduler so /var/lib/nocpulse/NPkernel.o= ut already exist when we run restorecon - spacewalk_monitoring_conf_t for /etc/NOCpulse.ini (mzazrivec(a)redhat.co= m) - 501546 - Require tsdb so that /var/log/nocpulse/TSDBLocalQueue already e= xists when we run restorecon (jpazdziora(a)redhat.com) - 500330 - allow httpd_sys_script_t to bind to loopback as well (jpazdzior= a(a)redhat.com) +- 498611 - run restorecon in %posttrans = * Tue May 26 2009 Jan Pazdziora 0.6.8-1 - 498941 - allow monitoring to connect to ftp --===============8270692304220338013==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:27 2015 Content-Type: multipart/mixed; boundary="===============4767693132052422021==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: rel-eng/packages selinux/spacewalk-proxy-selinux Date: Wed, 10 Jun 2009 13:08:55 +0000 Message-ID: <20090610130855.F0ECE1201F2@lists.fedorahosted.org> --===============4767693132052422021== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/spacewalk-proxy-selinux | 2 +- selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 7bd0fef7ea3d50625118ce0e3aade923ca2220ed Author: Miroslav Such=C3=BD Date: Wed Jun 10 15:08:47 2009 +0200 Automatic commit of package [spacewalk-proxy-selinux] release [0.6.3-1]. diff --git a/rel-eng/packages/spacewalk-proxy-selinux b/rel-eng/packages/sp= acewalk-proxy-selinux index cb8967a..8e58785 100644 --- a/rel-eng/packages/spacewalk-proxy-selinux +++ b/rel-eng/packages/spacewalk-proxy-selinux @@ -1 +1 @@ -0.6.2-1 selinux/spacewalk-proxy-selinux/ +0.6.3-1 selinux/spacewalk-proxy-selinux/ diff --git a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec b= /selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec index 49ff28e..828d430 100644 --- a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec +++ b/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec @@ -7,7 +7,7 @@ %define modulename spacewalk-proxy = Name: spacewalk-proxy-selinux -Version: 0.6.2 +Version: 0.6.3 Release: 1%{?dist} Summary: SELinux policy module supporting Spacewalk Proxy = @@ -101,6 +101,9 @@ fi %attr(0755,root,root) %{_sbindir}/%{name}-enable = %changelog +* Wed Jun 10 2009 Miroslav Suchy 0.6.3-1 +- 498611 - run restorecon in %posttrans + * Mon Apr 27 2009 Jan Pazdziora 0.6.2-1 - move the %post SELinux activation to /usr/sbin/spacewalk-proxy-selinux-e= nable - use src.rpm packaging with single Source0 --===============4767693132052422021==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:27 2015 Content-Type: multipart/mixed; boundary="===============9077304914826141632==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: rel-eng/packages selinux/spacewalk-selinux Date: Wed, 10 Jun 2009 13:09:46 +0000 Message-ID: <20090610130946.6CF4B1201F2@lists.fedorahosted.org> --===============9077304914826141632== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/spacewalk-selinux | 2 +- selinux/spacewalk-selinux/spacewalk-selinux.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 012842da22cd63f5f609d03ec288f758433d873b Author: Miroslav Such=C3=BD Date: Wed Jun 10 15:09:40 2009 +0200 Automatic commit of package [spacewalk-selinux] release [0.6.9-1]. diff --git a/rel-eng/packages/spacewalk-selinux b/rel-eng/packages/spacewal= k-selinux index 1c64887..9ab1f35 100644 --- a/rel-eng/packages/spacewalk-selinux +++ b/rel-eng/packages/spacewalk-selinux @@ -1 +1 @@ -0.6.8-1 selinux/spacewalk-selinux/ +0.6.9-1 selinux/spacewalk-selinux/ diff --git a/selinux/spacewalk-selinux/spacewalk-selinux.spec b/selinux/spa= cewalk-selinux/spacewalk-selinux.spec index b833cdc..289ddb0 100644 --- a/selinux/spacewalk-selinux/spacewalk-selinux.spec +++ b/selinux/spacewalk-selinux/spacewalk-selinux.spec @@ -7,7 +7,7 @@ %define modulename spacewalk = Name: spacewalk-selinux -Version: 0.6.8 +Version: 0.6.9 Release: 1%{?dist} Summary: SELinux policy module supporting Spacewalk Server = @@ -105,6 +105,9 @@ fi %attr(0755,root,root) %{_sbindir}/%{name}-enable = %changelog +* Wed Jun 10 2009 Miroslav Suchy 0.6.9-1 +- 498611 - run restorecon in %posttrans + * Wed May 27 2009 Jan Pazdziora 0.6.8-1 - call to spacewalk-make-mount-points and Require spacewalk-setup for that - add invocation of oracle-nofcontext-selinux-enable --===============9077304914826141632==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:27 2015 Content-Type: multipart/mixed; boundary="===============2932407226485491599==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/jabberd-selinux-1.4.4-1' Date: Wed, 10 Jun 2009 13:09:56 +0000 Message-ID: <20090610130956.169211201F2@lists.fedorahosted.org> --===============2932407226485491599== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'jabberd-selinux-1.4.4-1' created by Miroslav Such=C3=BD at 2009-06-10 13:03 +0000 Tagging package [jabberd-selinux] version [1.4.4-1] in directory [selinux/j= abberd-selinux/]. Changes since spacewalk-proxy-installer-0.6.12-1-1: --- 0 files changed --- --===============2932407226485491599==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:27 2015 Content-Type: multipart/mixed; boundary="===============3953228508088926104==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/oracle-instantclient-selinux-10.3-1' Date: Wed, 10 Jun 2009 13:09:56 +0000 Message-ID: <20090610130956.B9FD3120282@lists.fedorahosted.org> --===============3953228508088926104== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'oracle-instantclient-selinux-10.3-1' created by Miroslav Such=C3=BD at 2009-06-10 13:04 +0000 Tagging package [oracle-instantclient-selinux] version [10.3-1] in director= y [selinux/oracle-instantclient-selinux/]. Changes since jabberd-selinux-1.4.4-1-1: --- 0 files changed --- --===============3953228508088926104==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:27 2015 Content-Type: multipart/mixed; boundary="===============2156595751649689110==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/oracle-rhnsat-selinux-10.3-1' Date: Wed, 10 Jun 2009 13:09:57 +0000 Message-ID: <20090610130957.D2DAC1201F2@lists.fedorahosted.org> --===============2156595751649689110== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'oracle-rhnsat-selinux-10.3-1' created by Miroslav Such=C3=BD at 2009-06-10 13:05 +0000 Tagging package [oracle-rhnsat-selinux] version [10.3-1] in directory [seli= nux/oracle-rhnsat-selinux/]. Changes since oracle-instantclient-selinux-10.3-1: Miroslav Such=C3=BD (1): Automatic commit of package [oracle-rhnsat-selinux] release [10.3-1]. --- rel-eng/packages/oracle-rhnsat-selinux | 2 +- selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) --- --===============2156595751649689110==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:27 2015 Content-Type: multipart/mixed; boundary="===============8047350245242584020==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/oracle-selinux-0.2-1' Date: Wed, 10 Jun 2009 13:09:58 +0000 Message-ID: <20090610130958.965F8120283@lists.fedorahosted.org> --===============8047350245242584020== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'oracle-selinux-0.2-1' created by Miroslav Such=C3=BD at 2009-06-10 13:06 +0000 Tagging package [oracle-selinux] version [0.2-1] in directory [selinux/orac= le-selinux/]. Changes since oracle-rhnsat-selinux-10.3-1: Miroslav Such=C3=BD (1): Automatic commit of package [oracle-selinux] release [0.2-1]. --- rel-eng/packages/oracle-selinux | 2 +- selinux/oracle-selinux/oracle-selinux.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) --- --===============8047350245242584020==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:27 2015 Content-Type: multipart/mixed; boundary="===============2972485234153022708==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/oracle-xe-selinux-10.3-1' Date: Wed, 10 Jun 2009 13:09:59 +0000 Message-ID: <20090610130959.DDBFC1202F5@lists.fedorahosted.org> --===============2972485234153022708== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'oracle-xe-selinux-10.3-1' created by Miroslav Such=C3=BD at 2009-06-10 13:07 +0000 Tagging package [oracle-xe-selinux] version [10.3-1] in directory [selinux/= oracle-xe-selinux/]. Changes since oracle-selinux-0.2-1: Miroslav Such=C3=BD (1): Automatic commit of package [oracle-xe-selinux] release [10.3-1]. --- rel-eng/packages/oracle-xe-selinux | 2 +- selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) --- --===============2972485234153022708==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:27 2015 Content-Type: multipart/mixed; boundary="===============7148663942722756576==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-monitoring-selinux-0.6.10-1' Date: Wed, 10 Jun 2009 13:10:00 +0000 Message-ID: <20090610131000.E47E2120299@lists.fedorahosted.org> --===============7148663942722756576== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-monitoring-selinux-0.6.10-1' created by Miroslav Such=C3=BD = at 2009-06-10 13:07 +0000 Tagging package [spacewalk-monitoring-selinux] version [0.6.10-1] in direct= ory [selinux/spacewalk-monitoring-selinux/]. Changes since oracle-xe-selinux-10.3-1: Miroslav Such=C3=BD (1): Automatic commit of package [spacewalk-monitoring-selinux] release [0= .6.10-1]. --- rel-eng/packages/spacewalk-monitoring-selinux | = 2 +- selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | = 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) --- --===============7148663942722756576==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:27 2015 Content-Type: multipart/mixed; boundary="===============2136078491106287646==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-selinux-0.6.9-1' Date: Wed, 10 Jun 2009 13:10:02 +0000 Message-ID: <20090610131002.EFEF01201F2@lists.fedorahosted.org> --===============2136078491106287646== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-selinux-0.6.9-1' created by Miroslav Such=C3=BD at 2009-06-10 13:09 +0000 Tagging package [spacewalk-selinux] version [0.6.9-1] in directory [selinux= /spacewalk-selinux/]. Changes since spacewalk-proxy-selinux-0.6.3-1: Miroslav Such=C3=BD (1): Automatic commit of package [spacewalk-selinux] release [0.6.9-1]. --- rel-eng/packages/spacewalk-selinux | 2 +- selinux/spacewalk-selinux/spacewalk-selinux.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) --- --===============2136078491106287646==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:27 2015 Content-Type: multipart/mixed; boundary="===============4154420180578493079==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-proxy-selinux-0.6.3-1' Date: Wed, 10 Jun 2009 13:10:02 +0000 Message-ID: <20090610131002.6A33F120299@lists.fedorahosted.org> --===============4154420180578493079== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-proxy-selinux-0.6.3-1' created by Miroslav Such=C3=BD at 2009-06-10 13:08 +0000 Tagging package [spacewalk-proxy-selinux] version [0.6.3-1] in directory [s= elinux/spacewalk-proxy-selinux/]. Changes since spacewalk-monitoring-selinux-0.6.10-1: Miroslav Such=C3=BD (1): Automatic commit of package [spacewalk-proxy-selinux] release [0.6.3-= 1]. --- rel-eng/packages/spacewalk-proxy-selinux | 2 +- selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) --- --===============4154420180578493079==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:27 2015 Content-Type: multipart/mixed; boundary="===============4743100840266407170==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 2 commits - selinux/jabberd-selinux selinux/oracle-instantclient-selinux selinux/oracle-rhnsat-selinux selinux/oracle-selinux selinux/oracle-xe-selinux selinux/spacewalk-monitoring-selinux selinux/spacewalk-proxy-selinux selinux/spacewalk-selinux Date: Wed, 10 Jun 2009 13:18:43 +0000 Message-ID: <20090610131843.317701201F2@lists.fedorahosted.org> --===============4743100840266407170== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable selinux/jabberd-selinux/jabberd-selinux.spec | = 4 ++-- selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec | = 4 ++-- selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | = 2 +- selinux/oracle-selinux/oracle-selinux.spec | = 6 +++--- selinux/oracle-xe-selinux/oracle-xe-selinux.spec | = 4 ++-- selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | = 2 +- selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec | = 4 ++-- selinux/spacewalk-selinux/spacewalk-selinux.spec | = 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) New commits: commit 73270291f712244408045fd9d043956f2a26647b Author: Miroslav Such=C3=BD Date: Wed Jun 10 15:04:21 2009 +0200 498611 - run restorecon in %posttrans = if we run: yum install spacewalk-monitoring-selinux perl-NOCpulse-Scheduler then ls -ldZ /usr/lib/perl5/vendor_perl/5.8.8/NOCpulse/Scheduler drwxr-xr-x root root system_u:object_r:lib_t /usr/lib/perl5/v= endor_perl/5.8.8/NOCpulse/Scheduler will have wrong context. This seem to be bug in rpm or selinux. As work= around we run restorecon in %posttrans when all files are already installed. (cherry picked from commit 58bb0bbfa3b6df17d21974b7edab747e5795370d) diff --git a/selinux/oracle-instantclient-selinux/oracle-instantclient-seli= nux.spec b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinu= x.spec index 879181d..c6565e1 100644 --- a/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec +++ b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec @@ -82,7 +82,7 @@ if [ $1 -eq 0 ]; then /sbin/restorecon -Rvv /usr/lib/oracle/10.2.*/client* || : fi = -%post -n oracle-instantclient-sqlplus-selinux +%posttrans -n oracle-instantclient-sqlplus-selinux if /usr/sbin/selinuxenabled ; then %{_sbindir}/oracle-instantclient-sqlplus-selinux-enable fi commit 3677ff65bcb3567d5d329cd87247f6d9007d7304 Author: Miroslav Such=C3=BD Date: Wed Jun 10 14:59:53 2009 +0200 498611 - run restorecon in %posttrans = if we run: yum install spacewalk-monitoring-selinux perl-NOCpulse-Scheduler then ls -ldZ /usr/lib/perl5/vendor_perl/5.8.8/NOCpulse/Scheduler drwxr-xr-x root root system_u:object_r:lib_t /usr/lib/perl5/v= endor_perl/5.8.8/NOCpulse/Scheduler will have wrong context. This seem to be bug in rpm or selinux. As work= around we run restorecon in %posttrans when all files are already installed. (cherry picked from commit b4a7b0407d3d4470fa9ad3a5700329eff2e9e1d0) diff --git a/selinux/jabberd-selinux/jabberd-selinux.spec b/selinux/jabberd= -selinux/jabberd-selinux.spec index 13161d0..d8b07ed 100644 --- a/selinux/jabberd-selinux/jabberd-selinux.spec +++ b/selinux/jabberd-selinux/jabberd-selinux.spec @@ -63,14 +63,14 @@ install -p -m 644 %{modulename}.if \ # Hardlink identical policy module packages together /usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux = -# Install jabberd-selinux-enable which will be called in %post +# Install jabberd-selinux-enable which will be called in %posttrans install -d %{buildroot}%{_sbindir} install -p -m 755 %{name}-enable %{buildroot}%{_sbindir}/%{name}-enable = %clean rm -rf %{buildroot} = -%post +%posttrans if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable fi diff --git a/selinux/oracle-instantclient-selinux/oracle-instantclient-seli= nux.spec b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinu= x.spec index ba97043..879181d 100644 --- a/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec +++ b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec @@ -68,7 +68,7 @@ EOS %clean rm -rf $RPM_BUILD_ROOT = -%post +%posttrans if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable fi diff --git a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec b/sel= inux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec index 6c319c3..736e838 100644 --- a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec +++ b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec @@ -74,7 +74,7 @@ install -p -m 755 %{name}-%{version}/%{name}-enable %{bui= ldroot}%{_sbindir}/%{na %clean rm -rf %{buildroot} = -%post +%posttrans if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable fi diff --git a/selinux/oracle-selinux/oracle-selinux.spec b/selinux/oracle-se= linux/oracle-selinux.spec index fe5e64d..8e07ec4 100644 --- a/selinux/oracle-selinux/oracle-selinux.spec +++ b/selinux/oracle-selinux/oracle-selinux.spec @@ -107,14 +107,14 @@ install -p -m 644 SELinux/%{modulename}-nofcontext.if= \ # Hardlink identical policy module packages together /usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux = -# Install oracle-nofcontext-selinux-enable which will be called in %post +# Install oracle-nofcontext-selinux-enable which will be called in %posttr= ans install -d %{buildroot}%{_sbindir} install -p -m 755 SELinux/oracle-nofcontext-selinux-enable %{buildroot}%{_= sbindir}/oracle-nofcontext-selinux-enable = %clean rm -rf %{buildroot} = -%post +%posttrans # Install SELinux policy modules for selinuxvariant in %{selinux_variants} do @@ -132,7 +132,7 @@ test ${SEPORT_STATUS} -lt 1 && semanage port -a -t orac= le_port_t -p tcp 1521 || /sbin/restorecon -R -v /etc || : /sbin/restorecon -R -v /var/tmp || : = -%post -n oracle-nofcontext-selinux +%posttrans -n oracle-nofcontext-selinux if /usr/sbin/selinuxenabled ; then %{_sbindir}/oracle-nofcontext-selinux-enable fi diff --git a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec b/selinux/ora= cle-xe-selinux/oracle-xe-selinux.spec index c22ad4f..5ef5342 100644 --- a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec +++ b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec @@ -78,7 +78,7 @@ install -p -m 644 %{name}-%{version}/%{modulename}.if \ # Hardlink identical policy module packages together /usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux = -# Install oracle-xe-selinux-enable which will be called in %post +# Install oracle-xe-selinux-enable which will be called in %posttrans install -d %{buildroot}%{_sbindir} install -p -m 755 %{name}-%{version}/%{name}-enable %{buildroot}%{_sbindir= }/%{name}-enable = @@ -97,7 +97,7 @@ elif [ $ORACLE_UID -ge 500 ] ; then exit 1 fi = -%post +%posttrans if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable fi diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-seli= nux.spec b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinu= x.spec index d86d038..f485c26 100644 --- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec +++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec @@ -108,7 +108,7 @@ install -p -m 755 %{name}-enable %{buildroot}%{_sbindir= }/%{name}-enable %clean rm -rf %{buildroot} = -%post +%posttrans if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable fi diff --git a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec b= /selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec index 1d4bbc2..3978aee 100644 --- a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec +++ b/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec @@ -69,14 +69,14 @@ install -p -m 644 %{modulename}.if \ # Hardlink identical policy module packages together /usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux = -# Install spacewalk-proxy-selinux-enable which will be called in %post +# Install spacewalk-proxy-selinux-enable which will be called in %posttrans install -d %{buildroot}%{_sbindir} install -p -m 755 %{name}-enable %{buildroot}%{_sbindir}/%{name}-enable = %clean rm -rf %{buildroot} = -%post +%posttrans if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable fi diff --git a/selinux/spacewalk-selinux/spacewalk-selinux.spec b/selinux/spa= cewalk-selinux/spacewalk-selinux.spec index 412a856..25ab6e4 100644 --- a/selinux/spacewalk-selinux/spacewalk-selinux.spec +++ b/selinux/spacewalk-selinux/spacewalk-selinux.spec @@ -72,14 +72,14 @@ install -p -m 644 %{modulename}.if \ # Hardlink identical policy module packages together /usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux = -# Install spacewalk-selinux-enable which will be called in %post +# Install spacewalk-selinux-enable which will be called in %posttrans install -d %{buildroot}%{_sbindir} install -p -m 755 %{name}-enable %{buildroot}%{_sbindir}/%{name}-enable = %clean rm -rf %{buildroot} = -%post +%posttrans if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable --run-pure fi --===============4743100840266407170==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:27 2015 Content-Type: multipart/mixed; boundary="===============4239032866085490594==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: client/tools Date: Wed, 10 Jun 2009 15:03:39 +0000 Message-ID: <20090610150340.005471201F2@lists.fedorahosted.org> --===============4239032866085490594== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/spacewalk-koan/spacewalk-koan.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 919a4607f4f1b4dbec2661145d67d5a8ca18a9a0 Author: Justin Sherrill Date: Wed Jun 10 11:03:30 2009 -0400 fixing spacewalk-koan spec file to build for 2.1 properly diff --git a/client/tools/spacewalk-koan/spacewalk-koan.spec b/client/tools= /spacewalk-koan/spacewalk-koan.spec index acaaa21..a959484 100644 --- a/client/tools/spacewalk-koan/spacewalk-koan.spec +++ b/client/tools/spacewalk-koan/spacewalk-koan.spec @@ -18,7 +18,7 @@ Provides: rhn-kickstart =3D 5.3.0 Conflicts: rhn-kickstart < 5.3.0 = # If this is rhel 4 or less we need up2date. -%if 0%{?rhel} && 0%{?rhel} < 5 +%if 0%{?rhel} < 5 Requires: up2date %else Requires: rhn-check --===============4239032866085490594==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:27 2015 Content-Type: multipart/mixed; boundary="===============2583882223766978678==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - client/tools Date: Wed, 10 Jun 2009 15:09:34 +0000 Message-ID: <20090610150934.2342F1201F2@lists.fedorahosted.org> --===============2583882223766978678== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/spacewalk-koan/spacewalk-koan.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c27e500ff27a032633728d1cf78ff93b16c84797 Author: Justin Sherrill Date: Wed Jun 10 11:03:30 2009 -0400 fixing spacewalk-koan spec file to build for 2.1 properly diff --git a/client/tools/spacewalk-koan/spacewalk-koan.spec b/client/tools= /spacewalk-koan/spacewalk-koan.spec index 4e5f2ad..9eec73c 100644 --- a/client/tools/spacewalk-koan/spacewalk-koan.spec +++ b/client/tools/spacewalk-koan/spacewalk-koan.spec @@ -18,7 +18,7 @@ Provides: rhn-kickstart =3D 5.3.0 Conflicts: rhn-kickstart < 5.3.0 = # If this is rhel 4 or less we need up2date. -%if 0%{?rhel} && 0%{?rhel} < 5 +%if 0%{?rhel} < 5 Requires: up2date %else Requires: rhn-check --===============2583882223766978678==-- From jmrodri at fedoraproject.org Thu Aug 20 11:57:28 2015 Content-Type: multipart/mixed; boundary="===============0432033676549763548==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: java/spacewalk-java.spec rel-eng/packages Date: Wed, 10 Jun 2009 15:29:40 +0000 Message-ID: <20090610152940.878681201F2@lists.fedorahosted.org> --===============0432033676549763548== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/spacewalk-java.spec | 12 +++++++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) New commits: commit e95d1986635966ec1cec1da76a989a35dc15e4bf Author: jesus m. rodriguez Date: Wed Jun 10 11:28:28 2009 -0400 Automatic commit of package [spacewalk-java] release [0.6.26-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 5be5731..4e41ef7 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -11,7 +11,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 0.6.25 +Version: 0.6.26 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{versi= on}.tar.gz = @@ -250,6 +250,16 @@ fi %attr(644, root, root) %{_datadir}/rhn/lib/rhn.jar = %changelog +* Wed Jun 10 2009 jesus m. rodriguez 0.6.26-1 +- 504806 - Added missing channel_filter attribute that was being lost duri= ng + pagination. (jason.dobies(a)redhat.com) +- 487014 - SystemSearch remove score requirement to redirect to SDC on 1 r= esult + (jmatthew(a)redhat.com) +- 490770 - Skip and warn if multiple virt channels are found. + (dgoodwin(a)redhat.com) +- 503801 - update channel details edit to not refresh package cache + (bbuckingham(a)redhat.com) + * Tue Jun 09 2009 jesus m. rodriguez 0.6.25-1 - 470991 - spacewalk-java requires jakarta-commons-io and spacewalk-brandi= ng. (jesusr(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-j= ava index e9d6f28..19a8cd5 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -0.6.25-1 java/ +0.6.26-1 java/ --===============0432033676549763548==-- From jmrodri at fedoraproject.org Thu Aug 20 11:57:28 2015 Content-Type: multipart/mixed; boundary="===============4668883826311312530==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-java-0.6.26-1' Date: Wed, 10 Jun 2009 15:29:47 +0000 Message-ID: <20090610152947.844DD120283@lists.fedorahosted.org> --===============4668883826311312530== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-java-0.6.26-1' created by jesus m. rodriguez at 2009-06-10 15:28 +0000 Tagging package [spacewalk-java] version [0.6.26-1] in directory [java/]. Changes since spacewalk-selinux-0.6.9-1-1: --- 0 files changed --- --===============4668883826311312530==-- From jdob at fedoraproject.org Thu Aug 20 11:57:28 2015 Content-Type: multipart/mixed; boundary="===============5788350085986972763==" MIME-Version: 1.0 From: jdob To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Wed, 10 Jun 2009 17:08:29 +0000 Message-ID: <20090610170829.783F21201F2@lists.fedorahosted.org> --===============5788350085986972763== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.j= ava | 1 + 1 file changed, 1 insertion(+) New commits: commit 7cb7fbf59d77e765ee95ce65f5a9fb0b4dc7cdce Author: Jason Dobies Date: Wed Jun 10 13:03:23 2009 -0400 504804 - Need to stuff the relevant flag back into the request so it's = used in the package name URLs. diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSe= archAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/Pack= ageSearchAction.java index eb0a297..ef6be3a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAct= ion.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAct= ion.java @@ -236,6 +236,7 @@ public class PackageSearchAction extends RhnAction { request.setAttribute("channel_arch", selectedArches); request.setAttribute("allChannels", allChannels); request.setAttribute("channel_filter", form.getString("channel_fil= ter")); + request.setAttribute("relevant", relevantFlag ? "yes" : "no"); = // Default where to search criteria request.setAttribute("whereCriteria", searchCriteria); --===============5788350085986972763==-- From jdob at fedoraproject.org Thu Aug 20 11:57:28 2015 Content-Type: multipart/mixed; boundary="===============7992780130589015024==" MIME-Version: 1.0 From: jdob To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Wed, 10 Jun 2009 17:09:21 +0000 Message-ID: <20090610170921.C0D6F1201F2@lists.fedorahosted.org> --===============7992780130589015024== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.j= ava | 1 + 1 file changed, 1 insertion(+) New commits: commit 9a30fd5c2a3746f69c38373ff8a09d8f05a18445 Author: Jason Dobies Date: Wed Jun 10 13:03:23 2009 -0400 504804 - Need to stuff the relevant flag back into the request so it's = used in the package name URLs. diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSe= archAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/Pack= ageSearchAction.java index eb0a297..ef6be3a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAct= ion.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAct= ion.java @@ -236,6 +236,7 @@ public class PackageSearchAction extends RhnAction { request.setAttribute("channel_arch", selectedArches); request.setAttribute("allChannels", allChannels); request.setAttribute("channel_filter", form.getString("channel_fil= ter")); + request.setAttribute("relevant", relevantFlag ? "yes" : "no"); = // Default where to search criteria request.setAttribute("whereCriteria", searchCriteria); --===============7992780130589015024==-- From jortel at fedoraproject.org Thu Aug 20 11:57:28 2015 Content-Type: multipart/mixed; boundary="===============7943128767342776054==" MIME-Version: 1.0 From: Jeff Ortel To: spacewalk-commits at lists.fedorahosted.org Subject: schema/spacewalk Date: Wed, 10 Jun 2009 18:23:54 +0000 Message-ID: <20090610182354.DCD1E1201F2@lists.fedorahosted.org> --===============7943128767342776054== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable schema/spacewalk/upgrade/spacewalk-0.4-spacewalk-0.5/190-rhnSharedChannelT= reeView.sql | 66 ---------- schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/190-= rhnSharedChannelTreeView.sql | 66 ++++++++++ 2 files changed, 66 insertions(+), 66 deletions(-) New commits: commit 1fd8069af53508503d43039238dd0f9cf67b5be6 Author: Jeff Ortel Date: Wed Jun 10 13:11:16 2009 -0500 492588 - Move upgrade script to correct directory. diff --git a/schema/spacewalk/upgrade/spacewalk-0.4-spacewalk-0.5/190-rhnSh= aredChannelTreeView.sql b/schema/spacewalk/upgrade/spacewalk-0.4-spacewalk-= 0.5/190-rhnSharedChannelTreeView.sql deleted file mode 100644 index dcd75d7..0000000 --- a/schema/spacewalk/upgrade/spacewalk-0.4-spacewalk-0.5/190-rhnSharedCha= nnelTreeView.sql +++ /dev/null @@ -1,66 +0,0 @@ --- --- Copyright (c) 2008 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 VIEW RHNSHAREDCHANNELTREEVIEW -( - ORG_ID, - ID, - DEPTH, - NAME, - PADDED_NAME, - CHANNEL_ARCH_ID, - LAST_MODIFIED, - LABEL, - PARENT_OR_SELF_LABEL, - PARENT_OR_SELF_ID, - END_OF_LIFE -) -AS -SELECT * FROM ( - SELECT - C.ORG_TRUST_ID AS ORG_ID, - C.ID, - 1 AS DEPTH, - C.NAME, - ' '||C.NAME AS PADDED_NAME, - C.CHANNEL_ARCH_ID, - C.LAST_MODIFIED, - C.LABEL, - C.LABEL AS PARENT_OR_SELF_LABEL, - C.ID AS PARENT_OR_SELF_ID, - C.END_OF_LIFE - FROM RHNSHAREDCHANNELVIEW C - WHERE C.PARENT_CHANNEL IS NULL - UNION - SELECT - C.ORG_TRUST_ID AS ORG_ID, - C.ID, - 2 AS DEPTH, - c.name, - ''||C.NAME AS PADDED_NAME, - C.CHANNEL_ARCH_ID, - C.LAST_MODIFIED, - C.LABEL, - PC.LABEL AS PARENT_OR_SELF_LABEL, - PC.ID AS PARENT_OR_SELF_ID, - C.END_OF_LIFE - FROM RHNCHANNEL PC, - RHNSHAREDCHANNELVIEW C - WHERE C.PARENT_CHANNEL =3D PC.ID -) ORDER BY PARENT_OR_SELF_LABEL, PARENT_OR_SELF_ID; - diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-sch= ema-0.6/190-rhnSharedChannelTreeView.sql b/schema/spacewalk/upgrade/spacewa= lk-schema-0.5-to-spacewalk-schema-0.6/190-rhnSharedChannelTreeView.sql new file mode 100644 index 0000000..dcd75d7 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6= /190-rhnSharedChannelTreeView.sql @@ -0,0 +1,66 @@ +-- +-- Copyright (c) 2008 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 VIEW RHNSHAREDCHANNELTREEVIEW +( + ORG_ID, + ID, + DEPTH, + NAME, + PADDED_NAME, + CHANNEL_ARCH_ID, + LAST_MODIFIED, + LABEL, + PARENT_OR_SELF_LABEL, + PARENT_OR_SELF_ID, + END_OF_LIFE +) +AS +SELECT * FROM ( + SELECT + C.ORG_TRUST_ID AS ORG_ID, + C.ID, + 1 AS DEPTH, + C.NAME, + ' '||C.NAME AS PADDED_NAME, + C.CHANNEL_ARCH_ID, + C.LAST_MODIFIED, + C.LABEL, + C.LABEL AS PARENT_OR_SELF_LABEL, + C.ID AS PARENT_OR_SELF_ID, + C.END_OF_LIFE + FROM RHNSHAREDCHANNELVIEW C + WHERE C.PARENT_CHANNEL IS NULL + UNION + SELECT + C.ORG_TRUST_ID AS ORG_ID, + C.ID, + 2 AS DEPTH, + c.name, + ''||C.NAME AS PADDED_NAME, + C.CHANNEL_ARCH_ID, + C.LAST_MODIFIED, + C.LABEL, + PC.LABEL AS PARENT_OR_SELF_LABEL, + PC.ID AS PARENT_OR_SELF_ID, + C.END_OF_LIFE + FROM RHNCHANNEL PC, + RHNSHAREDCHANNELVIEW C + WHERE C.PARENT_CHANNEL =3D PC.ID +) ORDER BY PARENT_OR_SELF_LABEL, PARENT_OR_SELF_ID; + --===============7943128767342776054==-- From jortel at fedoraproject.org Thu Aug 20 11:57:28 2015 Content-Type: multipart/mixed; boundary="===============7458820136989779469==" MIME-Version: 1.0 From: Jeff Ortel To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - schema/spacewalk Date: Wed, 10 Jun 2009 18:24:47 +0000 Message-ID: <20090610182448.0073C1201F2@lists.fedorahosted.org> --===============7458820136989779469== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable schema/spacewalk/upgrade/spacewalk-0.4-spacewalk-0.5/190-rhnSharedChannelT= reeView.sql | 66 ---------- schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/190-= rhnSharedChannelTreeView.sql | 66 ++++++++++ 2 files changed, 66 insertions(+), 66 deletions(-) New commits: commit 15ef0361b300e8b8e30aa54ce03caa67cfe5271d Author: Jeff Ortel Date: Wed Jun 10 13:11:16 2009 -0500 492588 - Move upgrade script to correct directory. diff --git a/schema/spacewalk/upgrade/spacewalk-0.4-spacewalk-0.5/190-rhnSh= aredChannelTreeView.sql b/schema/spacewalk/upgrade/spacewalk-0.4-spacewalk-= 0.5/190-rhnSharedChannelTreeView.sql deleted file mode 100644 index dcd75d7..0000000 --- a/schema/spacewalk/upgrade/spacewalk-0.4-spacewalk-0.5/190-rhnSharedCha= nnelTreeView.sql +++ /dev/null @@ -1,66 +0,0 @@ --- --- Copyright (c) 2008 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 VIEW RHNSHAREDCHANNELTREEVIEW -( - ORG_ID, - ID, - DEPTH, - NAME, - PADDED_NAME, - CHANNEL_ARCH_ID, - LAST_MODIFIED, - LABEL, - PARENT_OR_SELF_LABEL, - PARENT_OR_SELF_ID, - END_OF_LIFE -) -AS -SELECT * FROM ( - SELECT - C.ORG_TRUST_ID AS ORG_ID, - C.ID, - 1 AS DEPTH, - C.NAME, - ' '||C.NAME AS PADDED_NAME, - C.CHANNEL_ARCH_ID, - C.LAST_MODIFIED, - C.LABEL, - C.LABEL AS PARENT_OR_SELF_LABEL, - C.ID AS PARENT_OR_SELF_ID, - C.END_OF_LIFE - FROM RHNSHAREDCHANNELVIEW C - WHERE C.PARENT_CHANNEL IS NULL - UNION - SELECT - C.ORG_TRUST_ID AS ORG_ID, - C.ID, - 2 AS DEPTH, - c.name, - ''||C.NAME AS PADDED_NAME, - C.CHANNEL_ARCH_ID, - C.LAST_MODIFIED, - C.LABEL, - PC.LABEL AS PARENT_OR_SELF_LABEL, - PC.ID AS PARENT_OR_SELF_ID, - C.END_OF_LIFE - FROM RHNCHANNEL PC, - RHNSHAREDCHANNELVIEW C - WHERE C.PARENT_CHANNEL =3D PC.ID -) ORDER BY PARENT_OR_SELF_LABEL, PARENT_OR_SELF_ID; - diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-sch= ema-0.6/190-rhnSharedChannelTreeView.sql b/schema/spacewalk/upgrade/spacewa= lk-schema-0.5-to-spacewalk-schema-0.6/190-rhnSharedChannelTreeView.sql new file mode 100644 index 0000000..dcd75d7 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6= /190-rhnSharedChannelTreeView.sql @@ -0,0 +1,66 @@ +-- +-- Copyright (c) 2008 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 VIEW RHNSHAREDCHANNELTREEVIEW +( + ORG_ID, + ID, + DEPTH, + NAME, + PADDED_NAME, + CHANNEL_ARCH_ID, + LAST_MODIFIED, + LABEL, + PARENT_OR_SELF_LABEL, + PARENT_OR_SELF_ID, + END_OF_LIFE +) +AS +SELECT * FROM ( + SELECT + C.ORG_TRUST_ID AS ORG_ID, + C.ID, + 1 AS DEPTH, + C.NAME, + ' '||C.NAME AS PADDED_NAME, + C.CHANNEL_ARCH_ID, + C.LAST_MODIFIED, + C.LABEL, + C.LABEL AS PARENT_OR_SELF_LABEL, + C.ID AS PARENT_OR_SELF_ID, + C.END_OF_LIFE + FROM RHNSHAREDCHANNELVIEW C + WHERE C.PARENT_CHANNEL IS NULL + UNION + SELECT + C.ORG_TRUST_ID AS ORG_ID, + C.ID, + 2 AS DEPTH, + c.name, + ''||C.NAME AS PADDED_NAME, + C.CHANNEL_ARCH_ID, + C.LAST_MODIFIED, + C.LABEL, + PC.LABEL AS PARENT_OR_SELF_LABEL, + PC.ID AS PARENT_OR_SELF_ID, + C.END_OF_LIFE + FROM RHNCHANNEL PC, + RHNSHAREDCHANNELVIEW C + WHERE C.PARENT_CHANNEL =3D PC.ID +) ORDER BY PARENT_OR_SELF_LABEL, PARENT_OR_SELF_ID; + --===============7458820136989779469==-- From partha at fedoraproject.org Thu Aug 20 11:57:28 2015 Content-Type: multipart/mixed; boundary="===============4388316470280982923==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: branding/css java/code Date: Wed, 10 Jun 2009 18:51:30 +0000 Message-ID: <20090610185130.069021201F2@lists.fedorahosted.org> --===============4388316470280982923== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable branding/css/rhn-messaging.css = | 10 ++++------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml= | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) New commits: commit f6f83d512637030046de0dd92e5e40a1ae12b238 Author: Partha Aji Date: Wed Jun 10 14:53:43 2009 -0400 fix to shwo the correct error message css diff --git a/branding/css/rhn-messaging.css b/branding/css/rhn-messaging.css index 72fe594..92a413e 100644 --- a/branding/css/rhn-messaging.css +++ b/branding/css/rhn-messaging.css @@ -100,11 +100,9 @@ text-align: left; font-size: 14px; } -.local-alert { - color: #d00; - padding-top:7px; - padding-left:4px; - text-align: left; - font-size: 14px; + +.site-info ul, +.site-alert ul { +margin: 0px; } = diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResour= ce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringReso= urce_en_US.xml index ea75762..5abf630 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml @@ -101,13 +101,13 @@ -<div class=3D"local-alert"><ul> +<div class=3D"site-alert"><ul> All pages -</ul><br /></div> +</ul></div> All pages --===============4388316470280982923==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:28 2015 Content-Type: multipart/mixed; boundary="===============0735936041463397937==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Wed, 10 Jun 2009 20:11:39 +0000 Message-ID: <20090610201139.BD65A1201F2@lists.fedorahosted.org> --===============0735936041463397937== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java | = 9 ++------- java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml | = 8 ++++++-- 2 files changed, 8 insertions(+), 9 deletions(-) New commits: commit 3680203f0cae9d8e03f886a08ff197dd375d9b68 Author: John Matthews Date: Wed Jun 10 16:04:12 2009 -0400 490960 - ErrataSearch, fix for multiorg channel permissions Results are now adhering to the private/protected/public designations. diff --git a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java = b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java index d87966a..22e57c2 100644 --- a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java +++ b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java @@ -980,17 +980,12 @@ public class ErrataFactory extends HibernateFactory { * ids. */ public static List searchByPackageIdsWithOrg(List pids= , Org org) { - List orgIds =3D new ArrayList(); - orgIds.add(org.getId()); - for (Org o : org.getTrustedOrgs()) { - orgIds.add(o.getId()); - } Map params =3D new HashMap(); params.put("pids", pids); - params.put("org_ids", orgIds); + params.put("org_id", org.getId()); if (log.isDebugEnabled()) { + log.debug("org_id =3D " + org.getId()); log.debug("pids =3D " + pids); - log.debug("org_ids =3D " + orgIds); } List results =3D singleton.listObjectsByNamedQuery( "PublishedErrata.searchByPackageIdsWithOrg", params); diff --git a/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrat= a.hbm.xml b/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata= .hbm.xml index d2f19a4..f82475a 100644 --- a/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.x= ml +++ b/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.x= ml @@ -155,12 +155,16 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" from rhnErrata e, rhnErrataPackage ep, rhnPackage p, - rhnPackageName pn + rhnPackageName pn, + rhnAvailableChannels ac, + rhnChannelErrata ce where e.id =3D ep.errata_id and p.id =3D ep.package_id and p.name_id =3D pn.id and ep.package_id IN (:pids) - and e.org_id IN (:org_ids) + and e.id =3D ce.errata_id + and ce.channel_id =3D ac.channel_id + and ac.org_id =3D :org_id order by e.id]]> --===============0735936041463397937==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:28 2015 Content-Type: multipart/mixed; boundary="===============6097666542030174161==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Wed, 10 Jun 2009 20:12:16 +0000 Message-ID: <20090610201216.8C1951201F2@lists.fedorahosted.org> --===============6097666542030174161== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java | = 9 ++------- java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml | = 8 ++++++-- 2 files changed, 8 insertions(+), 9 deletions(-) New commits: commit 40bbd72aca5584d24bccea315ccf60d270e7bfee Author: John Matthews Date: Wed Jun 10 16:04:12 2009 -0400 490960 - ErrataSearch, fix for multiorg channel permissions Results are now adhering to the private/protected/public designations. diff --git a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java = b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java index d87966a..22e57c2 100644 --- a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java +++ b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java @@ -980,17 +980,12 @@ public class ErrataFactory extends HibernateFactory { * ids. */ public static List searchByPackageIdsWithOrg(List pids= , Org org) { - List orgIds =3D new ArrayList(); - orgIds.add(org.getId()); - for (Org o : org.getTrustedOrgs()) { - orgIds.add(o.getId()); - } Map params =3D new HashMap(); params.put("pids", pids); - params.put("org_ids", orgIds); + params.put("org_id", org.getId()); if (log.isDebugEnabled()) { + log.debug("org_id =3D " + org.getId()); log.debug("pids =3D " + pids); - log.debug("org_ids =3D " + orgIds); } List results =3D singleton.listObjectsByNamedQuery( "PublishedErrata.searchByPackageIdsWithOrg", params); diff --git a/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrat= a.hbm.xml b/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata= .hbm.xml index d2f19a4..f82475a 100644 --- a/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.x= ml +++ b/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.x= ml @@ -155,12 +155,16 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" from rhnErrata e, rhnErrataPackage ep, rhnPackage p, - rhnPackageName pn + rhnPackageName pn, + rhnAvailableChannels ac, + rhnChannelErrata ce where e.id =3D ep.errata_id and p.id =3D ep.package_id and p.name_id =3D pn.id and ep.package_id IN (:pids) - and e.org_id IN (:org_ids) + and e.id =3D ce.errata_id + and ce.channel_id =3D ac.channel_id + and ac.org_id =3D :org_id order by e.id]]> --===============6097666542030174161==-- From jortel at fedoraproject.org Thu Aug 20 11:57:28 2015 Content-Type: multipart/mixed; boundary="===============0853878741276746063==" MIME-Version: 1.0 From: Jeff Ortel To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'pgsql' - schema/spacewalk Date: Wed, 10 Jun 2009 20:30:01 +0000 Message-ID: <20090610203001.5D1861201F2@lists.fedorahosted.org> --===============0853878741276746063== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/10-p= gport.sql |10068 ++++++++++ 1 file changed, 10068 insertions(+) New commits: commit 2cad6175e44f066b93130e7d4d9d0e4dbb5832d8 Author: Jeff Ortel Date: Wed Jun 10 15:17:41 2009 -0500 Add upgrade script to replace named NOT NULL constrains with anonymous. diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-sch= ema-0.7/10-pgport.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-sp= acewalk-schema-0.7/10-pgport.sql new file mode 100644 index 0000000..ffd1009 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7= /10-pgport.sql @@ -0,0 +1,10068 @@ +-- +-- Postgres compatability script. +-- Replaces named NOT NULL constraints with anonymous constraits via keywo= rd. +-- Required so that upgraded schema matches fresh install. +-- + + +-- +-- RHNPRODUCTNAME +-- +ALTER TABLE RHNPRODUCTNAME DROP CONSTRAINT PRODUCT_NAME_CREATED_NN; +ALTER TABLE RHNPRODUCTNAME MODIFY CREATED NOT NULL; + +-- +-- RHNPRODUCTNAME +-- +ALTER TABLE RHNPRODUCTNAME DROP CONSTRAINT PRODUCT_NAME_MODIFIED_NN; +ALTER TABLE RHNPRODUCTNAME MODIFY MODIFIED NOT NULL; + +-- +-- PXTSESSIONS +-- +ALTER TABLE PXTSESSIONS DROP CONSTRAINT PXTSESSIONS_EXPIRES_NN; +ALTER TABLE PXTSESSIONS MODIFY EXPIRES NOT NULL; + +-- +-- PXTSESSIONS +-- +ALTER TABLE PXTSESSIONS DROP CONSTRAINT PXTSESSIONS_VALUE_NN; +ALTER TABLE PXTSESSIONS MODIFY VALUE NOT NULL; + +-- +-- RHNACTIONCONFIGCHANNEL +-- +ALTER TABLE RHNACTIONCONFIGCHANNEL DROP CONSTRAINT RHN_ACTIONCC_AID_NN; +ALTER TABLE RHNACTIONCONFIGCHANNEL MODIFY ACTION_ID NOT NULL; + +-- +-- RHNACTIONCONFIGCHANNEL +-- +ALTER TABLE RHNACTIONCONFIGCHANNEL DROP CONSTRAINT RHN_ACTIONCC_CCID_NN; +ALTER TABLE RHNACTIONCONFIGCHANNEL MODIFY CONFIG_CHANNEL_ID NOT NULL; + +-- +-- RHNACTIONCONFIGCHANNEL +-- +ALTER TABLE RHNACTIONCONFIGCHANNEL DROP CONSTRAINT RHN_ACTIONCC_CREAT_NN; +ALTER TABLE RHNACTIONCONFIGCHANNEL MODIFY CREATED NOT NULL; + +-- +-- RHNACTIONCONFIGCHANNEL +-- +ALTER TABLE RHNACTIONCONFIGCHANNEL DROP CONSTRAINT RHN_ACTIONCC_MOD_NN; +ALTER TABLE RHNACTIONCONFIGCHANNEL MODIFY MODIFIED NOT NULL; + +-- +-- RHNACTIONCONFIGCHANNEL +-- +ALTER TABLE RHNACTIONCONFIGCHANNEL DROP CONSTRAINT RHN_ACTIONCC_SID_NN; +ALTER TABLE RHNACTIONCONFIGCHANNEL MODIFY SERVER_ID NOT NULL; + +-- +-- RHNACTIONCONFIGDATE +-- +ALTER TABLE RHNACTIONCONFIGDATE DROP CONSTRAINT RHN_ACTIONCD_AID_NN; +ALTER TABLE RHNACTIONCONFIGDATE MODIFY ACTION_ID NOT NULL; + +-- +-- RHNACTIONCONFIGDATE +-- +ALTER TABLE RHNACTIONCONFIGDATE DROP CONSTRAINT RHN_ACTIONCD_CREAT_NN; +ALTER TABLE RHNACTIONCONFIGDATE MODIFY CREATED NOT NULL; + +-- +-- RHNACTIONCONFIGDATEFILE +-- +ALTER TABLE RHNACTIONCONFIGDATEFILE DROP CONSTRAINT RHN_ACTIONCD_FILE_AID_= NN; +ALTER TABLE RHNACTIONCONFIGDATEFILE MODIFY ACTION_ID NOT NULL; + +-- +-- RHNACTIONCONFIGDATEFILE +-- +ALTER TABLE RHNACTIONCONFIGDATEFILE DROP CONSTRAINT RHN_ACTIONCD_FILE_CREA= T_NN; +ALTER TABLE RHNACTIONCONFIGDATEFILE MODIFY CREATED NOT NULL; + +-- +-- RHNACTIONCONFIGDATEFILE +-- +ALTER TABLE RHNACTIONCONFIGDATEFILE DROP CONSTRAINT RHN_ACTIONCD_FILE_FN_N= N; +ALTER TABLE RHNACTIONCONFIGDATEFILE MODIFY FILE_NAME NOT NULL; + +-- +-- RHNACTIONCONFIGDATEFILE +-- +ALTER TABLE RHNACTIONCONFIGDATEFILE DROP CONSTRAINT RHN_ACTIONCD_FILE_FT_N= N; +ALTER TABLE RHNACTIONCONFIGDATEFILE MODIFY FILE_TYPE NOT NULL; + +-- +-- RHNACTIONCONFIGDATE +-- +ALTER TABLE RHNACTIONCONFIGDATE DROP CONSTRAINT RHN_ACTIONCD_FILE_IC_NN; +ALTER TABLE RHNACTIONCONFIGDATE MODIFY IMPORT_CONTENTS NOT NULL; + +-- +-- RHNACTIONCONFIGDATEFILE +-- +ALTER TABLE RHNACTIONCONFIGDATEFILE DROP CONSTRAINT RHN_ACTIONCD_FILE_MOD_= NN; +ALTER TABLE RHNACTIONCONFIGDATEFILE MODIFY MODIFIED NOT NULL; + +-- +-- RHNACTIONCONFIGDATE +-- +ALTER TABLE RHNACTIONCONFIGDATE DROP CONSTRAINT RHN_ACTIONCD_MOD_NN; +ALTER TABLE RHNACTIONCONFIGDATE MODIFY MODIFIED NOT NULL; + +-- +-- RHNACTIONCONFIGDATE +-- +ALTER TABLE RHNACTIONCONFIGDATE DROP CONSTRAINT RHN_ACTIONCD_START_NN; +ALTER TABLE RHNACTIONCONFIGDATE MODIFY START_DATE NOT NULL; + +-- +-- RHNACTIONCONFIGREVISIONRESULT +-- +ALTER TABLE RHNACTIONCONFIGREVISIONRESULT DROP CONSTRAINT RHN_ACTIONCFR_AC= RID_NN; +ALTER TABLE RHNACTIONCONFIGREVISIONRESULT MODIFY ACTION_CONFIG_REVISION_ID= NOT NULL; + +-- +-- RHNACTIONCONFIGREVISIONRESULT +-- +ALTER TABLE RHNACTIONCONFIGREVISIONRESULT DROP CONSTRAINT RHN_ACTIONCFR_CR= EAT_NN; +ALTER TABLE RHNACTIONCONFIGREVISIONRESULT MODIFY CREATED NOT NULL; + +-- +-- RHNACTIONCONFIGREVISIONRESULT +-- +ALTER TABLE RHNACTIONCONFIGREVISIONRESULT DROP CONSTRAINT RHN_ACTIONCFR_MO= D_NN; +ALTER TABLE RHNACTIONCONFIGREVISIONRESULT MODIFY MODIFIED NOT NULL; + +-- +-- RHNACTIONCONFIGFILENAME +-- +ALTER TABLE RHNACTIONCONFIGFILENAME DROP CONSTRAINT RHN_ACTIONCF_CREAT_NN; +ALTER TABLE RHNACTIONCONFIGFILENAME MODIFY CREATED NOT NULL; + +-- +-- RHNACTIONCONFIGFILENAME +-- +ALTER TABLE RHNACTIONCONFIGFILENAME DROP CONSTRAINT RHN_ACTIONCF_MOD_NN; +ALTER TABLE RHNACTIONCONFIGFILENAME MODIFY MODIFIED NOT NULL; + +-- +-- RHNACTIONCONFIGFILENAME +-- +ALTER TABLE RHNACTIONCONFIGFILENAME DROP CONSTRAINT RHN_ACTIONCF_NAME_AID_= NN; +ALTER TABLE RHNACTIONCONFIGFILENAME MODIFY ACTION_ID NOT NULL; + +-- +-- RHNACTIONCONFIGFILENAME +-- +ALTER TABLE RHNACTIONCONFIGFILENAME DROP CONSTRAINT RHN_ACTIONCF_NAME_CFNI= D_NN; +ALTER TABLE RHNACTIONCONFIGFILENAME MODIFY CONFIG_FILE_NAME_ID NOT NULL; + +-- +-- RHNACTIONCONFIGFILENAME +-- +ALTER TABLE RHNACTIONCONFIGFILENAME DROP CONSTRAINT RHN_ACTIONCF_NAME_SID_= NN; +ALTER TABLE RHNACTIONCONFIGFILENAME MODIFY SERVER_ID NOT NULL; + +-- +-- RHNACTIONCONFIGREVISION +-- +ALTER TABLE RHNACTIONCONFIGREVISION DROP CONSTRAINT RHN_ACTIONCR_AID_NN; +ALTER TABLE RHNACTIONCONFIGREVISION MODIFY ACTION_ID NOT NULL; + +-- +-- RHNACTIONCONFIGREVISION +-- +ALTER TABLE RHNACTIONCONFIGREVISION DROP CONSTRAINT RHN_ACTIONCR_CREAT_NN; +ALTER TABLE RHNACTIONCONFIGREVISION MODIFY CREATED NOT NULL; + +-- +-- RHNACTIONCONFIGREVISION +-- +ALTER TABLE RHNACTIONCONFIGREVISION DROP CONSTRAINT RHN_ACTIONCR_CRID_NN; +ALTER TABLE RHNACTIONCONFIGREVISION MODIFY CONFIG_REVISION_ID NOT NULL; + +-- +-- RHNACTIONCONFIGREVISION +-- +ALTER TABLE RHNACTIONCONFIGREVISION DROP CONSTRAINT RHN_ACTIONCR_ID_NN; +ALTER TABLE RHNACTIONCONFIGREVISION MODIFY ID NOT NULL; + +-- +-- RHNACTIONCONFIGREVISION +-- +ALTER TABLE RHNACTIONCONFIGREVISION DROP CONSTRAINT RHN_ACTIONCR_MOD_NN; +ALTER TABLE RHNACTIONCONFIGREVISION MODIFY MODIFIED NOT NULL; + +-- +-- RHNACTIONCONFIGREVISION +-- +ALTER TABLE RHNACTIONCONFIGREVISION DROP CONSTRAINT RHN_ACTIONCR_SID_NN; +ALTER TABLE RHNACTIONCONFIGREVISION MODIFY SERVER_ID NOT NULL; + +-- +-- RHNACTIONDAEMONCONFIG +-- +ALTER TABLE RHNACTIONDAEMONCONFIG DROP CONSTRAINT RHN_ACTIONDC_AID_NN; +ALTER TABLE RHNACTIONDAEMONCONFIG MODIFY ACTION_ID NOT NULL; + +-- +-- RHNACTIONDAEMONCONFIG +-- +ALTER TABLE RHNACTIONDAEMONCONFIG DROP CONSTRAINT RHN_ACTIONDC_CREAT_NN; +ALTER TABLE RHNACTIONDAEMONCONFIG MODIFY CREATED NOT NULL; + +-- +-- RHNACTIONDAEMONCONFIG +-- +ALTER TABLE RHNACTIONDAEMONCONFIG DROP CONSTRAINT RHN_ACTIONDC_INT_NN; +ALTER TABLE RHNACTIONDAEMONCONFIG MODIFY INTERVAL NOT NULL; + +-- +-- RHNACTIONDAEMONCONFIG +-- +ALTER TABLE RHNACTIONDAEMONCONFIG DROP CONSTRAINT RHN_ACTIONDC_MOD_NN; +ALTER TABLE RHNACTIONDAEMONCONFIG MODIFY MODIFIED NOT NULL; + +-- +-- RHNACTIONDAEMONCONFIG +-- +ALTER TABLE RHNACTIONDAEMONCONFIG DROP CONSTRAINT RHN_ACTIONDC_REST_NN; +ALTER TABLE RHNACTIONDAEMONCONFIG MODIFY RESTART NOT NULL; + +-- +-- RHNACTIONKICKSTARTFILELIST +-- +ALTER TABLE RHNACTIONKICKSTARTFILELIST DROP CONSTRAINT RHN_ACTIONKSFL_AKSI= D_NN; +ALTER TABLE RHNACTIONKICKSTARTFILELIST MODIFY ACTION_KS_ID NOT NULL; + +-- +-- RHNACTIONKICKSTARTFILELIST +-- +ALTER TABLE RHNACTIONKICKSTARTFILELIST DROP CONSTRAINT RHN_ACTIONKSFL_CREA= T_NN; +ALTER TABLE RHNACTIONKICKSTARTFILELIST MODIFY CREATED NOT NULL; + +-- +-- RHNACTIONKICKSTARTFILELIST +-- +ALTER TABLE RHNACTIONKICKSTARTFILELIST DROP CONSTRAINT RHN_ACTIONKSFL_FLID= _NN; +ALTER TABLE RHNACTIONKICKSTARTFILELIST MODIFY FILE_LIST_ID NOT NULL; + +-- +-- RHNACTIONKICKSTARTFILELIST +-- +ALTER TABLE RHNACTIONKICKSTARTFILELIST DROP CONSTRAINT RHN_ACTIONKSFL_MOD_= NN; +ALTER TABLE RHNACTIONKICKSTARTFILELIST MODIFY MODIFIED NOT NULL; + +-- +-- RHNACTIONKICKSTART +-- +ALTER TABLE RHNACTIONKICKSTART DROP CONSTRAINT RHN_ACTIONKS_AID_NN; +ALTER TABLE RHNACTIONKICKSTART MODIFY ACTION_ID NOT NULL; + +-- +-- RHNACTIONKICKSTART +-- +ALTER TABLE RHNACTIONKICKSTART DROP CONSTRAINT RHN_ACTIONKS_CREAT_NN; +ALTER TABLE RHNACTIONKICKSTART MODIFY CREATED NOT NULL; + +-- +-- RHNACTIONKICKSTART +-- +ALTER TABLE RHNACTIONKICKSTART DROP CONSTRAINT RHN_ACTIONKS_ID_NN; +ALTER TABLE RHNACTIONKICKSTART MODIFY ID NOT NULL; + +-- +-- RHNACTIONKICKSTART +-- +ALTER TABLE RHNACTIONKICKSTART DROP CONSTRAINT RHN_ACTIONKS_MOD_NN; +ALTER TABLE RHNACTIONKICKSTART MODIFY MODIFIED NOT NULL; + +-- +-- RHNACTIONKICKSTARTGUEST +-- +ALTER TABLE RHNACTIONKICKSTARTGUEST DROP CONSTRAINT RHN_ACTIONKS_XENGUEST_= AID_NN; +ALTER TABLE RHNACTIONKICKSTARTGUEST MODIFY ACTION_ID NOT NULL; + +-- +-- RHNACTIONKICKSTARTGUEST +-- +ALTER TABLE RHNACTIONKICKSTARTGUEST DROP CONSTRAINT RHN_ACTIONKS_XENGUEST_= CREAT_NN; +ALTER TABLE RHNACTIONKICKSTARTGUEST MODIFY CREATED NOT NULL; + +-- +-- RHNACTIONKICKSTARTGUEST +-- +ALTER TABLE RHNACTIONKICKSTARTGUEST DROP CONSTRAINT RHN_ACTIONKS_XENGUEST_= ID_NN; +ALTER TABLE RHNACTIONKICKSTARTGUEST MODIFY ID NOT NULL; + +-- +-- RHNACTIONKICKSTARTGUEST +-- +ALTER TABLE RHNACTIONKICKSTARTGUEST DROP CONSTRAINT RHN_ACTIONKS_XENGUEST_= MOD_NN; +ALTER TABLE RHNACTIONKICKSTARTGUEST MODIFY MODIFIED NOT NULL; + +-- +-- RHNACTION +-- +ALTER TABLE RHNACTION DROP CONSTRAINT RHN_ACTION_ARCHIVED_NN; +ALTER TABLE RHNACTION MODIFY ARCHIVED NOT NULL; + +-- +-- RHNACTION +-- +ALTER TABLE RHNACTION DROP CONSTRAINT RHN_ACTION_AT_NN; +ALTER TABLE RHNACTION MODIFY ACTION_TYPE NOT NULL; + +-- +-- RHNACTION +-- +ALTER TABLE RHNACTION DROP CONSTRAINT RHN_ACTION_CREATED_NN; +ALTER TABLE RHNACTION MODIFY CREATED NOT NULL; + +-- +-- RHNACTION +-- +ALTER TABLE RHNACTION DROP CONSTRAINT RHN_ACTION_EA_NN; +ALTER TABLE RHNACTION MODIFY EARLIEST_ACTION NOT NULL; + +-- +-- RHNACTION +-- +ALTER TABLE RHNACTION DROP CONSTRAINT RHN_ACTION_ID_NN; +ALTER TABLE RHNACTION MODIFY ID NOT NULL; + +-- +-- RHNACTION +-- +ALTER TABLE RHNACTION DROP CONSTRAINT RHN_ACTION_MODIFIED_NN; +ALTER TABLE RHNACTION MODIFY MODIFIED NOT NULL; + +-- +-- RHNACTION +-- +ALTER TABLE RHNACTION DROP CONSTRAINT RHN_ACTION_OID_NN; +ALTER TABLE RHNACTION MODIFY ORG_ID NOT NULL; + +-- +-- RHNACTIONSTATUS +-- +ALTER TABLE RHNACTIONSTATUS DROP CONSTRAINT RHN_ACTION_STATUS_CREATED_NN; +ALTER TABLE RHNACTIONSTATUS MODIFY CREATED NOT NULL; + +-- +-- RHNACTIONSTATUS +-- +ALTER TABLE RHNACTIONSTATUS DROP CONSTRAINT RHN_ACTION_STATUS_ID_NN; +ALTER TABLE RHNACTIONSTATUS MODIFY ID NOT NULL; + +-- +-- RHNACTIONSTATUS +-- +ALTER TABLE RHNACTIONSTATUS DROP CONSTRAINT RHN_ACTION_STATUS_MODIFIED_NN; +ALTER TABLE RHNACTIONSTATUS MODIFY MODIFIED NOT NULL; + +-- +-- RHNACTIONTYPE +-- +ALTER TABLE RHNACTIONTYPE DROP CONSTRAINT RHN_ACTION_TYPE_ID_NN; +ALTER TABLE RHNACTIONTYPE MODIFY ID NOT NULL; + +-- +-- RHNACTIONTYPE +-- +ALTER TABLE RHNACTIONTYPE DROP CONSTRAINT RHN_ACTION_TYPE_LABEL_NN; +ALTER TABLE RHNACTIONTYPE MODIFY LABEL NOT NULL; + +-- +-- RHNACTIONTYPE +-- +ALTER TABLE RHNACTIONTYPE DROP CONSTRAINT RHN_ACTION_TYPE_NAME_NN; +ALTER TABLE RHNACTIONTYPE MODIFY NAME NOT NULL; + +-- +-- RHNACTIONTYPE +-- +ALTER TABLE RHNACTIONTYPE DROP CONSTRAINT RHN_ACTION_TYPE_TRIGSNAP_NN; +ALTER TABLE RHNACTIONTYPE MODIFY TRIGGER_SNAPSHOT NOT NULL; + +-- +-- RHNACTIONTYPE +-- +ALTER TABLE RHNACTIONTYPE DROP CONSTRAINT RHN_ACTION_TYPE_UNLCK_NN; +ALTER TABLE RHNACTIONTYPE MODIFY UNLOCKED_ONLY NOT NULL; + +-- +-- RHNACTION +-- +ALTER TABLE RHNACTION DROP CONSTRAINT RHN_ACTION_VERSION_NN; +ALTER TABLE RHNACTION MODIFY VERSION NOT NULL; + +-- +-- RHNACTIONSCRIPT +-- +ALTER TABLE RHNACTIONSCRIPT DROP CONSTRAINT RHN_ACTSCRIPT_AID_NN; +ALTER TABLE RHNACTIONSCRIPT MODIFY ACTION_ID NOT NULL; + +-- +-- RHNACTIONSCRIPT +-- +ALTER TABLE RHNACTIONSCRIPT DROP CONSTRAINT RHN_ACTSCRIPT_CREAT_NN; +ALTER TABLE RHNACTIONSCRIPT MODIFY CREATED NOT NULL; + +-- +-- RHNACTIONSCRIPT +-- +ALTER TABLE RHNACTIONSCRIPT DROP CONSTRAINT RHN_ACTSCRIPT_GROUP_NN; +ALTER TABLE RHNACTIONSCRIPT MODIFY GROUPNAME NOT NULL; + +-- +-- RHNACTIONSCRIPT +-- +ALTER TABLE RHNACTIONSCRIPT DROP CONSTRAINT RHN_ACTSCRIPT_ID_NN; +ALTER TABLE RHNACTIONSCRIPT MODIFY ID NOT NULL; + +-- +-- RHNACTIONSCRIPT +-- +ALTER TABLE RHNACTIONSCRIPT DROP CONSTRAINT RHN_ACTSCRIPT_MOD_NN; +ALTER TABLE RHNACTIONSCRIPT MODIFY MODIFIED NOT NULL; + +-- +-- RHNACTIONSCRIPT +-- +ALTER TABLE RHNACTIONSCRIPT DROP CONSTRAINT RHN_ACTSCRIPT_USER_NN; +ALTER TABLE RHNACTIONSCRIPT MODIFY USERNAME NOT NULL; + +-- +-- RHNACTIONERRATAUPDATE +-- +ALTER TABLE RHNACTIONERRATAUPDATE DROP CONSTRAINT RHN_ACT_EU_ACT_NN; +ALTER TABLE RHNACTIONERRATAUPDATE MODIFY ACTION_ID NOT NULL; + +-- +-- RHNACTIONERRATAUPDATE +-- +ALTER TABLE RHNACTIONERRATAUPDATE DROP CONSTRAINT RHN_ACT_EU_ERR_NN; +ALTER TABLE RHNACTIONERRATAUPDATE MODIFY ERRATA_ID NOT NULL; + +-- +-- RHNACTIVATIONKEY +-- +ALTER TABLE RHNACTIVATIONKEY DROP CONSTRAINT RHN_ACT_KEY_CREATED_NN; +ALTER TABLE RHNACTIVATIONKEY MODIFY CREATED NOT NULL; + +-- +-- RHNACTIVATIONKEY +-- +ALTER TABLE RHNACTIVATIONKEY DROP CONSTRAINT RHN_ACT_KEY_MODIFIED_NN; +ALTER TABLE RHNACTIVATIONKEY MODIFY MODIFIED NOT NULL; + +-- +-- RHNACTIVATIONKEY +-- +ALTER TABLE RHNACTIVATIONKEY DROP CONSTRAINT RHN_ACT_KEY_REG_TID_NN; +ALTER TABLE RHNACTIVATIONKEY MODIFY REG_TOKEN_ID NOT NULL; + +-- +-- RHNACTIVATIONKEY +-- +ALTER TABLE RHNACTIVATIONKEY DROP CONSTRAINT RHN_ACT_KEY_TOKEN_NN; +ALTER TABLE RHNACTIVATIONKEY MODIFY TOKEN NOT NULL; + +-- +-- RHNACTIONPACKAGEDELTA +-- +ALTER TABLE RHNACTIONPACKAGEDELTA DROP CONSTRAINT RHN_ACT_PD_AID_NN; +ALTER TABLE RHNACTIONPACKAGEDELTA MODIFY ACTION_ID NOT NULL; + +-- +-- RHNACTIONPACKAGEDELTA +-- +ALTER TABLE RHNACTIONPACKAGEDELTA DROP CONSTRAINT RHN_ACT_PD_PDID_NN; +ALTER TABLE RHNACTIONPACKAGEDELTA MODIFY PACKAGE_DELTA_ID NOT NULL; + +-- +-- RHNACTIONPACKAGEORDER +-- +ALTER TABLE RHNACTIONPACKAGEORDER DROP CONSTRAINT RHN_ACT_PKG_APID_NN; +ALTER TABLE RHNACTIONPACKAGEORDER MODIFY ACTION_PACKAGE_ID NOT NULL; + +-- +-- RHNACTIONPACKAGEORDER +-- +ALTER TABLE RHNACTIONPACKAGEORDER DROP CONSTRAINT RHN_ACT_PKG_ORDER_NN; +ALTER TABLE RHNACTIONPACKAGEORDER MODIFY PACKAGE_ORDER NOT NULL; + +-- +-- RHNACTIONPACKAGE +-- +ALTER TABLE RHNACTIONPACKAGE DROP CONSTRAINT RHN_ACT_P_ACT_NN; +ALTER TABLE RHNACTIONPACKAGE MODIFY ACTION_ID NOT NULL; + +-- +-- RHNACTIONPACKAGEANSWERFILE +-- +ALTER TABLE RHNACTIONPACKAGEANSWERFILE DROP CONSTRAINT RHN_ACT_P_AF_APID_N= N; +ALTER TABLE RHNACTIONPACKAGEANSWERFILE MODIFY ACTION_PACKAGE_ID NOT NULL; + +-- +-- RHNACTIONPACKAGEANSWERFILE +-- +ALTER TABLE RHNACTIONPACKAGEANSWERFILE DROP CONSTRAINT RHN_ACT_P_AF_CREAT_= NN; +ALTER TABLE RHNACTIONPACKAGEANSWERFILE MODIFY CREATED NOT NULL; + +-- +-- RHNACTIONPACKAGEANSWERFILE +-- +ALTER TABLE RHNACTIONPACKAGEANSWERFILE DROP CONSTRAINT RHN_ACT_P_AF_MOD_NN; +ALTER TABLE RHNACTIONPACKAGEANSWERFILE MODIFY MODIFIED NOT NULL; + +-- +-- RHNACTIONPACKAGE +-- +ALTER TABLE RHNACTIONPACKAGE DROP CONSTRAINT RHN_ACT_P_ID_NN; +ALTER TABLE RHNACTIONPACKAGE MODIFY ID NOT NULL; + +-- +-- RHNACTIONPACKAGE +-- +ALTER TABLE RHNACTIONPACKAGE DROP CONSTRAINT RHN_ACT_P_NAME_NN; +ALTER TABLE RHNACTIONPACKAGE MODIFY NAME_ID NOT NULL; + +-- +-- RHNACTIONPACKAGE +-- +ALTER TABLE RHNACTIONPACKAGE DROP CONSTRAINT RHN_ACT_P_PARAM_NN; +ALTER TABLE RHNACTIONPACKAGE MODIFY PARAMETER NOT NULL; + +-- +-- RHNALLOWTRUST +-- +ALTER TABLE RHNALLOWTRUST DROP CONSTRAINT RHN_ALLOW_TRUST_CHANNELFLG_NN; +ALTER TABLE RHNALLOWTRUST MODIFY CHANNEL_FLAG NOT NULL; + +-- +-- RHNALLOWTRUST +-- +ALTER TABLE RHNALLOWTRUST DROP CONSTRAINT RHN_ALLOW_TRUST_CREATED_NN; +ALTER TABLE RHNALLOWTRUST MODIFY CREATED NOT NULL; + +-- +-- RHNALLOWTRUST +-- +ALTER TABLE RHNALLOWTRUST DROP CONSTRAINT RHN_ALLOW_TRUST_MIGRFLG_NN; +ALTER TABLE RHNALLOWTRUST MODIFY MIGRATION_FLAG NOT NULL; + +-- +-- RHNALLOWTRUST +-- +ALTER TABLE RHNALLOWTRUST DROP CONSTRAINT RHN_ALLOW_TRUST_MODIFIED_NN; +ALTER TABLE RHNALLOWTRUST MODIFY MODIFIED NOT NULL; + +-- +-- RHNALLOWTRUST +-- +ALTER TABLE RHNALLOWTRUST DROP CONSTRAINT RHN_ALLOW_TRUST_OID_NN; +ALTER TABLE RHNALLOWTRUST MODIFY ORG_ID NOT NULL; + +-- +-- RHN_CURRENT_ALERTS +-- +ALTER TABLE RHN_CURRENT_ALERTS DROP CONSTRAINT RHN_ALRTS_CUST_ID_NN; +ALTER TABLE RHN_CURRENT_ALERTS MODIFY CUSTOMER_ID NOT NULL; + +-- +-- RHN_CURRENT_ALERTS +-- +ALTER TABLE RHN_CURRENT_ALERTS DROP CONSTRAINT RHN_ALRTS_IN_PROG_NN; +ALTER TABLE RHN_CURRENT_ALERTS MODIFY IN_PROGRESS NOT NULL; + +-- +-- RHN_CURRENT_ALERTS +-- +ALTER TABLE RHN_CURRENT_ALERTS DROP CONSTRAINT RHN_ALRTS_RECID_NN; +ALTER TABLE RHN_CURRENT_ALERTS MODIFY RECID NOT NULL; + +-- +-- RHNAPPINSTALLINSTANCE +-- +ALTER TABLE RHNAPPINSTALLINSTANCE DROP CONSTRAINT RHN_APPINST_INSTANCE_CRE= AT_NN; +ALTER TABLE RHNAPPINSTALLINSTANCE MODIFY CREATED NOT NULL; + +-- +-- RHNAPPINSTALLINSTANCE +-- +ALTER TABLE RHNAPPINSTALLINSTANCE DROP CONSTRAINT RHN_APPINST_INSTANCE_ID_= NN; +ALTER TABLE RHNAPPINSTALLINSTANCE MODIFY ID NOT NULL; + +-- +-- RHNAPPINSTALLINSTANCE +-- +ALTER TABLE RHNAPPINSTALLINSTANCE DROP CONSTRAINT RHN_APPINST_INSTANCE_LAB= EL_NN; +ALTER TABLE RHNAPPINSTALLINSTANCE MODIFY LABEL NOT NULL; + +-- +-- RHNAPPINSTALLINSTANCE +-- +ALTER TABLE RHNAPPINSTALLINSTANCE DROP CONSTRAINT RHN_APPINST_INSTANCE_MOD= _NN; +ALTER TABLE RHNAPPINSTALLINSTANCE MODIFY MODIFIED NOT NULL; + +-- +-- RHNAPPINSTALLINSTANCE +-- +ALTER TABLE RHNAPPINSTALLINSTANCE DROP CONSTRAINT RHN_APPINST_INSTANCE_NAM= E_NN; +ALTER TABLE RHNAPPINSTALLINSTANCE MODIFY NAME NOT NULL; + +-- +-- RHNAPPINSTALLINSTANCE +-- +ALTER TABLE RHNAPPINSTALLINSTANCE DROP CONSTRAINT RHN_APPINST_INSTANCE_VER= S_NN; +ALTER TABLE RHNAPPINSTALLINSTANCE MODIFY VERSION NOT NULL; + +-- +-- RHNAPPINSTALLSESSIONDATA +-- +ALTER TABLE RHNAPPINSTALLSESSIONDATA DROP CONSTRAINT RHN_APPINST_SDATA_CRE= AT_NN; +ALTER TABLE RHNAPPINSTALLSESSIONDATA MODIFY CREATED NOT NULL; + +-- +-- RHNAPPINSTALLSESSIONDATA +-- +ALTER TABLE RHNAPPINSTALLSESSIONDATA DROP CONSTRAINT RHN_APPINST_SDATA_ID_= NN; +ALTER TABLE RHNAPPINSTALLSESSIONDATA MODIFY ID NOT NULL; + +-- +-- RHNAPPINSTALLSESSIONDATA +-- +ALTER TABLE RHNAPPINSTALLSESSIONDATA DROP CONSTRAINT RHN_APPINST_SDATA_K_N= N; +ALTER TABLE RHNAPPINSTALLSESSIONDATA MODIFY KEY NOT NULL; + +-- +-- RHNAPPINSTALLSESSIONDATA +-- +ALTER TABLE RHNAPPINSTALLSESSIONDATA DROP CONSTRAINT RHN_APPINST_SDATA_MOD= _NN; +ALTER TABLE RHNAPPINSTALLSESSIONDATA MODIFY MODIFIED NOT NULL; + +-- +-- RHNAPPINSTALLSESSIONDATA +-- +ALTER TABLE RHNAPPINSTALLSESSIONDATA DROP CONSTRAINT RHN_APPINST_SDATA_SID= _NN; +ALTER TABLE RHNAPPINSTALLSESSIONDATA MODIFY SESSION_ID NOT NULL; + +-- +-- RHNAPPINSTALLSESSION +-- +ALTER TABLE RHNAPPINSTALLSESSION DROP CONSTRAINT RHN_APPINST_SESSION_CREAT= _NN; +ALTER TABLE RHNAPPINSTALLSESSION MODIFY CREATED NOT NULL; + +-- +-- RHNAPPINSTALLSESSION +-- +ALTER TABLE RHNAPPINSTALLSESSION DROP CONSTRAINT RHN_APPINST_SESSION_ID_NN; +ALTER TABLE RHNAPPINSTALLSESSION MODIFY ID NOT NULL; + +-- +-- RHNAPPINSTALLSESSION +-- +ALTER TABLE RHNAPPINSTALLSESSION DROP CONSTRAINT RHN_APPINST_SESSION_IID_N= N; +ALTER TABLE RHNAPPINSTALLSESSION MODIFY INSTANCE_ID NOT NULL; + +-- +-- RHNAPPINSTALLSESSION +-- +ALTER TABLE RHNAPPINSTALLSESSION DROP CONSTRAINT RHN_APPINST_SESSION_MOD_N= N; +ALTER TABLE RHNAPPINSTALLSESSION MODIFY MODIFIED NOT NULL; + +-- +-- RHNAPPINSTALLSESSION +-- +ALTER TABLE RHNAPPINSTALLSESSION DROP CONSTRAINT RHN_APPINST_SESSION_SID_N= N; +ALTER TABLE RHNAPPINSTALLSESSION MODIFY SERVER_ID NOT NULL; + +-- +-- RHNAPPINSTALLSESSION +-- +ALTER TABLE RHNAPPINSTALLSESSION DROP CONSTRAINT RHN_APPINST_SESSION_UID_N= N; +ALTER TABLE RHNAPPINSTALLSESSION MODIFY USER_ID NOT NULL; + +-- +-- RHNACTIONPACKAGEREMOVALFAILURE +-- +ALTER TABLE RHNACTIONPACKAGEREMOVALFAILURE DROP CONSTRAINT RHN_APR_FAILURE= _AID_NN; +ALTER TABLE RHNACTIONPACKAGEREMOVALFAILURE MODIFY ACTION_ID NOT NULL; + +-- +-- RHNACTIONPACKAGEREMOVALFAILURE +-- +ALTER TABLE RHNACTIONPACKAGEREMOVALFAILURE DROP CONSTRAINT RHN_APR_FAILURE= _CAPID_NN; +ALTER TABLE RHNACTIONPACKAGEREMOVALFAILURE MODIFY CAPABILITY_ID NOT NULL; + +-- +-- RHNACTIONPACKAGEREMOVALFAILURE +-- +ALTER TABLE RHNACTIONPACKAGEREMOVALFAILURE DROP CONSTRAINT RHN_APR_FAILURE= _EID_NN; +ALTER TABLE RHNACTIONPACKAGEREMOVALFAILURE MODIFY EVR_ID NOT NULL; + +-- +-- RHNACTIONPACKAGEREMOVALFAILURE +-- +ALTER TABLE RHNACTIONPACKAGEREMOVALFAILURE DROP CONSTRAINT RHN_APR_FAILURE= _FLAGS_NN; +ALTER TABLE RHNACTIONPACKAGEREMOVALFAILURE MODIFY FLAGS NOT NULL; + +-- +-- RHNACTIONPACKAGEREMOVALFAILURE +-- +ALTER TABLE RHNACTIONPACKAGEREMOVALFAILURE DROP CONSTRAINT RHN_APR_FAILURE= _NID_NN; +ALTER TABLE RHNACTIONPACKAGEREMOVALFAILURE MODIFY NAME_ID NOT NULL; + +-- +-- RHNACTIONPACKAGEREMOVALFAILURE +-- +ALTER TABLE RHNACTIONPACKAGEREMOVALFAILURE DROP CONSTRAINT RHN_APR_FAILURE= _SENSE_NN; +ALTER TABLE RHNACTIONPACKAGEREMOVALFAILURE MODIFY SENSE NOT NULL; + +-- +-- RHNACTIONPACKAGEREMOVALFAILURE +-- +ALTER TABLE RHNACTIONPACKAGEREMOVALFAILURE DROP CONSTRAINT RHN_APR_FAILURE= _SID_NN; +ALTER TABLE RHNACTIONPACKAGEREMOVALFAILURE MODIFY SERVER_ID NOT NULL; + +-- +-- RHNARCHTYPEACTIONS +-- +ALTER TABLE RHNARCHTYPEACTIONS DROP CONSTRAINT RHN_ARCHTYPEACTS_ACTID_NN; +ALTER TABLE RHNARCHTYPEACTIONS MODIFY ACTION_TYPE_ID NOT NULL; + +-- +-- RHNARCHTYPEACTIONS +-- +ALTER TABLE RHNARCHTYPEACTIONS DROP CONSTRAINT RHN_ARCHTYPEACTS_AS_NN; +ALTER TABLE RHNARCHTYPEACTIONS MODIFY ACTION_STYLE NOT NULL; + +-- +-- RHNARCHTYPEACTIONS +-- +ALTER TABLE RHNARCHTYPEACTIONS DROP CONSTRAINT RHN_ARCHTYPEACTS_ATID_NN; +ALTER TABLE RHNARCHTYPEACTIONS MODIFY ARCH_TYPE_ID NOT NULL; + +-- +-- RHNARCHTYPEACTIONS +-- +ALTER TABLE RHNARCHTYPEACTIONS DROP CONSTRAINT RHN_ARCHTYPEACTS_CREAT_NN; +ALTER TABLE RHNARCHTYPEACTIONS MODIFY CREATED NOT NULL; + +-- +-- RHNARCHTYPEACTIONS +-- +ALTER TABLE RHNARCHTYPEACTIONS DROP CONSTRAINT RHN_ARCHTYPEACTS_MOD_NN; +ALTER TABLE RHNARCHTYPEACTIONS MODIFY MODIFIED NOT NULL; + +-- +-- RHNARCHTYPE +-- +ALTER TABLE RHNARCHTYPE DROP CONSTRAINT RHN_ARCHTYPE_CREAT_NN; +ALTER TABLE RHNARCHTYPE MODIFY CREATED NOT NULL; + +-- +-- RHNARCHTYPE +-- +ALTER TABLE RHNARCHTYPE DROP CONSTRAINT RHN_ARCHTYPE_ID_NN; +ALTER TABLE RHNARCHTYPE MODIFY ID NOT NULL; + +-- +-- RHNARCHTYPE +-- +ALTER TABLE RHNARCHTYPE DROP CONSTRAINT RHN_ARCHTYPE_LABEL_NN; +ALTER TABLE RHNARCHTYPE MODIFY LABEL NOT NULL; + +-- +-- RHNARCHTYPE +-- +ALTER TABLE RHNARCHTYPE DROP CONSTRAINT RHN_ARCHTYPE_MOD_NN; +ALTER TABLE RHNARCHTYPE MODIFY MODIFIED NOT NULL; + +-- +-- RHNARCHTYPE +-- +ALTER TABLE RHNARCHTYPE DROP CONSTRAINT RHN_ARCHTYPE_NAME_NN; +ALTER TABLE RHNARCHTYPE MODIFY NAME NOT NULL; + +-- +-- RHNACTIONTRANSACTIONS +-- +ALTER TABLE RHNACTIONTRANSACTIONS DROP CONSTRAINT RHN_AT_AID_NN; +ALTER TABLE RHNACTIONTRANSACTIONS MODIFY ACTION_ID NOT NULL; + +-- +-- RHNACTIONTRANSACTIONS +-- +ALTER TABLE RHNACTIONTRANSACTIONS DROP CONSTRAINT RHN_AT_FTID_NN; +ALTER TABLE RHNACTIONTRANSACTIONS MODIFY FROM_TRANS_ID NOT NULL; + +-- +-- RHNACTIONTRANSACTIONS +-- +ALTER TABLE RHNACTIONTRANSACTIONS DROP CONSTRAINT RHN_AT_TTID_NN; +ALTER TABLE RHNACTIONTRANSACTIONS MODIFY TO_TRANS_ID NOT NULL; + +-- +-- RHNACTIONVIRTVCPU +-- +ALTER TABLE RHNACTIONVIRTVCPU DROP CONSTRAINT RHN_AVCPU_AID_NN; +ALTER TABLE RHNACTIONVIRTVCPU MODIFY ACTION_ID NOT NULL; + +-- +-- RHNACTIONVIRTVCPU +-- +ALTER TABLE RHNACTIONVIRTVCPU DROP CONSTRAINT RHN_AVCPU_CREAT_NN; +ALTER TABLE RHNACTIONVIRTVCPU MODIFY CREATED NOT NULL; + +-- +-- RHNACTIONVIRTVCPU +-- +ALTER TABLE RHNACTIONVIRTVCPU DROP CONSTRAINT RHN_AVCPU_MOD_NN; +ALTER TABLE RHNACTIONVIRTVCPU MODIFY MODIFIED NOT NULL; + +-- +-- RHNACTIONVIRTVCPU +-- +ALTER TABLE RHNACTIONVIRTVCPU DROP CONSTRAINT RHN_AVCPU_UUID_NN; +ALTER TABLE RHNACTIONVIRTVCPU MODIFY UUID NOT NULL; + +-- +-- RHNACTIONVIRTVCPU +-- +ALTER TABLE RHNACTIONVIRTVCPU DROP CONSTRAINT RHN_AVCPU_VCPUS_NN; +ALTER TABLE RHNACTIONVIRTVCPU MODIFY VCPU NOT NULL; + +-- +-- RHNACTIONVIRTDESTROY +-- +ALTER TABLE RHNACTIONVIRTDESTROY DROP CONSTRAINT RHN_AVD_AID_NN; +ALTER TABLE RHNACTIONVIRTDESTROY MODIFY ACTION_ID NOT NULL; + +-- +-- RHNACTIONVIRTDESTROY +-- +ALTER TABLE RHNACTIONVIRTDESTROY DROP CONSTRAINT RHN_AVD_CREAT_NN; +ALTER TABLE RHNACTIONVIRTDESTROY MODIFY CREATED NOT NULL; + +-- +-- RHNACTIONVIRTDESTROY +-- +ALTER TABLE RHNACTIONVIRTDESTROY DROP CONSTRAINT RHN_AVD_MOD_NN; +ALTER TABLE RHNACTIONVIRTDESTROY MODIFY MODIFIED NOT NULL; + +-- +-- RHNACTIONVIRTDESTROY +-- +ALTER TABLE RHNACTIONVIRTDESTROY DROP CONSTRAINT RHN_AVD_UUID_NN; +ALTER TABLE RHNACTIONVIRTDESTROY MODIFY UUID NOT NULL; + +-- +-- RHNACTIONVIRTREBOOT +-- +ALTER TABLE RHNACTIONVIRTREBOOT DROP CONSTRAINT RHN_AVREBOOT_AID_NN; +ALTER TABLE RHNACTIONVIRTREBOOT MODIFY ACTION_ID NOT NULL; + +-- +-- RHNACTIONVIRTREBOOT +-- +ALTER TABLE RHNACTIONVIRTREBOOT DROP CONSTRAINT RHN_AVREBOOT_CREAT_NN; +ALTER TABLE RHNACTIONVIRTREBOOT MODIFY CREATED NOT NULL; + +-- +-- RHNACTIONVIRTREBOOT +-- +ALTER TABLE RHNACTIONVIRTREBOOT DROP CONSTRAINT RHN_AVREBOOT_MOD_NN; +ALTER TABLE RHNACTIONVIRTREBOOT MODIFY MODIFIED NOT NULL; + +-- +-- RHNACTIONVIRTREBOOT +-- +ALTER TABLE RHNACTIONVIRTREBOOT DROP CONSTRAINT RHN_AVREBOOT_UUID_NN; +ALTER TABLE RHNACTIONVIRTREBOOT MODIFY UUID NOT NULL; + +-- +-- RHNACTIONVIRTREFRESH +-- +ALTER TABLE RHNACTIONVIRTREFRESH DROP CONSTRAINT RHN_AVREFRESH_AID_NN; +ALTER TABLE RHNACTIONVIRTREFRESH MODIFY ACTION_ID NOT NULL; + +-- +-- RHNACTIONVIRTREFRESH +-- +ALTER TABLE RHNACTIONVIRTREFRESH DROP CONSTRAINT RHN_AVREFRESH_CREAT_NN; +ALTER TABLE RHNACTIONVIRTREFRESH MODIFY CREATED NOT NULL; + +-- +-- RHNACTIONVIRTREFRESH +-- +ALTER TABLE RHNACTIONVIRTREFRESH DROP CONSTRAINT RHN_AVREFRESH_MOD_NN; +ALTER TABLE RHNACTIONVIRTREFRESH MODIFY MODIFIED NOT NULL; + +-- +-- RHNACTIONVIRTRESUME +-- +ALTER TABLE RHNACTIONVIRTRESUME DROP CONSTRAINT RHN_AVRESUME_AID_NN; +ALTER TABLE RHNACTIONVIRTRESUME MODIFY ACTION_ID NOT NULL; + +-- +-- RHNACTIONVIRTRESUME +-- +ALTER TABLE RHNACTIONVIRTRESUME DROP CONSTRAINT RHN_AVRESUME_CREAT_NN; +ALTER TABLE RHNACTIONVIRTRESUME MODIFY CREATED NOT NULL; + +-- +-- RHNACTIONVIRTRESUME +-- +ALTER TABLE RHNACTIONVIRTRESUME DROP CONSTRAINT RHN_AVRESUME_MOD_NN; +ALTER TABLE RHNACTIONVIRTRESUME MODIFY MODIFIED NOT NULL; + +-- +-- RHNACTIONVIRTRESUME +-- +ALTER TABLE RHNACTIONVIRTRESUME DROP CONSTRAINT RHN_AVRESUME_UUID_NN; +ALTER TABLE RHNACTIONVIRTRESUME MODIFY UUID NOT NULL; + +-- +-- RHNACTIONVIRTSHUTDOWN +-- +ALTER TABLE RHNACTIONVIRTSHUTDOWN DROP CONSTRAINT RHN_AVSHUTDOWN_AID_NN; +ALTER TABLE RHNACTIONVIRTSHUTDOWN MODIFY ACTION_ID NOT NULL; + +-- +-- RHNACTIONVIRTSHUTDOWN +-- +ALTER TABLE RHNACTIONVIRTSHUTDOWN DROP CONSTRAINT RHN_AVSHUTDOWN_CREAT_NN; +ALTER TABLE RHNACTIONVIRTSHUTDOWN MODIFY CREATED NOT NULL; + +-- +-- RHNACTIONVIRTSHUTDOWN +-- +ALTER TABLE RHNACTIONVIRTSHUTDOWN DROP CONSTRAINT RHN_AVSHUTDOWN_MOD_NN; +ALTER TABLE RHNACTIONVIRTSHUTDOWN MODIFY MODIFIED NOT NULL; + +-- +-- RHNACTIONVIRTSHUTDOWN +-- +ALTER TABLE RHNACTIONVIRTSHUTDOWN DROP CONSTRAINT RHN_AVSHUTDOWN_UUID_NN; +ALTER TABLE RHNACTIONVIRTSHUTDOWN MODIFY UUID NOT NULL; + +-- +-- RHNACTIONVIRTSETMEMORY +-- +ALTER TABLE RHNACTIONVIRTSETMEMORY DROP CONSTRAINT RHN_AVSM_AID_NN; +ALTER TABLE RHNACTIONVIRTSETMEMORY MODIFY ACTION_ID NOT NULL; + +-- +-- RHNACTIONVIRTSETMEMORY +-- +ALTER TABLE RHNACTIONVIRTSETMEMORY DROP CONSTRAINT RHN_AVSM_CREAT_NN; +ALTER TABLE RHNACTIONVIRTSETMEMORY MODIFY CREATED NOT NULL; + +-- +-- RHNACTIONVIRTSETMEMORY +-- +ALTER TABLE RHNACTIONVIRTSETMEMORY DROP CONSTRAINT RHN_AVSM_MEM_NN; +ALTER TABLE RHNACTIONVIRTSETMEMORY MODIFY MEMORY NOT NULL; + +-- +-- RHNACTIONVIRTSETMEMORY +-- +ALTER TABLE RHNACTIONVIRTSETMEMORY DROP CONSTRAINT RHN_AVSM_MOD_NN; +ALTER TABLE RHNACTIONVIRTSETMEMORY MODIFY MODIFIED NOT NULL; + +-- +-- RHNACTIONVIRTSETMEMORY +-- +ALTER TABLE RHNACTIONVIRTSETMEMORY DROP CONSTRAINT RHN_AVSM_UUID_NN; +ALTER TABLE RHNACTIONVIRTSETMEMORY MODIFY UUID NOT NULL; + +-- +-- RHNACTIONVIRTSCHEDULEPOLLER +-- +ALTER TABLE RHNACTIONVIRTSCHEDULEPOLLER DROP CONSTRAINT RHN_AVSP_AID_NN; +ALTER TABLE RHNACTIONVIRTSCHEDULEPOLLER MODIFY ACTION_ID NOT NULL; + +-- +-- RHNACTIONVIRTSCHEDULEPOLLER +-- +ALTER TABLE RHNACTIONVIRTSCHEDULEPOLLER DROP CONSTRAINT RHN_AVSP_CREAT_NN; +ALTER TABLE RHNACTIONVIRTSCHEDULEPOLLER MODIFY CREATED NOT NULL; + +-- +-- RHNACTIONVIRTSCHEDULEPOLLER +-- +ALTER TABLE RHNACTIONVIRTSCHEDULEPOLLER DROP CONSTRAINT RHN_AVSP_MOD_NN; +ALTER TABLE RHNACTIONVIRTSCHEDULEPOLLER MODIFY MODIFIED NOT NULL; + +-- +-- RHNACTIONVIRTSTART +-- +ALTER TABLE RHNACTIONVIRTSTART DROP CONSTRAINT RHN_AVSTART_AID_NN; +ALTER TABLE RHNACTIONVIRTSTART MODIFY ACTION_ID NOT NULL; + +-- +-- RHNACTIONVIRTSTART +-- +ALTER TABLE RHNACTIONVIRTSTART DROP CONSTRAINT RHN_AVSTART_CREAT_NN; +ALTER TABLE RHNACTIONVIRTSTART MODIFY CREATED NOT NULL; + +-- +-- RHNACTIONVIRTSTART +-- +ALTER TABLE RHNACTIONVIRTSTART DROP CONSTRAINT RHN_AVSTART_MOD_NN; +ALTER TABLE RHNACTIONVIRTSTART MODIFY MODIFIED NOT NULL; + +-- +-- RHNACTIONVIRTSTART +-- +ALTER TABLE RHNACTIONVIRTSTART DROP CONSTRAINT RHN_AVSTART_UUID_NN; +ALTER TABLE RHNACTIONVIRTSTART MODIFY UUID NOT NULL; + +-- +-- RHNACTIONVIRTSUSPEND +-- +ALTER TABLE RHNACTIONVIRTSUSPEND DROP CONSTRAINT RHN_AVSUSPEND_AID_NN; +ALTER TABLE RHNACTIONVIRTSUSPEND MODIFY ACTION_ID NOT NULL; + +-- +-- RHNACTIONVIRTSUSPEND +-- +ALTER TABLE RHNACTIONVIRTSUSPEND DROP CONSTRAINT RHN_AVSUSPEND_CREAT_NN; +ALTER TABLE RHNACTIONVIRTSUSPEND MODIFY CREATED NOT NULL; + +-- +-- RHNACTIONVIRTSUSPEND +-- +ALTER TABLE RHNACTIONVIRTSUSPEND DROP CONSTRAINT RHN_AVSUSPEND_MOD_NN; +ALTER TABLE RHNACTIONVIRTSUSPEND MODIFY MODIFIED NOT NULL; + +-- +-- RHNACTIONVIRTSUSPEND +-- +ALTER TABLE RHNACTIONVIRTSUSPEND DROP CONSTRAINT RHN_AVSUSPEND_UUID_NN; +ALTER TABLE RHNACTIONVIRTSUSPEND MODIFY UUID NOT NULL; + +-- +-- RHNBEEHIVEPATHMAP +-- +ALTER TABLE RHNBEEHIVEPATHMAP DROP CONSTRAINT RHN_BEEHIVE_PATH_MAP_BP_NN; +ALTER TABLE RHNBEEHIVEPATHMAP MODIFY BEEHIVE_PATH NOT NULL; + +-- +-- RHNBEEHIVEPATHMAP +-- +ALTER TABLE RHNBEEHIVEPATHMAP DROP CONSTRAINT RHN_BEEHIVE_PATH_MAP_FP_NN; +ALTER TABLE RHNBEEHIVEPATHMAP MODIFY FTP_PATH NOT NULL; + +-- +-- RHNBEEHIVEPATHMAP +-- +ALTER TABLE RHNBEEHIVEPATHMAP DROP CONSTRAINT RHN_BEEHIVE_PATH_MAP_P_NN; +ALTER TABLE RHNBEEHIVEPATHMAP MODIFY PATH NOT NULL; + +-- +-- RHNBLACKLISTOBSOLETES +-- +ALTER TABLE RHNBLACKLISTOBSOLETES DROP CONSTRAINT RHN_BL_OBS_CREATED_NN; +ALTER TABLE RHNBLACKLISTOBSOLETES MODIFY CREATED NOT NULL; + +-- +-- RHNBLACKLISTOBSOLETES +-- +ALTER TABLE RHNBLACKLISTOBSOLETES DROP CONSTRAINT RHN_BL_OBS_EID_NN; +ALTER TABLE RHNBLACKLISTOBSOLETES MODIFY EVR_ID NOT NULL; + +-- +-- RHNBLACKLISTOBSOLETES +-- +ALTER TABLE RHNBLACKLISTOBSOLETES DROP CONSTRAINT RHN_BL_OBS_INID_NN; +ALTER TABLE RHNBLACKLISTOBSOLETES MODIFY IGNORE_NAME_ID NOT NULL; + +-- +-- RHNBLACKLISTOBSOLETES +-- +ALTER TABLE RHNBLACKLISTOBSOLETES DROP CONSTRAINT RHN_BL_OBS_MODIFIED_NN; +ALTER TABLE RHNBLACKLISTOBSOLETES MODIFY MODIFIED NOT NULL; + +-- +-- RHNBLACKLISTOBSOLETES +-- +ALTER TABLE RHNBLACKLISTOBSOLETES DROP CONSTRAINT RHN_BL_OBS_NID_NN; +ALTER TABLE RHNBLACKLISTOBSOLETES MODIFY NAME_ID NOT NULL; + +-- +-- RHNBLACKLISTOBSOLETES +-- +ALTER TABLE RHNBLACKLISTOBSOLETES DROP CONSTRAINT RHN_BL_OBS_PAID_NN; +ALTER TABLE RHNBLACKLISTOBSOLETES MODIFY PACKAGE_ARCH_ID NOT NULL; + +-- +-- RHNCHANNELARCH +-- +ALTER TABLE RHNCHANNELARCH DROP CONSTRAINT RHN_CARCH_ATID_NN; +ALTER TABLE RHNCHANNELARCH MODIFY ARCH_TYPE_ID NOT NULL; + +-- +-- RHNCHANNELARCH +-- +ALTER TABLE RHNCHANNELARCH DROP CONSTRAINT RHN_CARCH_CREATED_NN; +ALTER TABLE RHNCHANNELARCH MODIFY CREATED NOT NULL; + +-- +-- RHNCHANNELARCH +-- +ALTER TABLE RHNCHANNELARCH DROP CONSTRAINT RHN_CARCH_ID_NN; +ALTER TABLE RHNCHANNELARCH MODIFY ID NOT NULL; + +-- +-- RHNCHANNELARCH +-- +ALTER TABLE RHNCHANNELARCH DROP CONSTRAINT RHN_CARCH_LABEL_NN; +ALTER TABLE RHNCHANNELARCH MODIFY LABEL NOT NULL; + +-- +-- RHNCHANNELARCH +-- +ALTER TABLE RHNCHANNELARCH DROP CONSTRAINT RHN_CARCH_MODIFIED_NN; +ALTER TABLE RHNCHANNELARCH MODIFY MODIFIED NOT NULL; + +-- +-- RHNCHANNELARCH +-- +ALTER TABLE RHNCHANNELARCH DROP CONSTRAINT RHN_CARCH_NAME_NN; +ALTER TABLE RHNCHANNELARCH MODIFY NAME NOT NULL; + +-- +-- RHNCUSTOMDATAKEY +-- +ALTER TABLE RHNCUSTOMDATAKEY DROP CONSTRAINT RHN_CDATAKEY_CREATED_NN; +ALTER TABLE RHNCUSTOMDATAKEY MODIFY CREATED NOT NULL; + +-- +-- RHNCUSTOMDATAKEY +-- +ALTER TABLE RHNCUSTOMDATAKEY DROP CONSTRAINT RHN_CDATAKEY_DESC_NN; +ALTER TABLE RHNCUSTOMDATAKEY MODIFY DESCRIPTION NOT NULL; + +-- +-- RHNCUSTOMDATAKEY +-- +ALTER TABLE RHNCUSTOMDATAKEY DROP CONSTRAINT RHN_CDATAKEY_ID_NN; +ALTER TABLE RHNCUSTOMDATAKEY MODIFY ID NOT NULL; + +-- +-- RHNCUSTOMDATAKEY +-- +ALTER TABLE RHNCUSTOMDATAKEY DROP CONSTRAINT RHN_CDATAKEY_LABEL_NN; +ALTER TABLE RHNCUSTOMDATAKEY MODIFY LABEL NOT NULL; + +-- +-- RHNCUSTOMDATAKEY +-- +ALTER TABLE RHNCUSTOMDATAKEY DROP CONSTRAINT RHN_CDATAKEY_MODIFIED_NN; +ALTER TABLE RHNCUSTOMDATAKEY MODIFY MODIFIED NOT NULL; + +-- +-- RHNCUSTOMDATAKEY +-- +ALTER TABLE RHNCUSTOMDATAKEY DROP CONSTRAINT RHN_CDATAKEY_OID_NN; +ALTER TABLE RHNCUSTOMDATAKEY MODIFY ORG_ID NOT NULL; + +-- +-- RHNCHANNELDOWNLOADS +-- +ALTER TABLE RHNCHANNELDOWNLOADS DROP CONSTRAINT RHN_CD_CID_NN; +ALTER TABLE RHNCHANNELDOWNLOADS MODIFY CHANNEL_ID NOT NULL; + +-- +-- RHNCHANNELDOWNLOADS +-- +ALTER TABLE RHNCHANNELDOWNLOADS DROP CONSTRAINT RHN_CD_CREATED_NN; +ALTER TABLE RHNCHANNELDOWNLOADS MODIFY CREATED NOT NULL; + +-- +-- RHNCHANNELDOWNLOADS +-- +ALTER TABLE RHNCHANNELDOWNLOADS DROP CONSTRAINT RHN_CD_DID_NN; +ALTER TABLE RHNCHANNELDOWNLOADS MODIFY DOWNLOADS_ID NOT NULL; + +-- +-- RHNCHANNELDOWNLOADS +-- +ALTER TABLE RHNCHANNELDOWNLOADS DROP CONSTRAINT RHN_CD_MODIFIED_NN; +ALTER TABLE RHNCHANNELDOWNLOADS MODIFY MODIFIED NOT NULL; + +-- +-- RHNCHANNELERRATA +-- +ALTER TABLE RHNCHANNELERRATA DROP CONSTRAINT RHN_CE_CID_NN; +ALTER TABLE RHNCHANNELERRATA MODIFY CHANNEL_ID NOT NULL; + +-- +-- RHNCHANNELERRATA +-- +ALTER TABLE RHNCHANNELERRATA DROP CONSTRAINT RHN_CE_CREATED_NN; +ALTER TABLE RHNCHANNELERRATA MODIFY CREATED NOT NULL; + +-- +-- RHNCHANNELERRATA +-- +ALTER TABLE RHNCHANNELERRATA DROP CONSTRAINT RHN_CE_EID_NN; +ALTER TABLE RHNCHANNELERRATA MODIFY ERRATA_ID NOT NULL; + +-- +-- RHNCHANNELERRATA +-- +ALTER TABLE RHNCHANNELERRATA DROP CONSTRAINT RHN_CE_MODIFIED_NN; +ALTER TABLE RHNCHANNELERRATA MODIFY MODIFIED NOT NULL; + +-- +-- RHNCHANNELFAMILYLICENSE +-- +ALTER TABLE RHNCHANNELFAMILYLICENSE DROP CONSTRAINT RHN_CFL_CFID_NN; +ALTER TABLE RHNCHANNELFAMILYLICENSE MODIFY CHANNEL_FAMILY_ID NOT NULL; + +-- +-- RHNCHANNELFAMILYLICENSECONSENT +-- +ALTER TABLE RHNCHANNELFAMILYLICENSECONSENT DROP CONSTRAINT RHN_CFL_CONSENT= _CFID_NN; +ALTER TABLE RHNCHANNELFAMILYLICENSECONSENT MODIFY CHANNEL_FAMILY_ID NOT NU= LL; + +-- +-- RHNCHANNELFAMILYLICENSECONSENT +-- +ALTER TABLE RHNCHANNELFAMILYLICENSECONSENT DROP CONSTRAINT RHN_CFL_CONSENT= _CREATED_NN; +ALTER TABLE RHNCHANNELFAMILYLICENSECONSENT MODIFY CREATED NOT NULL; + +-- +-- RHNCHANNELFAMILYLICENSECONSENT +-- +ALTER TABLE RHNCHANNELFAMILYLICENSECONSENT DROP CONSTRAINT RHN_CFL_CONSENT= _MODIFIED_NN; +ALTER TABLE RHNCHANNELFAMILYLICENSECONSENT MODIFY MODIFIED NOT NULL; + +-- +-- RHNCHANNELFAMILYLICENSECONSENT +-- +ALTER TABLE RHNCHANNELFAMILYLICENSECONSENT DROP CONSTRAINT RHN_CFL_CONSENT= _SID_NN; +ALTER TABLE RHNCHANNELFAMILYLICENSECONSENT MODIFY SERVER_ID NOT NULL; + +-- +-- RHNCHANNELFAMILYLICENSECONSENT +-- +ALTER TABLE RHNCHANNELFAMILYLICENSECONSENT DROP CONSTRAINT RHN_CFL_CONSENT= _UID_NN; +ALTER TABLE RHNCHANNELFAMILYLICENSECONSENT MODIFY USER_ID NOT NULL; + +-- +-- RHNCHANNELFAMILYLICENSE +-- +ALTER TABLE RHNCHANNELFAMILYLICENSE DROP CONSTRAINT RHN_CFL_CREATED_NN; +ALTER TABLE RHNCHANNELFAMILYLICENSE MODIFY CREATED NOT NULL; + +-- +-- RHNCHANNELFAMILYLICENSE +-- +ALTER TABLE RHNCHANNELFAMILYLICENSE DROP CONSTRAINT RHN_CFL_LICENSE_NN; +ALTER TABLE RHNCHANNELFAMILYLICENSE MODIFY LICENSE_PATH NOT NULL; + +-- +-- RHNCHANNELFAMILYLICENSE +-- +ALTER TABLE RHNCHANNELFAMILYLICENSE DROP CONSTRAINT RHN_CFL_MODIFIED_NN; +ALTER TABLE RHNCHANNELFAMILYLICENSE MODIFY MODIFIED NOT NULL; + +-- +-- RHNCONFIGFILENAME +-- +ALTER TABLE RHNCONFIGFILENAME DROP CONSTRAINT RHN_CFNAME_CREATED_NN; +ALTER TABLE RHNCONFIGFILENAME MODIFY CREATED NOT NULL; + +-- +-- RHNCONFIGFILENAME +-- +ALTER TABLE RHNCONFIGFILENAME DROP CONSTRAINT RHN_CFNAME_ID_NN; +ALTER TABLE RHNCONFIGFILENAME MODIFY ID NOT NULL; + +-- +-- RHNCONFIGFILENAME +-- +ALTER TABLE RHNCONFIGFILENAME DROP CONSTRAINT RHN_CFNAME_MODIFIED_NN; +ALTER TABLE RHNCONFIGFILENAME MODIFY MODIFIED NOT NULL; + +-- +-- RHNCONFIGFILENAME +-- +ALTER TABLE RHNCONFIGFILENAME DROP CONSTRAINT RHN_CFNAME_PATH_NN; +ALTER TABLE RHNCONFIGFILENAME MODIFY PATH NOT NULL; + +-- +-- RHNCONFIGFILESTATE +-- +ALTER TABLE RHNCONFIGFILESTATE DROP CONSTRAINT RHN_CFSTATE_CREAT_NN; +ALTER TABLE RHNCONFIGFILESTATE MODIFY CREATED NOT NULL; + +-- +-- RHNCONFIGFILESTATE +-- +ALTER TABLE RHNCONFIGFILESTATE DROP CONSTRAINT RHN_CFSTATE_ID_NN; +ALTER TABLE RHNCONFIGFILESTATE MODIFY ID NOT NULL; + +-- +-- RHNCONFIGFILESTATE +-- +ALTER TABLE RHNCONFIGFILESTATE DROP CONSTRAINT RHN_CFSTATE_LABEL_NN; +ALTER TABLE RHNCONFIGFILESTATE MODIFY LABEL NOT NULL; + +-- +-- RHNCONFIGFILESTATE +-- +ALTER TABLE RHNCONFIGFILESTATE DROP CONSTRAINT RHN_CFSTATE_MOD_NN; +ALTER TABLE RHNCONFIGFILESTATE MODIFY MODIFIED NOT NULL; + +-- +-- RHNCONFIGFILESTATE +-- +ALTER TABLE RHNCONFIGFILESTATE DROP CONSTRAINT RHN_CFSTATE_NAME_NN; +ALTER TABLE RHNCONFIGFILESTATE MODIFY NAME NOT NULL; + +-- +-- RHNCHANNELFAMILYVIRTSUBLEVEL +-- +ALTER TABLE RHNCHANNELFAMILYVIRTSUBLEVEL DROP CONSTRAINT RHN_CFVSL_CFID_NN; +ALTER TABLE RHNCHANNELFAMILYVIRTSUBLEVEL MODIFY CHANNEL_FAMILY_ID NOT NULL; + +-- +-- RHNCHANNELFAMILYVIRTSUBLEVEL +-- +ALTER TABLE RHNCHANNELFAMILYVIRTSUBLEVEL DROP CONSTRAINT RHN_CFVSL_CREATED= _NN; +ALTER TABLE RHNCHANNELFAMILYVIRTSUBLEVEL MODIFY CREATED NOT NULL; + +-- +-- RHNCHANNELFAMILYVIRTSUBLEVEL +-- +ALTER TABLE RHNCHANNELFAMILYVIRTSUBLEVEL DROP CONSTRAINT RHN_CFVSL_MODIFIE= D_NN; +ALTER TABLE RHNCHANNELFAMILYVIRTSUBLEVEL MODIFY MODIFIED NOT NULL; + +-- +-- RHNCHANNELFAMILYVIRTSUBLEVEL +-- +ALTER TABLE RHNCHANNELFAMILYVIRTSUBLEVEL DROP CONSTRAINT RHN_CFVSL_VSLID_N= N; +ALTER TABLE RHNCHANNELFAMILYVIRTSUBLEVEL MODIFY VIRT_SUB_LEVEL_ID NOT NULL; + +-- +-- RHNCHANNELFAMILYMEMBERS +-- +ALTER TABLE RHNCHANNELFAMILYMEMBERS DROP CONSTRAINT RHN_CF_FAMILY_NN; +ALTER TABLE RHNCHANNELFAMILYMEMBERS MODIFY CHANNEL_FAMILY_ID NOT NULL; + +-- +-- RHNCHANNELFAMILYMEMBERS +-- +ALTER TABLE RHNCHANNELFAMILYMEMBERS DROP CONSTRAINT RHN_CF_MEMBERS_C_NN; +ALTER TABLE RHNCHANNELFAMILYMEMBERS MODIFY CHANNEL_ID NOT NULL; + +-- +-- RHNCHANNELFAMILYMEMBERS +-- +ALTER TABLE RHNCHANNELFAMILYMEMBERS DROP CONSTRAINT RHN_CF_MEMBER_CRE_NN; +ALTER TABLE RHNCHANNELFAMILYMEMBERS MODIFY CREATED NOT NULL; + +-- +-- RHNCHANNELFAMILYMEMBERS +-- +ALTER TABLE RHNCHANNELFAMILYMEMBERS DROP CONSTRAINT RHN_CF_MEMBER_MOD_NN; +ALTER TABLE RHNCHANNELFAMILYMEMBERS MODIFY MODIFIED NOT NULL; + +-- +-- RHNCHANNELCLONED +-- +ALTER TABLE RHNCHANNELCLONED DROP CONSTRAINT RHN_CHANNELCLONE_CREATED_NN; +ALTER TABLE RHNCHANNELCLONED MODIFY CREATED NOT NULL; + +-- +-- RHNCHANNELCLONED +-- +ALTER TABLE RHNCHANNELCLONED DROP CONSTRAINT RHN_CHANNELCLONE_FCID_NN; +ALTER TABLE RHNCHANNELCLONED MODIFY ORIGINAL_ID NOT NULL; + +-- +-- RHNCHANNELCLONED +-- +ALTER TABLE RHNCHANNELCLONED DROP CONSTRAINT RHN_CHANNELCLONE_MODIFIED_NN; +ALTER TABLE RHNCHANNELCLONED MODIFY MODIFIED NOT NULL; + +-- +-- RHNCHANNELCLONED +-- +ALTER TABLE RHNCHANNELCLONED DROP CONSTRAINT RHN_CHANNELCLONE_TCID_NN; +ALTER TABLE RHNCHANNELCLONED MODIFY ID NOT NULL; + +-- +-- RHNCHANNELCOMPS +-- +ALTER TABLE RHNCHANNELCOMPS DROP CONSTRAINT RHN_CHANNELCOMPS_CID_NN; +ALTER TABLE RHNCHANNELCOMPS MODIFY CHANNEL_ID NOT NULL; + +-- +-- RHNCHANNELCOMPS +-- +ALTER TABLE RHNCHANNELCOMPS DROP CONSTRAINT RHN_CHANNELCOMPS_CREATED_NN; +ALTER TABLE RHNCHANNELCOMPS MODIFY CREATED NOT NULL; + +-- +-- RHNCHANNELCOMPS +-- +ALTER TABLE RHNCHANNELCOMPS DROP CONSTRAINT RHN_CHANNELCOMPS_ID_NN; +ALTER TABLE RHNCHANNELCOMPS MODIFY ID NOT NULL; + +-- +-- RHNCHANNELCOMPS +-- +ALTER TABLE RHNCHANNELCOMPS DROP CONSTRAINT RHN_CHANNELCOMPS_LASTMOD_NN; +ALTER TABLE RHNCHANNELCOMPS MODIFY LAST_MODIFIED NOT NULL; + +-- +-- RHNCHANNELCOMPS +-- +ALTER TABLE RHNCHANNELCOMPS DROP CONSTRAINT RHN_CHANNELCOMPS_MODIFIED_NN; +ALTER TABLE RHNCHANNELCOMPS MODIFY MODIFIED NOT NULL; + +-- +-- RHNCHANNELCOMPS +-- +ALTER TABLE RHNCHANNELCOMPS DROP CONSTRAINT RHN_CHANNELCOMPS_RFN_NN; +ALTER TABLE RHNCHANNELCOMPS MODIFY RELATIVE_FILENAME NOT NULL; + +-- +-- RHNCHANNELPRODUCT +-- +ALTER TABLE RHNCHANNELPRODUCT DROP CONSTRAINT RHN_CHANNELPROD_BETA_NN; +ALTER TABLE RHNCHANNELPRODUCT MODIFY BETA NOT NULL; + +-- +-- RHNCHANNELPRODUCT +-- +ALTER TABLE RHNCHANNELPRODUCT DROP CONSTRAINT RHN_CHANNELPROD_CREATED_NN; +ALTER TABLE RHNCHANNELPRODUCT MODIFY CREATED NOT NULL; + +-- +-- RHNCHANNELPRODUCT +-- +ALTER TABLE RHNCHANNELPRODUCT DROP CONSTRAINT RHN_CHANNELPROD_ID_NN; +ALTER TABLE RHNCHANNELPRODUCT MODIFY ID NOT NULL; + +-- +-- RHNCHANNELPRODUCT +-- +ALTER TABLE RHNCHANNELPRODUCT DROP CONSTRAINT RHN_CHANNELPROD_MODIFIED_NN; +ALTER TABLE RHNCHANNELPRODUCT MODIFY MODIFIED NOT NULL; + +-- +-- RHNCHANNELPRODUCT +-- +ALTER TABLE RHNCHANNELPRODUCT DROP CONSTRAINT RHN_CHANNELPROD_PRODUCT_NN; +ALTER TABLE RHNCHANNELPRODUCT MODIFY PRODUCT NOT NULL; + +-- +-- RHNCHANNELPRODUCT +-- +ALTER TABLE RHNCHANNELPRODUCT DROP CONSTRAINT RHN_CHANNELPROD_VERSION_NN; +ALTER TABLE RHNCHANNELPRODUCT MODIFY VERSION NOT NULL; + +-- +-- RHNCHANNEL +-- +ALTER TABLE RHNCHANNEL DROP CONSTRAINT RHN_CHANNEL_BASEDIR_NN; +ALTER TABLE RHNCHANNEL MODIFY BASEDIR NOT NULL; + +-- +-- RHNCHANNEL +-- +ALTER TABLE RHNCHANNEL DROP CONSTRAINT RHN_CHANNEL_CAID_NN; +ALTER TABLE RHNCHANNEL MODIFY CHANNEL_ARCH_ID NOT NULL; + +-- +-- RHNCHANNEL +-- +ALTER TABLE RHNCHANNEL DROP CONSTRAINT RHN_CHANNEL_CREATED_NN; +ALTER TABLE RHNCHANNEL MODIFY CREATED NOT NULL; + +-- +-- RHNCHANNELFAMILY +-- +ALTER TABLE RHNCHANNELFAMILY DROP CONSTRAINT RHN_CHANNEL_FAMILY_CREATED_NN; +ALTER TABLE RHNCHANNELFAMILY MODIFY CREATED NOT NULL; + +-- +-- RHNCHANNELFAMILY +-- +ALTER TABLE RHNCHANNELFAMILY DROP CONSTRAINT RHN_CHANNEL_FAMILY_ID_NN; +ALTER TABLE RHNCHANNELFAMILY MODIFY ID NOT NULL; + +-- +-- RHNCHANNELFAMILY +-- +ALTER TABLE RHNCHANNELFAMILY DROP CONSTRAINT RHN_CHANNEL_FAMILY_LABEL_NN; +ALTER TABLE RHNCHANNELFAMILY MODIFY LABEL NOT NULL; + +-- +-- RHNCHANNELFAMILY +-- +ALTER TABLE RHNCHANNELFAMILY DROP CONSTRAINT RHN_CHANNEL_FAMILY_MODIFIED_N= N; +ALTER TABLE RHNCHANNELFAMILY MODIFY MODIFIED NOT NULL; + +-- +-- RHNCHANNELFAMILY +-- +ALTER TABLE RHNCHANNELFAMILY DROP CONSTRAINT RHN_CHANNEL_FAMILY_NAME_NN; +ALTER TABLE RHNCHANNELFAMILY MODIFY NAME NOT NULL; + +-- +-- RHNCHANNELFAMILY +-- +ALTER TABLE RHNCHANNELFAMILY DROP CONSTRAINT RHN_CHANNEL_FAMILY_URL_NN; +ALTER TABLE RHNCHANNELFAMILY MODIFY PRODUCT_URL NOT NULL; + +-- +-- RHNCHANNEL +-- +ALTER TABLE RHNCHANNEL DROP CONSTRAINT RHN_CHANNEL_ID_NN; +ALTER TABLE RHNCHANNEL MODIFY ID NOT NULL; + +-- +-- RHNCHANNEL +-- +ALTER TABLE RHNCHANNEL DROP CONSTRAINT RHN_CHANNEL_LABEL_NN; +ALTER TABLE RHNCHANNEL MODIFY LABEL NOT NULL; + +-- +-- RHNCHANNEL +-- +ALTER TABLE RHNCHANNEL DROP CONSTRAINT RHN_CHANNEL_LM_NN; +ALTER TABLE RHNCHANNEL MODIFY LAST_MODIFIED NOT NULL; + +-- +-- RHNCHANNEL +-- +ALTER TABLE RHNCHANNEL DROP CONSTRAINT RHN_CHANNEL_MODIFIED_NN; +ALTER TABLE RHNCHANNEL MODIFY MODIFIED NOT NULL; + +-- +-- RHNCHANNEL +-- +ALTER TABLE RHNCHANNEL DROP CONSTRAINT RHN_CHANNEL_NAME_NN; +ALTER TABLE RHNCHANNEL MODIFY NAME NOT NULL; + +-- +-- RHNCHANNEL +-- +ALTER TABLE RHNCHANNEL DROP CONSTRAINT RHN_CHANNEL_RU_NN; +ALTER TABLE RHNCHANNEL MODIFY RECEIVING_UPDATES NOT NULL; + +-- +-- RHNCHANNEL +-- +ALTER TABLE RHNCHANNEL DROP CONSTRAINT RHN_CHANNEL_SUMMARY_NN; +ALTER TABLE RHNCHANNEL MODIFY SUMMARY NOT NULL; + +-- +-- RHNCHANNELTRUST +-- +ALTER TABLE RHNCHANNELTRUST DROP CONSTRAINT RHN_CHANNEL_TRUST_CID_NN; +ALTER TABLE RHNCHANNELTRUST MODIFY CHANNEL_ID NOT NULL; + +-- +-- RHNCHANNELTRUST +-- +ALTER TABLE RHNCHANNELTRUST DROP CONSTRAINT RHN_CHANNEL_TRUST_CREATED_NN; +ALTER TABLE RHNCHANNELTRUST MODIFY CREATED NOT NULL; + +-- +-- RHNCHANNELTRUST +-- +ALTER TABLE RHNCHANNELTRUST DROP CONSTRAINT RHN_CHANNEL_TRUST_MODIFIED_NN; +ALTER TABLE RHNCHANNELTRUST MODIFY MODIFIED NOT NULL; + +-- +-- RHNCHANNELTRUST +-- +ALTER TABLE RHNCHANNELTRUST DROP CONSTRAINT RHN_CHANNEL_TRUST_OTID_NN; +ALTER TABLE RHNCHANNELTRUST MODIFY ORG_TRUST_ID NOT NULL; + +-- +-- RHN_CHECK_PROBE +-- +ALTER TABLE RHN_CHECK_PROBE DROP CONSTRAINT RHN_CHKPB_PROBE_ID_NN; +ALTER TABLE RHN_CHECK_PROBE MODIFY PROBE_ID NOT NULL; + +-- +-- RHN_CHECK_PROBE +-- +ALTER TABLE RHN_CHECK_PROBE DROP CONSTRAINT RHN_CHK_HOST_ID_NN; +ALTER TABLE RHN_CHECK_PROBE MODIFY HOST_ID NOT NULL; + +-- +-- RHN_CHECK_PROBE +-- +ALTER TABLE RHN_CHECK_PROBE DROP CONSTRAINT RHN_CHK_PROBE_TYPE_NN; +ALTER TABLE RHN_CHECK_PROBE MODIFY PROBE_TYPE NOT NULL; + +-- +-- RHN_CHECK_PROBE +-- +ALTER TABLE RHN_CHECK_PROBE DROP CONSTRAINT RHN_CHK_SAT_CLUSTER_ID_NN; +ALTER TABLE RHN_CHECK_PROBE MODIFY SAT_CLUSTER_ID NOT NULL; + +-- +-- RHNCHANNELPARENT +-- +ALTER TABLE RHNCHANNELPARENT DROP CONSTRAINT RHN_CHP_CREATED_NN; +ALTER TABLE RHNCHANNELPARENT MODIFY CREATED NOT NULL; + +-- +-- RHNCHANNELPARENT +-- +ALTER TABLE RHNCHANNELPARENT DROP CONSTRAINT RHN_CHP_MODIFIED_NN; +ALTER TABLE RHNCHANNELPARENT MODIFY MODIFIED NOT NULL; + +-- +-- RHNCRYPTOKEYKICKSTART +-- +ALTER TABLE RHNCRYPTOKEYKICKSTART DROP CONSTRAINT RHN_CKEY_KS_CKID_NN; +ALTER TABLE RHNCRYPTOKEYKICKSTART MODIFY CRYPTO_KEY_ID NOT NULL; + +-- +-- RHNCRYPTOKEYKICKSTART +-- +ALTER TABLE RHNCRYPTOKEYKICKSTART DROP CONSTRAINT RHN_CKEY_KS_KSD_NN; +ALTER TABLE RHNCRYPTOKEYKICKSTART MODIFY KSDATA_ID NOT NULL; + +-- +-- RHN_CHECK_SUITE_PROBE +-- +ALTER TABLE RHN_CHECK_SUITE_PROBE DROP CONSTRAINT RHN_CKSPB_CHECK_SUITE_ID= _NN; +ALTER TABLE RHN_CHECK_SUITE_PROBE MODIFY CHECK_SUITE_ID NOT NULL; + +-- +-- RHN_CHECK_SUITE_PROBE +-- +ALTER TABLE RHN_CHECK_SUITE_PROBE DROP CONSTRAINT RHN_CKSPB_PROBE_ID_NN; +ALTER TABLE RHN_CHECK_SUITE_PROBE MODIFY PROBE_ID NOT NULL; + +-- +-- RHN_CHECK_SUITE_PROBE +-- +ALTER TABLE RHN_CHECK_SUITE_PROBE DROP CONSTRAINT RHN_CKSPB_PROBE_TYPE_NN; +ALTER TABLE RHN_CHECK_SUITE_PROBE MODIFY PROBE_TYPE NOT NULL; + +-- +-- RHN_CHECK_SUITES +-- +ALTER TABLE RHN_CHECK_SUITES DROP CONSTRAINT RHN_CKSUT_CUSTID_NN; +ALTER TABLE RHN_CHECK_SUITES MODIFY CUSTOMER_ID NOT NULL; + +-- +-- RHN_CHECK_SUITES +-- +ALTER TABLE RHN_CHECK_SUITES DROP CONSTRAINT RHN_CKSUT_LAST_DATE_NN; +ALTER TABLE RHN_CHECK_SUITES MODIFY LAST_UPDATE_DATE NOT NULL; + +-- +-- RHN_CHECK_SUITES +-- +ALTER TABLE RHN_CHECK_SUITES DROP CONSTRAINT RHN_CKSUT_LAST_USER_NN; +ALTER TABLE RHN_CHECK_SUITES MODIFY LAST_UPDATE_USER NOT NULL; + +-- +-- RHN_CHECK_SUITES +-- +ALTER TABLE RHN_CHECK_SUITES DROP CONSTRAINT RHN_CKSUT_RECID_NN; +ALTER TABLE RHN_CHECK_SUITES MODIFY RECID NOT NULL; + +-- +-- RHN_CHECK_SUITES +-- +ALTER TABLE RHN_CHECK_SUITES DROP CONSTRAINT RHN_CKSUT_SUITE_NAME_NN; +ALTER TABLE RHN_CHECK_SUITES MODIFY SUITE_NAME NOT NULL; + +-- +-- RHNCLIENTCAPABILITYNAME +-- +ALTER TABLE RHNCLIENTCAPABILITYNAME DROP CONSTRAINT RHN_CLIENTCAPNAM_ID_NN; +ALTER TABLE RHNCLIENTCAPABILITYNAME MODIFY ID NOT NULL; + +-- +-- RHNCLIENTCAPABILITYNAME +-- +ALTER TABLE RHNCLIENTCAPABILITYNAME DROP CONSTRAINT RHN_CLIENTCAPNAM_NAME_= NN; +ALTER TABLE RHNCLIENTCAPABILITYNAME MODIFY NAME NOT NULL; + +-- +-- RHNCLIENTCAPABILITY +-- +ALTER TABLE RHNCLIENTCAPABILITY DROP CONSTRAINT RHN_CLIENTCAP_CAP_NID_NN; +ALTER TABLE RHNCLIENTCAPABILITY MODIFY CAPABILITY_NAME_ID NOT NULL; + +-- +-- RHNCLIENTCAPABILITY +-- +ALTER TABLE RHNCLIENTCAPABILITY DROP CONSTRAINT RHN_CLIENTCAP_CREATED_NN; +ALTER TABLE RHNCLIENTCAPABILITY MODIFY CREATED NOT NULL; + +-- +-- RHNCLIENTCAPABILITY +-- +ALTER TABLE RHNCLIENTCAPABILITY DROP CONSTRAINT RHN_CLIENTCAP_MODIFIED_NN; +ALTER TABLE RHNCLIENTCAPABILITY MODIFY MODIFIED NOT NULL; + +-- +-- RHNCLIENTCAPABILITY +-- +ALTER TABLE RHNCLIENTCAPABILITY DROP CONSTRAINT RHN_CLIENTCAP_SID_NN; +ALTER TABLE RHNCLIENTCAPABILITY MODIFY SERVER_ID NOT NULL; + +-- +-- RHNCLIENTCAPABILITY +-- +ALTER TABLE RHNCLIENTCAPABILITY DROP CONSTRAINT RHN_CLIENTCAP_VER_NN; +ALTER TABLE RHNCLIENTCAPABILITY MODIFY VERSION NOT NULL; + +-- +-- RHN_COMMAND_CENTER_STATE +-- +ALTER TABLE RHN_COMMAND_CENTER_STATE DROP CONSTRAINT RHN_CMDCS_ALLOWED_NN; +ALTER TABLE RHN_COMMAND_CENTER_STATE MODIFY CUST_ADMIN_ACCESS_ALLOWED NOT = NULL; + +-- +-- RHN_COMMAND_CENTER_STATE +-- +ALTER TABLE RHN_COMMAND_CENTER_STATE DROP CONSTRAINT RHN_CMDCS_LAST_DATE_N= N; +ALTER TABLE RHN_COMMAND_CENTER_STATE MODIFY LAST_UPDATE_DATE NOT NULL; + +-- +-- RHN_COMMAND_CENTER_STATE +-- +ALTER TABLE RHN_COMMAND_CENTER_STATE DROP CONSTRAINT RHN_CMDCS_LAST_USER_N= N; +ALTER TABLE RHN_COMMAND_CENTER_STATE MODIFY LAST_UPDATE_USER NOT NULL; + +-- +-- RHN_COMMAND_CENTER_STATE +-- +ALTER TABLE RHN_COMMAND_CENTER_STATE DROP CONSTRAINT RHN_CMDCS_REASON_NN; +ALTER TABLE RHN_COMMAND_CENTER_STATE MODIFY REASON NOT NULL; + +-- +-- RHN_COMMAND_GROUPS +-- +ALTER TABLE RHN_COMMAND_GROUPS DROP CONSTRAINT RHN_CMDGR_GROUP_NAME_NN; +ALTER TABLE RHN_COMMAND_GROUPS MODIFY GROUP_NAME NOT NULL; + +-- +-- RHN_COMMAND_TARGET +-- +ALTER TABLE RHN_COMMAND_TARGET DROP CONSTRAINT RHN_CMDTG_CUST_ID_NN; +ALTER TABLE RHN_COMMAND_TARGET MODIFY CUSTOMER_ID NOT NULL; + +-- +-- RHN_COMMAND_TARGET +-- +ALTER TABLE RHN_COMMAND_TARGET DROP CONSTRAINT RHN_CMDTG_RECID_NN; +ALTER TABLE RHN_COMMAND_TARGET MODIFY RECID NOT NULL; + +-- +-- RHN_COMMAND_TARGET +-- +ALTER TABLE RHN_COMMAND_TARGET DROP CONSTRAINT RHN_CMDTG_TARGET_TY_NN; +ALTER TABLE RHN_COMMAND_TARGET MODIFY TARGET_TYPE NOT NULL; + +-- +-- RHN_CONTACT_METHODS +-- +ALTER TABLE RHN_CONTACT_METHODS DROP CONSTRAINT RHN_CMETH_CONTACT_ID_NN; +ALTER TABLE RHN_CONTACT_METHODS MODIFY CONTACT_ID NOT NULL; + +-- +-- RHN_CONTACT_METHODS +-- +ALTER TABLE RHN_CONTACT_METHODS DROP CONSTRAINT RHN_CMETH_METH_TYPE_NN; +ALTER TABLE RHN_CONTACT_METHODS MODIFY METHOD_TYPE_ID NOT NULL; + +-- +-- RHN_CONTACT_METHODS +-- +ALTER TABLE RHN_CONTACT_METHODS DROP CONSTRAINT RHN_CMETH_NOTIF_FMT_NN; +ALTER TABLE RHN_CONTACT_METHODS MODIFY NOTIFICATION_FORMAT_ID NOT NULL; + +-- +-- RHN_CONTACT_METHODS +-- +ALTER TABLE RHN_CONTACT_METHODS DROP CONSTRAINT RHN_CMETH_RECID_NN; +ALTER TABLE RHN_CONTACT_METHODS MODIFY RECID NOT NULL; + +-- +-- RHN_COMMAND +-- +ALTER TABLE RHN_COMMAND DROP CONSTRAINT RHN_CMMND_ALLOWED_NN; +ALTER TABLE RHN_COMMAND MODIFY ALLOWED_IN_SUITE NOT NULL; + +-- +-- RHN_COMMAND +-- +ALTER TABLE RHN_COMMAND DROP CONSTRAINT RHN_CMMND_CLASS_NN; +ALTER TABLE RHN_COMMAND MODIFY COMMAND_CLASS NOT NULL; + +-- +-- RHN_COMMAND +-- +ALTER TABLE RHN_COMMAND DROP CONSTRAINT RHN_CMMND_DESC_NN; +ALTER TABLE RHN_COMMAND MODIFY DESCRIPTION NOT NULL; + +-- +-- RHN_COMMAND +-- +ALTER TABLE RHN_COMMAND DROP CONSTRAINT RHN_CMMND_ENABLED_NN; +ALTER TABLE RHN_COMMAND MODIFY ENABLED NOT NULL; + +-- +-- RHN_COMMAND +-- +ALTER TABLE RHN_COMMAND DROP CONSTRAINT RHN_CMMND_HOST_PROBE_NN; +ALTER TABLE RHN_COMMAND MODIFY FOR_HOST_PROBE NOT NULL; + +-- +-- RHN_COMMAND +-- +ALTER TABLE RHN_COMMAND DROP CONSTRAINT RHN_CMMND_NAME_NN; +ALTER TABLE RHN_COMMAND MODIFY NAME NOT NULL; + +-- +-- RHN_COMMAND +-- +ALTER TABLE RHN_COMMAND DROP CONSTRAINT RHN_CMMND_RECID_NN; +ALTER TABLE RHN_COMMAND MODIFY RECID NOT NULL; + +-- +-- RHNCHANNELNEWESTPACKAGEAUDIT +-- +ALTER TABLE RHNCHANNELNEWESTPACKAGEAUDIT DROP CONSTRAINT RHN_CNP_AT_CALLER= _NN; +ALTER TABLE RHNCHANNELNEWESTPACKAGEAUDIT MODIFY CALLER NOT NULL; + +-- +-- RHNCHANNELNEWESTPACKAGEAUDIT +-- +ALTER TABLE RHNCHANNELNEWESTPACKAGEAUDIT DROP CONSTRAINT RHN_CNP_AT_CID_NN; +ALTER TABLE RHNCHANNELNEWESTPACKAGEAUDIT MODIFY CHANNEL_ID NOT NULL; + +-- +-- RHNCHANNELNEWESTPACKAGEAUDIT +-- +ALTER TABLE RHNCHANNELNEWESTPACKAGEAUDIT DROP CONSTRAINT RHN_CNP_AT_RT_NN; +ALTER TABLE RHNCHANNELNEWESTPACKAGEAUDIT MODIFY REFRESH_TIME NOT NULL; + +-- +-- RHNCHANNELNEWESTPACKAGE +-- +ALTER TABLE RHNCHANNELNEWESTPACKAGE DROP CONSTRAINT RHN_CNP_CID_NN; +ALTER TABLE RHNCHANNELNEWESTPACKAGE MODIFY CHANNEL_ID NOT NULL; + +-- +-- RHNCHANNELNEWESTPACKAGE +-- +ALTER TABLE RHNCHANNELNEWESTPACKAGE DROP CONSTRAINT RHN_CNP_EID_NN; +ALTER TABLE RHNCHANNELNEWESTPACKAGE MODIFY EVR_ID NOT NULL; + +-- +-- RHNCHANNELNEWESTPACKAGE +-- +ALTER TABLE RHNCHANNELNEWESTPACKAGE DROP CONSTRAINT RHN_CNP_NID_NN; +ALTER TABLE RHNCHANNELNEWESTPACKAGE MODIFY NAME_ID NOT NULL; + +-- +-- RHNCHANNELNEWESTPACKAGE +-- +ALTER TABLE RHNCHANNELNEWESTPACKAGE DROP CONSTRAINT RHN_CNP_PAID_NN; +ALTER TABLE RHNCHANNELNEWESTPACKAGE MODIFY PACKAGE_ARCH_ID NOT NULL; + +-- +-- RHNCHANNELNEWESTPACKAGE +-- +ALTER TABLE RHNCHANNELNEWESTPACKAGE DROP CONSTRAINT RHN_CNP_PID_NN; +ALTER TABLE RHNCHANNELNEWESTPACKAGE MODIFY PACKAGE_ID NOT NULL; + +-- +-- RHN_CONTACT_GROUP_MEMBERS +-- +ALTER TABLE RHN_CONTACT_GROUP_MEMBERS DROP CONSTRAINT RHN_CNTGM_CGID_NN; +ALTER TABLE RHN_CONTACT_GROUP_MEMBERS MODIFY CONTACT_GROUP_ID NOT NULL; + +-- +-- RHN_CONTACT_GROUP_MEMBERS +-- +ALTER TABLE RHN_CONTACT_GROUP_MEMBERS DROP CONSTRAINT RHN_CNTGM_LAST_DATE_= NN; +ALTER TABLE RHN_CONTACT_GROUP_MEMBERS MODIFY LAST_UPDATE_DATE NOT NULL; + +-- +-- RHN_CONTACT_GROUP_MEMBERS +-- +ALTER TABLE RHN_CONTACT_GROUP_MEMBERS DROP CONSTRAINT RHN_CNTGM_LAST_USER_= NN; +ALTER TABLE RHN_CONTACT_GROUP_MEMBERS MODIFY LAST_UPDATE_USER NOT NULL; + +-- +-- RHN_CONTACT_GROUP_MEMBERS +-- +ALTER TABLE RHN_CONTACT_GROUP_MEMBERS DROP CONSTRAINT RHN_CNTGM_ON_NN; +ALTER TABLE RHN_CONTACT_GROUP_MEMBERS MODIFY ORDER_NUMBER NOT NULL; + +-- +-- RHN_CONTACT_GROUPS +-- +ALTER TABLE RHN_CONTACT_GROUPS DROP CONSTRAINT RHN_CNTGP_ACK_WAIT_NN; +ALTER TABLE RHN_CONTACT_GROUPS MODIFY ACK_WAIT NOT NULL; + +-- +-- RHN_CONTACT_GROUPS +-- +ALTER TABLE RHN_CONTACT_GROUPS DROP CONSTRAINT RHN_CNTGP_CUST_ID_NN; +ALTER TABLE RHN_CONTACT_GROUPS MODIFY CUSTOMER_ID NOT NULL; + +-- +-- RHN_CONTACT_GROUPS +-- +ALTER TABLE RHN_CONTACT_GROUPS DROP CONSTRAINT RHN_CNTGP_GROUP_NAME_NN; +ALTER TABLE RHN_CONTACT_GROUPS MODIFY CONTACT_GROUP_NAME NOT NULL; + +-- +-- RHN_CONTACT_GROUPS +-- +ALTER TABLE RHN_CONTACT_GROUPS DROP CONSTRAINT RHN_CNTGP_LAST_DATE_NN; +ALTER TABLE RHN_CONTACT_GROUPS MODIFY LAST_UPDATE_DATE NOT NULL; + +-- +-- RHN_CONTACT_GROUPS +-- +ALTER TABLE RHN_CONTACT_GROUPS DROP CONSTRAINT RHN_CNTGP_LAST_USER_NN; +ALTER TABLE RHN_CONTACT_GROUPS MODIFY LAST_UPDATE_USER NOT NULL; + +-- +-- RHN_CONTACT_GROUPS +-- +ALTER TABLE RHN_CONTACT_GROUPS DROP CONSTRAINT RHN_CNTGP_NOTIF_FMT_NN; +ALTER TABLE RHN_CONTACT_GROUPS MODIFY NOTIFICATION_FORMAT_ID NOT NULL; + +-- +-- RHN_CONTACT_GROUPS +-- +ALTER TABLE RHN_CONTACT_GROUPS DROP CONSTRAINT RHN_CNTGP_RECID_NN; +ALTER TABLE RHN_CONTACT_GROUPS MODIFY RECID NOT NULL; + +-- +-- RHN_CONTACT_GROUPS +-- +ALTER TABLE RHN_CONTACT_GROUPS DROP CONSTRAINT RHN_CNTGP_ROTATE_F_NN; +ALTER TABLE RHN_CONTACT_GROUPS MODIFY ROTATE_FIRST NOT NULL; + +-- +-- RHN_CONTACT_GROUPS +-- +ALTER TABLE RHN_CONTACT_GROUPS DROP CONSTRAINT RHN_CNTGP_STRAT_ID_NN; +ALTER TABLE RHN_CONTACT_GROUPS MODIFY STRATEGY_ID NOT NULL; + +-- +-- RHN_COMMAND_CLASS +-- +ALTER TABLE RHN_COMMAND_CLASS DROP CONSTRAINT RHN_COMCL_CLASS_NAME_NN; +ALTER TABLE RHN_COMMAND_CLASS MODIFY CLASS_NAME NOT NULL; + +-- +-- RHN_CONFIG_SECURITY_TYPE +-- +ALTER TABLE RHN_CONFIG_SECURITY_TYPE DROP CONSTRAINT RHN_CONCT_NAME_NN; +ALTER TABLE RHN_CONFIG_SECURITY_TYPE MODIFY NAME NOT NULL; + +-- +-- RHNCONFIGCHANNELTYPE +-- +ALTER TABLE RHNCONFIGCHANNELTYPE DROP CONSTRAINT RHN_CONFCHANTYPE_CREAT_NN; +ALTER TABLE RHNCONFIGCHANNELTYPE MODIFY CREATED NOT NULL; + +-- +-- RHNCONFIGCHANNELTYPE +-- +ALTER TABLE RHNCONFIGCHANNELTYPE DROP CONSTRAINT RHN_CONFCHANTYPE_ID_NN; +ALTER TABLE RHNCONFIGCHANNELTYPE MODIFY ID NOT NULL; + +-- +-- RHNCONFIGCHANNELTYPE +-- +ALTER TABLE RHNCONFIGCHANNELTYPE DROP CONSTRAINT RHN_CONFCHANTYPE_LABEL_NN; +ALTER TABLE RHNCONFIGCHANNELTYPE MODIFY LABEL NOT NULL; + +-- +-- RHNCONFIGCHANNELTYPE +-- +ALTER TABLE RHNCONFIGCHANNELTYPE DROP CONSTRAINT RHN_CONFCHANTYPE_MOD_NN; +ALTER TABLE RHNCONFIGCHANNELTYPE MODIFY MODIFIED NOT NULL; + +-- +-- RHNCONFIGCHANNELTYPE +-- +ALTER TABLE RHNCONFIGCHANNELTYPE DROP CONSTRAINT RHN_CONFCHANTYPE_NAME_NN; +ALTER TABLE RHNCONFIGCHANNELTYPE MODIFY NAME NOT NULL; + +-- +-- RHNCONFIGCHANNELTYPE +-- +ALTER TABLE RHNCONFIGCHANNELTYPE DROP CONSTRAINT RHN_CONFCHANTYPE_PRI_NN; +ALTER TABLE RHNCONFIGCHANNELTYPE MODIFY PRIORITY NOT NULL; + +-- +-- RHNCONFIGCHANNEL +-- +ALTER TABLE RHNCONFIGCHANNEL DROP CONSTRAINT RHN_CONFCHAN_CREAT_NN; +ALTER TABLE RHNCONFIGCHANNEL MODIFY CREATED NOT NULL; + +-- +-- RHNCONFIGCHANNEL +-- +ALTER TABLE RHNCONFIGCHANNEL DROP CONSTRAINT RHN_CONFCHAN_CTID_NN; +ALTER TABLE RHNCONFIGCHANNEL MODIFY CONFCHAN_TYPE_ID NOT NULL; + +-- +-- RHNCONFIGCHANNEL +-- +ALTER TABLE RHNCONFIGCHANNEL DROP CONSTRAINT RHN_CONFCHAN_DESC_NN; +ALTER TABLE RHNCONFIGCHANNEL MODIFY DESCRIPTION NOT NULL; + +-- +-- RHNCONFIGCHANNEL +-- +ALTER TABLE RHNCONFIGCHANNEL DROP CONSTRAINT RHN_CONFCHAN_ID_NN; +ALTER TABLE RHNCONFIGCHANNEL MODIFY ID NOT NULL; + +-- +-- RHNCONFIGCHANNEL +-- +ALTER TABLE RHNCONFIGCHANNEL DROP CONSTRAINT RHN_CONFCHAN_LABEL_NN; +ALTER TABLE RHNCONFIGCHANNEL MODIFY LABEL NOT NULL; + +-- +-- RHNCONFIGCHANNEL +-- +ALTER TABLE RHNCONFIGCHANNEL DROP CONSTRAINT RHN_CONFCHAN_MOD_NN; +ALTER TABLE RHNCONFIGCHANNEL MODIFY MODIFIED NOT NULL; + +-- +-- RHNCONFIGCHANNEL +-- +ALTER TABLE RHNCONFIGCHANNEL DROP CONSTRAINT RHN_CONFCHAN_NAME_NN; +ALTER TABLE RHNCONFIGCHANNEL MODIFY NAME NOT NULL; + +-- +-- RHNCONFIGCHANNEL +-- +ALTER TABLE RHNCONFIGCHANNEL DROP CONSTRAINT RHN_CONFCHAN_OID_NN; +ALTER TABLE RHNCONFIGCHANNEL MODIFY ORG_ID NOT NULL; + +-- +-- RHNCONFIGCONTENT +-- +ALTER TABLE RHNCONFIGCONTENT DROP CONSTRAINT RHN_CONFCONTENT_CREAT_NN; +ALTER TABLE RHNCONFIGCONTENT MODIFY CREATED NOT NULL; + +-- +-- RHNCONFIGCONTENT +-- +ALTER TABLE RHNCONFIGCONTENT DROP CONSTRAINT RHN_CONFCONTENT_ID_NN; +ALTER TABLE RHNCONFIGCONTENT MODIFY ID NOT NULL; + +-- +-- RHNCONFIGCONTENT +-- +ALTER TABLE RHNCONFIGCONTENT DROP CONSTRAINT RHN_CONFCONTENT_ISBIN_NN; +ALTER TABLE RHNCONFIGCONTENT MODIFY IS_BINARY NOT NULL; + +-- +-- RHNCONFIGCONTENT +-- +ALTER TABLE RHNCONFIGCONTENT DROP CONSTRAINT RHN_CONFCONTENT_MD5_NN; +ALTER TABLE RHNCONFIGCONTENT MODIFY MD5SUM NOT NULL; + +-- +-- RHNCONFIGCONTENT +-- +ALTER TABLE RHNCONFIGCONTENT DROP CONSTRAINT RHN_CONFCONTENT_MOD_NN; +ALTER TABLE RHNCONFIGCONTENT MODIFY MODIFIED NOT NULL; + +-- +-- RHNCONFIGFILETYPE +-- +ALTER TABLE RHNCONFIGFILETYPE DROP CONSTRAINT RHN_CONFFILETYPE_CREAT_NN; +ALTER TABLE RHNCONFIGFILETYPE MODIFY CREATED NOT NULL; + +-- +-- RHNCONFIGFILETYPE +-- +ALTER TABLE RHNCONFIGFILETYPE DROP CONSTRAINT RHN_CONFFILETYPE_ID_NN; +ALTER TABLE RHNCONFIGFILETYPE MODIFY ID NOT NULL; + +-- +-- RHNCONFIGFILETYPE +-- +ALTER TABLE RHNCONFIGFILETYPE DROP CONSTRAINT RHN_CONFFILETYPE_LABEL_NN; +ALTER TABLE RHNCONFIGFILETYPE MODIFY LABEL NOT NULL; + +-- +-- RHNCONFIGFILETYPE +-- +ALTER TABLE RHNCONFIGFILETYPE DROP CONSTRAINT RHN_CONFFILETYPE_MOD_NN; +ALTER TABLE RHNCONFIGFILETYPE MODIFY MODIFIED NOT NULL; + +-- +-- RHNCONFIGFILETYPE +-- +ALTER TABLE RHNCONFIGFILETYPE DROP CONSTRAINT RHN_CONFFILETYPE_NAME_NN; +ALTER TABLE RHNCONFIGFILETYPE MODIFY NAME NOT NULL; + +-- +-- RHNCONFIGFILE +-- +ALTER TABLE RHNCONFIGFILE DROP CONSTRAINT RHN_CONFFILE_CCID_NN; +ALTER TABLE RHNCONFIGFILE MODIFY CONFIG_CHANNEL_ID NOT NULL; + +-- +-- RHNCONFIGFILE +-- +ALTER TABLE RHNCONFIGFILE DROP CONSTRAINT RHN_CONFFILE_CFNID_NN; +ALTER TABLE RHNCONFIGFILE MODIFY CONFIG_FILE_NAME_ID NOT NULL; + +-- +-- RHNCONFIGFILE +-- +ALTER TABLE RHNCONFIGFILE DROP CONSTRAINT RHN_CONFFILE_CREAT_NN; +ALTER TABLE RHNCONFIGFILE MODIFY CREATED NOT NULL; + +-- +-- RHNCONFIGFILEFAILURE +-- +ALTER TABLE RHNCONFIGFILEFAILURE DROP CONSTRAINT RHN_CONFFILE_FAIL_CREAT_N= N; +ALTER TABLE RHNCONFIGFILEFAILURE MODIFY CREATED NOT NULL; + +-- +-- RHNCONFIGFILEFAILURE +-- +ALTER TABLE RHNCONFIGFILEFAILURE DROP CONSTRAINT RHN_CONFFILE_FAIL_ID_NN; +ALTER TABLE RHNCONFIGFILEFAILURE MODIFY ID NOT NULL; + +-- +-- RHNCONFIGFILEFAILURE +-- +ALTER TABLE RHNCONFIGFILEFAILURE DROP CONSTRAINT RHN_CONFFILE_FAIL_LABEL_N= N; +ALTER TABLE RHNCONFIGFILEFAILURE MODIFY LABEL NOT NULL; + +-- +-- RHNCONFIGFILEFAILURE +-- +ALTER TABLE RHNCONFIGFILEFAILURE DROP CONSTRAINT RHN_CONFFILE_FAIL_MOD_NN; +ALTER TABLE RHNCONFIGFILEFAILURE MODIFY MODIFIED NOT NULL; + +-- +-- RHNCONFIGFILEFAILURE +-- +ALTER TABLE RHNCONFIGFILEFAILURE DROP CONSTRAINT RHN_CONFFILE_FAIL_NAME_NN; +ALTER TABLE RHNCONFIGFILEFAILURE MODIFY NAME NOT NULL; + +-- +-- RHNCONFIGFILE +-- +ALTER TABLE RHNCONFIGFILE DROP CONSTRAINT RHN_CONFFILE_ID_NN; +ALTER TABLE RHNCONFIGFILE MODIFY ID NOT NULL; + +-- +-- RHNCONFIGFILE +-- +ALTER TABLE RHNCONFIGFILE DROP CONSTRAINT RHN_CONFFILE_MOD_NN; +ALTER TABLE RHNCONFIGFILE MODIFY MODIFIED NOT NULL; + +-- +-- RHNCONFIGFILE +-- +ALTER TABLE RHNCONFIGFILE DROP CONSTRAINT RHN_CONFFILE_SID_NN; +ALTER TABLE RHNCONFIGFILE MODIFY STATE_ID NOT NULL; + +-- +-- RHN_CONFIG_GROUP +-- +ALTER TABLE RHN_CONFIG_GROUP DROP CONSTRAINT RHN_CONFG_NAME_NN; +ALTER TABLE RHN_CONFIG_GROUP MODIFY NAME NOT NULL; + +-- +-- RHNCONFIGINFO +-- +ALTER TABLE RHNCONFIGINFO DROP CONSTRAINT RHN_CONFINFO_CREAT_NN; +ALTER TABLE RHNCONFIGINFO MODIFY CREATED NOT NULL; + +-- +-- RHNCONFIGINFO +-- +ALTER TABLE RHNCONFIGINFO DROP CONSTRAINT RHN_CONFINFO_FILEMODE_NN; +ALTER TABLE RHNCONFIGINFO MODIFY FILEMODE NOT NULL; + +-- +-- RHNCONFIGINFO +-- +ALTER TABLE RHNCONFIGINFO DROP CONSTRAINT RHN_CONFINFO_GROUPNAME_NN; +ALTER TABLE RHNCONFIGINFO MODIFY GROUPNAME NOT NULL; + +-- +-- RHNCONFIGINFO +-- +ALTER TABLE RHNCONFIGINFO DROP CONSTRAINT RHN_CONFINFO_ID_NN; +ALTER TABLE RHNCONFIGINFO MODIFY ID NOT NULL; + +-- +-- RHNCONFIGINFO +-- +ALTER TABLE RHNCONFIGINFO DROP CONSTRAINT RHN_CONFINFO_MOD_NN; +ALTER TABLE RHNCONFIGINFO MODIFY MODIFIED NOT NULL; + +-- +-- RHNCONFIGINFO +-- +ALTER TABLE RHNCONFIGINFO DROP CONSTRAINT RHN_CONFINFO_USERNAME_NN; +ALTER TABLE RHNCONFIGINFO MODIFY USERNAME NOT NULL; + +-- +-- RHN_CONFIG_MACRO +-- +ALTER TABLE RHN_CONFIG_MACRO DROP CONSTRAINT RHN_CONFM_EDITABLE_NN; +ALTER TABLE RHN_CONFIG_MACRO MODIFY EDITABLE NOT NULL; + +-- +-- RHN_CONFIG_MACRO +-- +ALTER TABLE RHN_CONFIG_MACRO DROP CONSTRAINT RHN_CONFM_ENV_NN; +ALTER TABLE RHN_CONFIG_MACRO MODIFY ENVIRONMENT NOT NULL; + +-- +-- RHN_CONFIG_MACRO +-- +ALTER TABLE RHN_CONFIG_MACRO DROP CONSTRAINT RHN_CONFM_NAME_NN; +ALTER TABLE RHN_CONFIG_MACRO MODIFY NAME NOT NULL; + +-- +-- RHN_CONFIG_PARAMETER +-- +ALTER TABLE RHN_CONFIG_PARAMETER DROP CONSTRAINT RHN_CONFP_GROUP_NAME_NN; +ALTER TABLE RHN_CONFIG_PARAMETER MODIFY GROUP_NAME NOT NULL; + +-- +-- RHN_CONFIG_PARAMETER +-- +ALTER TABLE RHN_CONFIG_PARAMETER DROP CONSTRAINT RHN_CONFP_NAME_NN; +ALTER TABLE RHN_CONFIG_PARAMETER MODIFY NAME NOT NULL; + +-- +-- RHN_CONFIG_PARAMETER +-- +ALTER TABLE RHN_CONFIG_PARAMETER DROP CONSTRAINT RHN_CONFP_SECURITY_TYPE_N= N; +ALTER TABLE RHN_CONFIG_PARAMETER MODIFY SECURITY_TYPE NOT NULL; + +-- +-- RHNCONFIGREVISION +-- +ALTER TABLE RHNCONFIGREVISION DROP CONSTRAINT RHN_CONFREVISION_CCID_NN; +ALTER TABLE RHNCONFIGREVISION MODIFY CONFIG_CONTENT_ID NOT NULL; + +-- +-- RHNCONFIGREVISION +-- +ALTER TABLE RHNCONFIGREVISION DROP CONSTRAINT RHN_CONFREVISION_CFID_NN; +ALTER TABLE RHNCONFIGREVISION MODIFY CONFIG_FILE_ID NOT NULL; + +-- +-- RHNCONFIGREVISION +-- +ALTER TABLE RHNCONFIGREVISION DROP CONSTRAINT RHN_CONFREVISION_CIID_NN; +ALTER TABLE RHNCONFIGREVISION MODIFY CONFIG_INFO_ID NOT NULL; + +-- +-- RHNCONFIGREVISION +-- +ALTER TABLE RHNCONFIGREVISION DROP CONSTRAINT RHN_CONFREVISION_CREAT_NN; +ALTER TABLE RHNCONFIGREVISION MODIFY CREATED NOT NULL; + +-- +-- RHNCONFIGREVISION +-- +ALTER TABLE RHNCONFIGREVISION DROP CONSTRAINT RHN_CONFREVISION_DEND_NN; +ALTER TABLE RHNCONFIGREVISION MODIFY DELIM_END NOT NULL; + +-- +-- RHNCONFIGREVISION +-- +ALTER TABLE RHNCONFIGREVISION DROP CONSTRAINT RHN_CONFREVISION_DSTART_NN; +ALTER TABLE RHNCONFIGREVISION MODIFY DELIM_START NOT NULL; + +-- +-- RHNCONFIGREVISION +-- +ALTER TABLE RHNCONFIGREVISION DROP CONSTRAINT RHN_CONFREVISION_ID_NN; +ALTER TABLE RHNCONFIGREVISION MODIFY ID NOT NULL; + +-- +-- RHNCONFIGREVISION +-- +ALTER TABLE RHNCONFIGREVISION DROP CONSTRAINT RHN_CONFREVISION_MOD_NN; +ALTER TABLE RHNCONFIGREVISION MODIFY MODIFIED NOT NULL; + +-- +-- RHNCONFIGREVISION +-- +ALTER TABLE RHNCONFIGREVISION DROP CONSTRAINT RHN_CONFREVISION_REV_NN; +ALTER TABLE RHNCONFIGREVISION MODIFY REVISION NOT NULL; + +-- +-- RHNCONFIGREVISION +-- +ALTER TABLE RHNCONFIGREVISION DROP CONSTRAINT RHN_CONF_REV_CFTI_NN; +ALTER TABLE RHNCONFIGREVISION MODIFY CONFIG_FILE_TYPE_ID NOT NULL; + +-- +-- RHNWEBCONTACTCHANGESTATE +-- +ALTER TABLE RHNWEBCONTACTCHANGESTATE DROP CONSTRAINT RHN_CONT_CHANGE_STATE= _NN; +ALTER TABLE RHNWEBCONTACTCHANGESTATE MODIFY LABEL NOT NULL; + +-- +-- RHN_COMMAND_PARAM_THRESHOLD +-- +ALTER TABLE RHN_COMMAND_PARAM_THRESHOLD DROP CONSTRAINT RHN_COPTR_COMMAND_= CLASS_NN; +ALTER TABLE RHN_COMMAND_PARAM_THRESHOLD MODIFY COMMAND_CLASS NOT NULL; + +-- +-- RHN_COMMAND_PARAM_THRESHOLD +-- +ALTER TABLE RHN_COMMAND_PARAM_THRESHOLD DROP CONSTRAINT RHN_COPTR_COMMAND_= ID_NN; +ALTER TABLE RHN_COMMAND_PARAM_THRESHOLD MODIFY COMMAND_ID NOT NULL; + +-- +-- RHN_COMMAND_PARAM_THRESHOLD +-- +ALTER TABLE RHN_COMMAND_PARAM_THRESHOLD DROP CONSTRAINT RHN_COPTR_PARAM_NA= ME_NN; +ALTER TABLE RHN_COMMAND_PARAM_THRESHOLD MODIFY PARAM_NAME NOT NULL; + +-- +-- RHN_COMMAND_PARAM_THRESHOLD +-- +ALTER TABLE RHN_COMMAND_PARAM_THRESHOLD DROP CONSTRAINT RHN_COPTR_PARAM_TY= PE_NN; +ALTER TABLE RHN_COMMAND_PARAM_THRESHOLD MODIFY PARAM_TYPE NOT NULL; + +-- +-- RHN_COMMAND_PARAM_THRESHOLD +-- +ALTER TABLE RHN_COMMAND_PARAM_THRESHOLD DROP CONSTRAINT RHN_COPTR_THRES_ME= T_ID_NN; +ALTER TABLE RHN_COMMAND_PARAM_THRESHOLD MODIFY THRESHOLD_METRIC_ID NOT NUL= L; + +-- +-- RHN_COMMAND_PARAM_THRESHOLD +-- +ALTER TABLE RHN_COMMAND_PARAM_THRESHOLD DROP CONSTRAINT RHN_COPTR_THRES_NA= ME_NN; +ALTER TABLE RHN_COMMAND_PARAM_THRESHOLD MODIFY THRESHOLD_TYPE_NAME NOT NUL= L; + +-- +-- RHN_COMMAND_PARAMETER +-- +ALTER TABLE RHN_COMMAND_PARAMETER DROP CONSTRAINT RHN_CPARM_COMMAND_ID_NN; +ALTER TABLE RHN_COMMAND_PARAMETER MODIFY COMMAND_ID NOT NULL; + +-- +-- RHN_COMMAND_PARAMETER +-- +ALTER TABLE RHN_COMMAND_PARAMETER DROP CONSTRAINT RHN_CPARM_DATA_TYPE_NAME= _NN; +ALTER TABLE RHN_COMMAND_PARAMETER MODIFY DATA_TYPE_NAME NOT NULL; + +-- +-- RHN_COMMAND_PARAMETER +-- +ALTER TABLE RHN_COMMAND_PARAMETER DROP CONSTRAINT RHN_CPARM_DEF_VALUE_VIS_= NN; +ALTER TABLE RHN_COMMAND_PARAMETER MODIFY DEFAULT_VALUE_VISIBLE NOT NULL; + +-- +-- RHN_COMMAND_PARAMETER +-- +ALTER TABLE RHN_COMMAND_PARAMETER DROP CONSTRAINT RHN_CPARM_DESCRIPTION_NN; +ALTER TABLE RHN_COMMAND_PARAMETER MODIFY DESCRIPTION NOT NULL; + +-- +-- RHN_COMMAND_PARAMETER +-- +ALTER TABLE RHN_COMMAND_PARAMETER DROP CONSTRAINT RHN_CPARM_FIELD_ORDER_NN; +ALTER TABLE RHN_COMMAND_PARAMETER MODIFY FIELD_ORDER NOT NULL; + +-- +-- RHN_COMMAND_PARAMETER +-- +ALTER TABLE RHN_COMMAND_PARAMETER DROP CONSTRAINT RHN_CPARM_FIELD_VISIBLE_= NN; +ALTER TABLE RHN_COMMAND_PARAMETER MODIFY FIELD_VISIBLE NOT NULL; + +-- +-- RHN_COMMAND_PARAMETER +-- +ALTER TABLE RHN_COMMAND_PARAMETER DROP CONSTRAINT RHN_CPARM_FIELD_WIDGET_N= AME_NN; +ALTER TABLE RHN_COMMAND_PARAMETER MODIFY FIELD_WIDGET_NAME NOT NULL; + +-- +-- RHN_COMMAND_PARAMETER +-- +ALTER TABLE RHN_COMMAND_PARAMETER DROP CONSTRAINT RHN_CPARM_MANDATORY_NN; +ALTER TABLE RHN_COMMAND_PARAMETER MODIFY MANDATORY NOT NULL; + +-- +-- RHN_COMMAND_PARAMETER +-- +ALTER TABLE RHN_COMMAND_PARAMETER DROP CONSTRAINT RHN_CPARM_PARAM_NAME_NN; +ALTER TABLE RHN_COMMAND_PARAMETER MODIFY PARAM_NAME NOT NULL; + +-- +-- RHN_COMMAND_PARAMETER +-- +ALTER TABLE RHN_COMMAND_PARAMETER DROP CONSTRAINT RHN_CPARM_PARAM_TYPE_NN; +ALTER TABLE RHN_COMMAND_PARAMETER MODIFY PARAM_TYPE NOT NULL; + +-- +-- RHNCHANNELPERMISSION +-- +ALTER TABLE RHNCHANNELPERMISSION DROP CONSTRAINT RHN_CPERM_CID_NN; +ALTER TABLE RHNCHANNELPERMISSION MODIFY CHANNEL_ID NOT NULL; + +-- +-- RHNCHANNELPERMISSION +-- +ALTER TABLE RHNCHANNELPERMISSION DROP CONSTRAINT RHN_CPERM_CREATED_NN; +ALTER TABLE RHNCHANNELPERMISSION MODIFY CREATED NOT NULL; + +-- +-- RHNCHANNELPERMISSION +-- +ALTER TABLE RHNCHANNELPERMISSION DROP CONSTRAINT RHN_CPERM_MODIFIED_NN; +ALTER TABLE RHNCHANNELPERMISSION MODIFY MODIFIED NOT NULL; + +-- +-- RHNCHANNELPERMISSION +-- +ALTER TABLE RHNCHANNELPERMISSION DROP CONSTRAINT RHN_CPERM_RID_NN; +ALTER TABLE RHNCHANNELPERMISSION MODIFY ROLE_ID NOT NULL; + +-- +-- RHNCHANNELPERMISSIONROLE +-- +ALTER TABLE RHNCHANNELPERMISSIONROLE DROP CONSTRAINT RHN_CPERM_ROLE_CREATE= D_NN; +ALTER TABLE RHNCHANNELPERMISSIONROLE MODIFY CREATED NOT NULL; + +-- +-- RHNCHANNELPERMISSIONROLE +-- +ALTER TABLE RHNCHANNELPERMISSIONROLE DROP CONSTRAINT RHN_CPERM_ROLE_DESC_N= N; +ALTER TABLE RHNCHANNELPERMISSIONROLE MODIFY DESCRIPTION NOT NULL; + +-- +-- RHNCHANNELPERMISSIONROLE +-- +ALTER TABLE RHNCHANNELPERMISSIONROLE DROP CONSTRAINT RHN_CPERM_ROLE_ID_NN; +ALTER TABLE RHNCHANNELPERMISSIONROLE MODIFY ID NOT NULL; + +-- +-- RHNCHANNELPERMISSIONROLE +-- +ALTER TABLE RHNCHANNELPERMISSIONROLE DROP CONSTRAINT RHN_CPERM_ROLE_LABEL_= NN; +ALTER TABLE RHNCHANNELPERMISSIONROLE MODIFY LABEL NOT NULL; + +-- +-- RHNCHANNELPERMISSIONROLE +-- +ALTER TABLE RHNCHANNELPERMISSIONROLE DROP CONSTRAINT RHN_CPERM_ROLE_MODIFI= ED_NN; +ALTER TABLE RHNCHANNELPERMISSIONROLE MODIFY MODIFIED NOT NULL; + +-- +-- RHNCHANNELPERMISSION +-- +ALTER TABLE RHNCHANNELPERMISSION DROP CONSTRAINT RHN_CPERM_UID_NN; +ALTER TABLE RHNCHANNELPERMISSION MODIFY USER_ID NOT NULL; + +-- +-- RHNCPUARCH +-- +ALTER TABLE RHNCPUARCH DROP CONSTRAINT RHN_CPUARCH_CREATED_NN; +ALTER TABLE RHNCPUARCH MODIFY CREATED NOT NULL; + +-- +-- RHNCPUARCH +-- +ALTER TABLE RHNCPUARCH DROP CONSTRAINT RHN_CPUARCH_ID_NN; +ALTER TABLE RHNCPUARCH MODIFY ID NOT NULL; + +-- +-- RHNCPUARCH +-- +ALTER TABLE RHNCPUARCH DROP CONSTRAINT RHN_CPUARCH_LABEL_NN; +ALTER TABLE RHNCPUARCH MODIFY LABEL NOT NULL; + +-- +-- RHNCPUARCH +-- +ALTER TABLE RHNCPUARCH DROP CONSTRAINT RHN_CPUARCH_MODIFIED_NN; +ALTER TABLE RHNCPUARCH MODIFY MODIFIED NOT NULL; + +-- +-- RHNCPUARCH +-- +ALTER TABLE RHNCPUARCH DROP CONSTRAINT RHN_CPUARCH_NAME_NN; +ALTER TABLE RHNCPUARCH MODIFY NAME NOT NULL; + +-- +-- RHNCPU +-- +ALTER TABLE RHNCPU DROP CONSTRAINT RHN_CPU_CAID_NN; +ALTER TABLE RHNCPU MODIFY CPU_ARCH_ID NOT NULL; + +-- +-- RHNCPU +-- +ALTER TABLE RHNCPU DROP CONSTRAINT RHN_CPU_CREATED_NN; +ALTER TABLE RHNCPU MODIFY CREATED NOT NULL; + +-- +-- RHNCPU +-- +ALTER TABLE RHNCPU DROP CONSTRAINT RHN_CPU_ID_NN; +ALTER TABLE RHNCPU MODIFY ID NOT NULL; + +-- +-- RHNCPU +-- +ALTER TABLE RHNCPU DROP CONSTRAINT RHN_CPU_MODIFIED_NN; +ALTER TABLE RHNCPU MODIFY MODIFIED NOT NULL; + +-- +-- RHNCPU +-- +ALTER TABLE RHNCPU DROP CONSTRAINT RHN_CPU_SERVER_NN; +ALTER TABLE RHNCPU MODIFY SERVER_ID NOT NULL; + +-- +-- RHNCHANNELPACKAGEARCHCOMPAT +-- +ALTER TABLE RHNCHANNELPACKAGEARCHCOMPAT DROP CONSTRAINT RHN_CP_AC_CAID_NN; +ALTER TABLE RHNCHANNELPACKAGEARCHCOMPAT MODIFY CHANNEL_ARCH_ID NOT NULL; + +-- +-- RHNCHANNELPACKAGEARCHCOMPAT +-- +ALTER TABLE RHNCHANNELPACKAGEARCHCOMPAT DROP CONSTRAINT RHN_CP_AC_CREATED_= NN; +ALTER TABLE RHNCHANNELPACKAGEARCHCOMPAT MODIFY CREATED NOT NULL; + +-- +-- RHNCHANNELPACKAGEARCHCOMPAT +-- +ALTER TABLE RHNCHANNELPACKAGEARCHCOMPAT DROP CONSTRAINT RHN_CP_AC_MODIFIED= _NN; +ALTER TABLE RHNCHANNELPACKAGEARCHCOMPAT MODIFY MODIFIED NOT NULL; + +-- +-- RHNCHANNELPACKAGEARCHCOMPAT +-- +ALTER TABLE RHNCHANNELPACKAGEARCHCOMPAT DROP CONSTRAINT RHN_CP_AC_PAID_NN; +ALTER TABLE RHNCHANNELPACKAGEARCHCOMPAT MODIFY PACKAGE_ARCH_ID NOT NULL; + +-- +-- RHNCHANNELPARENT +-- +ALTER TABLE RHNCHANNELPARENT DROP CONSTRAINT RHN_CP_CH_NN; +ALTER TABLE RHNCHANNELPARENT MODIFY CHANNEL NOT NULL; + +-- +-- RHNCHANNELPACKAGE +-- +ALTER TABLE RHNCHANNELPACKAGE DROP CONSTRAINT RHN_CP_CID_NN; +ALTER TABLE RHNCHANNELPACKAGE MODIFY CHANNEL_ID NOT NULL; + +-- +-- RHNCHANNELPACKAGE +-- +ALTER TABLE RHNCHANNELPACKAGE DROP CONSTRAINT RHN_CP_CREATED_NN; +ALTER TABLE RHNCHANNELPACKAGE MODIFY CREATED NOT NULL; + +-- +-- RHNCHANNELPACKAGE +-- +ALTER TABLE RHNCHANNELPACKAGE DROP CONSTRAINT RHN_CP_MODIFIED_NN; +ALTER TABLE RHNCHANNELPACKAGE MODIFY MODIFIED NOT NULL; + +-- +-- RHNCHANNELPARENT +-- +ALTER TABLE RHNCHANNELPARENT DROP CONSTRAINT RHN_CP_PARENT_CH_NN; +ALTER TABLE RHNCHANNELPARENT MODIFY PARENT_CHANNEL NOT NULL; + +-- +-- RHNCHANNELPACKAGE +-- +ALTER TABLE RHNCHANNELPACKAGE DROP CONSTRAINT RHN_CP_PID_NN; +ALTER TABLE RHNCHANNELPACKAGE MODIFY PACKAGE_ID NOT NULL; + +-- +-- RHN_COMMAND_QUEUE_EXECS_BK +-- +ALTER TABLE RHN_COMMAND_QUEUE_EXECS_BK DROP CONSTRAINT RHN_CQCMDBK_INSTANC= E_ID_NN; +ALTER TABLE RHN_COMMAND_QUEUE_EXECS_BK MODIFY INSTANCE_ID NOT NULL; + +-- +-- RHN_COMMAND_QUEUE_EXECS_BK +-- +ALTER TABLE RHN_COMMAND_QUEUE_EXECS_BK DROP CONSTRAINT RHN_CQCMDBK_NETSAIN= T_ID_NN; +ALTER TABLE RHN_COMMAND_QUEUE_EXECS_BK MODIFY NETSAINT_ID NOT NULL; + +-- +-- RHN_COMMAND_QUEUE_EXECS_BK +-- +ALTER TABLE RHN_COMMAND_QUEUE_EXECS_BK DROP CONSTRAINT RHN_CQCMDBK_TARGET_= TYPE_NN; +ALTER TABLE RHN_COMMAND_QUEUE_EXECS_BK MODIFY TARGET_TYPE NOT NULL; + +-- +-- RHN_COMMAND_QUEUE_COMMANDS +-- +ALTER TABLE RHN_COMMAND_QUEUE_COMMANDS DROP CONSTRAINT RHN_CQCMD_COMMAND_L= INE_NN; +ALTER TABLE RHN_COMMAND_QUEUE_COMMANDS MODIFY COMMAND_LINE NOT NULL; + +-- +-- RHN_COMMAND_QUEUE_COMMANDS +-- +ALTER TABLE RHN_COMMAND_QUEUE_COMMANDS DROP CONSTRAINT RHN_CQCMD_DESCRIPTI= ON_NN; +ALTER TABLE RHN_COMMAND_QUEUE_COMMANDS MODIFY DESCRIPTION NOT NULL; + +-- +-- RHN_COMMAND_QUEUE_COMMANDS +-- +ALTER TABLE RHN_COMMAND_QUEUE_COMMANDS DROP CONSTRAINT RHN_CQCMD_EFFECTIVE= _GRP_NN; +ALTER TABLE RHN_COMMAND_QUEUE_COMMANDS MODIFY EFFECTIVE_GROUP NOT NULL; + +-- +-- RHN_COMMAND_QUEUE_COMMANDS +-- +ALTER TABLE RHN_COMMAND_QUEUE_COMMANDS DROP CONSTRAINT RHN_CQCMD_EFFECTIVE= _USR_NN; +ALTER TABLE RHN_COMMAND_QUEUE_COMMANDS MODIFY EFFECTIVE_USER NOT NULL; + +-- +-- RHN_COMMAND_QUEUE_COMMANDS +-- +ALTER TABLE RHN_COMMAND_QUEUE_COMMANDS DROP CONSTRAINT RHN_CQCMD_PERMANENT= _NN; +ALTER TABLE RHN_COMMAND_QUEUE_COMMANDS MODIFY PERMANENT NOT NULL; + +-- +-- RHN_COMMAND_QUEUE_COMMANDS +-- +ALTER TABLE RHN_COMMAND_QUEUE_COMMANDS DROP CONSTRAINT RHN_CQCMD_RECID_NN; +ALTER TABLE RHN_COMMAND_QUEUE_COMMANDS MODIFY RECID NOT NULL; + +-- +-- RHN_COMMAND_QUEUE_COMMANDS +-- +ALTER TABLE RHN_COMMAND_QUEUE_COMMANDS DROP CONSTRAINT RHN_CQCMD_RESTARTAB= LE_NN; +ALTER TABLE RHN_COMMAND_QUEUE_COMMANDS MODIFY RESTARTABLE NOT NULL; + +-- +-- RHN_COMMAND_QUEUE_EXECS +-- +ALTER TABLE RHN_COMMAND_QUEUE_EXECS DROP CONSTRAINT RHN_CQEXE_INSTANCE_ID_= NN; +ALTER TABLE RHN_COMMAND_QUEUE_EXECS MODIFY INSTANCE_ID NOT NULL; + +-- +-- RHN_COMMAND_QUEUE_EXECS +-- +ALTER TABLE RHN_COMMAND_QUEUE_EXECS DROP CONSTRAINT RHN_CQEXE_NETSAINT_ID_= NN; +ALTER TABLE RHN_COMMAND_QUEUE_EXECS MODIFY NETSAINT_ID NOT NULL; + +-- +-- RHN_COMMAND_QUEUE_EXECS +-- +ALTER TABLE RHN_COMMAND_QUEUE_EXECS DROP CONSTRAINT RHN_CQEXE_TARGET_TYPE_= NN; +ALTER TABLE RHN_COMMAND_QUEUE_EXECS MODIFY TARGET_TYPE NOT NULL; + +-- +-- RHN_COMMAND_QUEUE_INSTANCES_BK +-- +ALTER TABLE RHN_COMMAND_QUEUE_INSTANCES_BK DROP CONSTRAINT RHN_CQINSBK_COM= MAND_ID_NN; +ALTER TABLE RHN_COMMAND_QUEUE_INSTANCES_BK MODIFY COMMAND_ID NOT NULL; + +-- +-- RHN_COMMAND_QUEUE_INSTANCES_BK +-- +ALTER TABLE RHN_COMMAND_QUEUE_INSTANCES_BK DROP CONSTRAINT RHN_CQINSBK_DAT= E_SUB_NN; +ALTER TABLE RHN_COMMAND_QUEUE_INSTANCES_BK MODIFY DATE_SUBMITTED NOT NULL; + +-- +-- RHN_COMMAND_QUEUE_INSTANCES_BK +-- +ALTER TABLE RHN_COMMAND_QUEUE_INSTANCES_BK DROP CONSTRAINT RHN_CQINSBK_EXP= _DATE_NN; +ALTER TABLE RHN_COMMAND_QUEUE_INSTANCES_BK MODIFY EXPIRATION_DATE NOT NULL; + +-- +-- RHN_COMMAND_QUEUE_INSTANCES_BK +-- +ALTER TABLE RHN_COMMAND_QUEUE_INSTANCES_BK DROP CONSTRAINT RHN_CQINSBK_REC= ID_NN; +ALTER TABLE RHN_COMMAND_QUEUE_INSTANCES_BK MODIFY RECID NOT NULL; + +-- +-- RHN_COMMAND_QUEUE_INSTANCES +-- +ALTER TABLE RHN_COMMAND_QUEUE_INSTANCES DROP CONSTRAINT RHN_CQINS_COMMAND_= ID_NN; +ALTER TABLE RHN_COMMAND_QUEUE_INSTANCES MODIFY COMMAND_ID NOT NULL; + +-- +-- RHN_COMMAND_QUEUE_INSTANCES +-- +ALTER TABLE RHN_COMMAND_QUEUE_INSTANCES DROP CONSTRAINT RHN_CQINS_DATE_SUB= MITTED_NN; +ALTER TABLE RHN_COMMAND_QUEUE_INSTANCES MODIFY DATE_SUBMITTED NOT NULL; + +-- +-- RHN_COMMAND_QUEUE_INSTANCES +-- +ALTER TABLE RHN_COMMAND_QUEUE_INSTANCES DROP CONSTRAINT RHN_CQINS_EXPIRATI= ON_DATE_NN; +ALTER TABLE RHN_COMMAND_QUEUE_INSTANCES MODIFY EXPIRATION_DATE NOT NULL; + +-- +-- RHN_COMMAND_QUEUE_INSTANCES +-- +ALTER TABLE RHN_COMMAND_QUEUE_INSTANCES DROP CONSTRAINT RHN_CQINS_RECID_NN; +ALTER TABLE RHN_COMMAND_QUEUE_INSTANCES MODIFY RECID NOT NULL; + +-- +-- RHN_COMMAND_QUEUE_PARAMS +-- +ALTER TABLE RHN_COMMAND_QUEUE_PARAMS DROP CONSTRAINT RHN_CQPRM_INSTANCE_ID= _NN; +ALTER TABLE RHN_COMMAND_QUEUE_PARAMS MODIFY INSTANCE_ID NOT NULL; + +-- +-- RHN_COMMAND_QUEUE_PARAMS +-- +ALTER TABLE RHN_COMMAND_QUEUE_PARAMS DROP CONSTRAINT RHN_CQPRM_ORD_NN; +ALTER TABLE RHN_COMMAND_QUEUE_PARAMS MODIFY ORD NOT NULL; + +-- +-- RHN_COMMAND_QUEUE_SESSIONS +-- +ALTER TABLE RHN_COMMAND_QUEUE_SESSIONS DROP CONSTRAINT RHN_CQSES_CONTACT_I= D_NN; +ALTER TABLE RHN_COMMAND_QUEUE_SESSIONS MODIFY CONTACT_ID NOT NULL; + +-- +-- RHN_COMMAND_REQUIREMENTS +-- +ALTER TABLE RHN_COMMAND_REQUIREMENTS DROP CONSTRAINT RHN_CREQS_DESCRIPTION= _NN; +ALTER TABLE RHN_COMMAND_REQUIREMENTS MODIFY DESCRIPTION NOT NULL; + +-- +-- RHN_COMMAND_REQUIREMENTS +-- +ALTER TABLE RHN_COMMAND_REQUIREMENTS DROP CONSTRAINT RHN_CREQS_NAME_NN; +ALTER TABLE RHN_COMMAND_REQUIREMENTS MODIFY NAME NOT NULL; + +-- +-- RHNCRYPTOKEYTYPE +-- +ALTER TABLE RHNCRYPTOKEYTYPE DROP CONSTRAINT RHN_CRYPTOKEYTYPE_CREAT_NN; +ALTER TABLE RHNCRYPTOKEYTYPE MODIFY CREATED NOT NULL; + +-- +-- RHNCRYPTOKEYTYPE +-- +ALTER TABLE RHNCRYPTOKEYTYPE DROP CONSTRAINT RHN_CRYPTOKEYTYPE_DESC_NN; +ALTER TABLE RHNCRYPTOKEYTYPE MODIFY DESCRIPTION NOT NULL; + +-- +-- RHNCRYPTOKEYTYPE +-- +ALTER TABLE RHNCRYPTOKEYTYPE DROP CONSTRAINT RHN_CRYPTOKEYTYPE_ID_NN; +ALTER TABLE RHNCRYPTOKEYTYPE MODIFY ID NOT NULL; + +-- +-- RHNCRYPTOKEYTYPE +-- +ALTER TABLE RHNCRYPTOKEYTYPE DROP CONSTRAINT RHN_CRYPTOKEYTYPE_LABEL_NN; +ALTER TABLE RHNCRYPTOKEYTYPE MODIFY LABEL NOT NULL; + +-- +-- RHNCRYPTOKEYTYPE +-- +ALTER TABLE RHNCRYPTOKEYTYPE DROP CONSTRAINT RHN_CRYPTOKEYTYPE_MOD_NN; +ALTER TABLE RHNCRYPTOKEYTYPE MODIFY MODIFIED NOT NULL; + +-- +-- RHNCRYPTOKEY +-- +ALTER TABLE RHNCRYPTOKEY DROP CONSTRAINT RHN_CRYPTOKEY_CKTID_NN; +ALTER TABLE RHNCRYPTOKEY MODIFY CRYPTO_KEY_TYPE_ID NOT NULL; + +-- +-- RHNCRYPTOKEY +-- +ALTER TABLE RHNCRYPTOKEY DROP CONSTRAINT RHN_CRYPTOKEY_DESC_NN; +ALTER TABLE RHNCRYPTOKEY MODIFY DESCRIPTION NOT NULL; + +-- +-- RHNCRYPTOKEY +-- +ALTER TABLE RHNCRYPTOKEY DROP CONSTRAINT RHN_CRYPTOKEY_ID_NN; +ALTER TABLE RHNCRYPTOKEY MODIFY ID NOT NULL; + +-- +-- RHNCRYPTOKEY +-- +ALTER TABLE RHNCRYPTOKEY DROP CONSTRAINT RHN_CRYPTOKEY_OID_NN; +ALTER TABLE RHNCRYPTOKEY MODIFY ORG_ID NOT NULL; + +-- +-- RHN_CURRENT_STATE_SUMMARIES +-- +ALTER TABLE RHN_CURRENT_STATE_SUMMARIES DROP CONSTRAINT RHN_CURSU_CUST_ID_= NN; +ALTER TABLE RHN_CURRENT_STATE_SUMMARIES MODIFY CUSTOMER_ID NOT NULL; + +-- +-- RHN_CURRENT_STATE_SUMMARIES +-- +ALTER TABLE RHN_CURRENT_STATE_SUMMARIES DROP CONSTRAINT RHN_CURSU_STATE_NN; +ALTER TABLE RHN_CURRENT_STATE_SUMMARIES MODIFY STATE NOT NULL; + +-- +-- RHN_CURRENT_STATE_SUMMARIES +-- +ALTER TABLE RHN_CURRENT_STATE_SUMMARIES DROP CONSTRAINT RHN_CURSU_TEMPLATE= _ID_NN; +ALTER TABLE RHN_CURRENT_STATE_SUMMARIES MODIFY TEMPLATE_ID NOT NULL; + +-- +-- RHNCVE +-- +ALTER TABLE RHNCVE DROP CONSTRAINT RHN_CVE_ID_NN; +ALTER TABLE RHNCVE MODIFY ID NOT NULL; + +-- +-- RHNCVE +-- +ALTER TABLE RHNCVE DROP CONSTRAINT RHN_CVE_NAME_NN; +ALTER TABLE RHNCVE MODIFY NAME NOT NULL; + +-- +-- RHNDAEMONSTATE +-- +ALTER TABLE RHNDAEMONSTATE DROP CONSTRAINT RHN_DAEMONSTATE_LABEL_NN; +ALTER TABLE RHNDAEMONSTATE MODIFY LABEL NOT NULL; + +-- +-- RHNDAEMONSTATE +-- +ALTER TABLE RHNDAEMONSTATE DROP CONSTRAINT RHN_DAEMONSTATE_LP_NN; +ALTER TABLE RHNDAEMONSTATE MODIFY LAST_POLL NOT NULL; + +-- +-- RHN_DB_ENVIRONMENT +-- +ALTER TABLE RHN_DB_ENVIRONMENT DROP CONSTRAINT RHN_DBENV_DB_NAME_NN; +ALTER TABLE RHN_DB_ENVIRONMENT MODIFY DB_NAME NOT NULL; + +-- +-- RHNDISTCHANNELMAP +-- +ALTER TABLE RHNDISTCHANNELMAP DROP CONSTRAINT RHN_DCM_CAID_NN; +ALTER TABLE RHNDISTCHANNELMAP MODIFY CHANNEL_ARCH_ID NOT NULL; + +-- +-- RHNDISTCHANNELMAP +-- +ALTER TABLE RHNDISTCHANNELMAP DROP CONSTRAINT RHN_DCM_CID_NN; +ALTER TABLE RHNDISTCHANNELMAP MODIFY CHANNEL_ID NOT NULL; + +-- +-- RHNDISTCHANNELMAP +-- +ALTER TABLE RHNDISTCHANNELMAP DROP CONSTRAINT RHN_DCM_OS_NN; +ALTER TABLE RHNDISTCHANNELMAP MODIFY OS NOT NULL; + +-- +-- RHNDISTCHANNELMAP +-- +ALTER TABLE RHNDISTCHANNELMAP DROP CONSTRAINT RHN_DCM_RELEASE_NN; +ALTER TABLE RHNDISTCHANNELMAP MODIFY RELEASE NOT NULL; + +-- +-- RHNDEVICE +-- +ALTER TABLE RHNDEVICE DROP CONSTRAINT RHN_DEVICE_CREATED_NN; +ALTER TABLE RHNDEVICE MODIFY CREATED NOT NULL; + +-- +-- RHNDEVICE +-- +ALTER TABLE RHNDEVICE DROP CONSTRAINT RHN_DEVICE_ID_NN; +ALTER TABLE RHNDEVICE MODIFY ID NOT NULL; + +-- +-- RHNDEVICE +-- +ALTER TABLE RHNDEVICE DROP CONSTRAINT RHN_DEVICE_MODIFIED_NN; +ALTER TABLE RHNDEVICE MODIFY MODIFIED NOT NULL; + +-- +-- RHNDEVICE +-- +ALTER TABLE RHNDEVICE DROP CONSTRAINT RHN_DEVICE_SID_NN; +ALTER TABLE RHNDEVICE MODIFY SERVER_ID NOT NULL; + +-- +-- RHNDOWNLOADS +-- +ALTER TABLE RHNDOWNLOADS DROP CONSTRAINT RHN_DL_CAT_NN; +ALTER TABLE RHNDOWNLOADS MODIFY CATEGORY NOT NULL; + +-- +-- RHNDOWNLOADS +-- +ALTER TABLE RHNDOWNLOADS DROP CONSTRAINT RHN_DL_CFID_NN; +ALTER TABLE RHNDOWNLOADS MODIFY CHANNEL_FAMILY_ID NOT NULL; + +-- +-- RHNDOWNLOADS +-- +ALTER TABLE RHNDOWNLOADS DROP CONSTRAINT RHN_DL_CREATED_NN; +ALTER TABLE RHNDOWNLOADS MODIFY CREATED NOT NULL; + +-- +-- RHNDOWNLOADS +-- +ALTER TABLE RHNDOWNLOADS DROP CONSTRAINT RHN_DL_FID_NN; +ALTER TABLE RHNDOWNLOADS MODIFY FILE_ID NOT NULL; + +-- +-- RHNDOWNLOADS +-- +ALTER TABLE RHNDOWNLOADS DROP CONSTRAINT RHN_DL_ID_NN; +ALTER TABLE RHNDOWNLOADS MODIFY ID NOT NULL; + +-- +-- RHNDOWNLOADS +-- +ALTER TABLE RHNDOWNLOADS DROP CONSTRAINT RHN_DL_MODIFIED_NN; +ALTER TABLE RHNDOWNLOADS MODIFY MODIFIED NOT NULL; + +-- +-- RHNDOWNLOADS +-- +ALTER TABLE RHNDOWNLOADS DROP CONSTRAINT RHN_DL_NAME_NN; +ALTER TABLE RHNDOWNLOADS MODIFY NAME NOT NULL; + +-- +-- RHNDOWNLOADS +-- +ALTER TABLE RHNDOWNLOADS DROP CONSTRAINT RHN_DL_ORD_NN; +ALTER TABLE RHNDOWNLOADS MODIFY ORDERING NOT NULL; + +-- +-- RHNDOWNLOADTYPE +-- +ALTER TABLE RHNDOWNLOADTYPE DROP CONSTRAINT RHN_DOWNLOAD_TYPE_ID_NN; +ALTER TABLE RHNDOWNLOADTYPE MODIFY ID NOT NULL; + +-- +-- RHNDOWNLOADTYPE +-- +ALTER TABLE RHNDOWNLOADTYPE DROP CONSTRAINT RHN_DOWNLOAD_TYPE_LABEL_NN; +ALTER TABLE RHNDOWNLOADTYPE MODIFY LABEL NOT NULL; + +-- +-- RHNDOWNLOADTYPE +-- +ALTER TABLE RHNDOWNLOADTYPE DROP CONSTRAINT RHN_DOWNLOAD_TYPE_NAME_NN; +ALTER TABLE RHNDOWNLOADTYPE MODIFY NAME NOT NULL; + +-- +-- RHN_DEPLOYED_PROBE +-- +ALTER TABLE RHN_DEPLOYED_PROBE DROP CONSTRAINT RHN_DPROB_CHECK_INT_NN; +ALTER TABLE RHN_DEPLOYED_PROBE MODIFY CHECK_INTERVAL_MINUTES NOT NULL; + +-- +-- RHN_DEPLOYED_PROBE +-- +ALTER TABLE RHN_DEPLOYED_PROBE DROP CONSTRAINT RHN_DPROB_COMMAND_ID_NN; +ALTER TABLE RHN_DEPLOYED_PROBE MODIFY COMMAND_ID NOT NULL; + +-- +-- RHN_DEPLOYED_PROBE +-- +ALTER TABLE RHN_DEPLOYED_PROBE DROP CONSTRAINT RHN_DPROB_CUST_ID_NN; +ALTER TABLE RHN_DEPLOYED_PROBE MODIFY CUSTOMER_ID NOT NULL; + +-- +-- RHN_DEPLOYED_PROBE +-- +ALTER TABLE RHN_DEPLOYED_PROBE DROP CONSTRAINT RHN_DPROB_PROBE_TYPE_NN; +ALTER TABLE RHN_DEPLOYED_PROBE MODIFY PROBE_TYPE NOT NULL; + +-- +-- RHN_DEPLOYED_PROBE +-- +ALTER TABLE RHN_DEPLOYED_PROBE DROP CONSTRAINT RHN_DPROB_RECID_NN; +ALTER TABLE RHN_DEPLOYED_PROBE MODIFY RECID NOT NULL; + +-- +-- RHN_DEPLOYED_PROBE +-- +ALTER TABLE RHN_DEPLOYED_PROBE DROP CONSTRAINT RHN_DPROB_RETRY_INT_NN; +ALTER TABLE RHN_DEPLOYED_PROBE MODIFY RETRY_INTERVAL_MINUTES NOT NULL; + +-- +-- RHNDAILYSUMMARYQUEUE +-- +ALTER TABLE RHNDAILYSUMMARYQUEUE DROP CONSTRAINT RHN_DSQUEUE_CREATED_NN; +ALTER TABLE RHNDAILYSUMMARYQUEUE MODIFY CREATED NOT NULL; + +-- +-- RHNDAILYSUMMARYQUEUE +-- +ALTER TABLE RHNDAILYSUMMARYQUEUE DROP CONSTRAINT RHN_DSQUEUE_MODIFIED_NN; +ALTER TABLE RHNDAILYSUMMARYQUEUE MODIFY MODIFIED NOT NULL; + +-- +-- RHNDAILYSUMMARYQUEUE +-- +ALTER TABLE RHNDAILYSUMMARYQUEUE DROP CONSTRAINT RHN_DSQUEUE_OID_NN; +ALTER TABLE RHNDAILYSUMMARYQUEUE MODIFY ORG_ID NOT NULL; + +-- +-- RHNEMAILADDRESSLOG +-- +ALTER TABLE RHNEMAILADDRESSLOG DROP CONSTRAINT RHN_EADDRESSLOG_A_NN; +ALTER TABLE RHNEMAILADDRESSLOG MODIFY ADDRESS NOT NULL; + +-- +-- RHNEMAILADDRESSLOG +-- +ALTER TABLE RHNEMAILADDRESSLOG DROP CONSTRAINT RHN_EADDRESSLOG_CREATED_NN; +ALTER TABLE RHNEMAILADDRESSLOG MODIFY CREATED NOT NULL; + +-- +-- RHNEMAILADDRESSLOG +-- +ALTER TABLE RHNEMAILADDRESSLOG DROP CONSTRAINT RHN_EADDRESSLOG_UID_NN; +ALTER TABLE RHNEMAILADDRESSLOG MODIFY USER_ID NOT NULL; + +-- +-- RHNEMAILADDRESS +-- +ALTER TABLE RHNEMAILADDRESS DROP CONSTRAINT RHN_EADDRESS_A_NN; +ALTER TABLE RHNEMAILADDRESS MODIFY ADDRESS NOT NULL; + +-- +-- RHNEMAILADDRESS +-- +ALTER TABLE RHNEMAILADDRESS DROP CONSTRAINT RHN_EADDRESS_CREATED_NN; +ALTER TABLE RHNEMAILADDRESS MODIFY CREATED NOT NULL; + +-- +-- RHNEMAILADDRESS +-- +ALTER TABLE RHNEMAILADDRESS DROP CONSTRAINT RHN_EADDRESS_ID_NN; +ALTER TABLE RHNEMAILADDRESS MODIFY ID NOT NULL; + +-- +-- RHNEMAILADDRESS +-- +ALTER TABLE RHNEMAILADDRESS DROP CONSTRAINT RHN_EADDRESS_MODIFIED_NN; +ALTER TABLE RHNEMAILADDRESS MODIFY MODIFIED NOT NULL; + +-- +-- RHNEMAILADDRESS +-- +ALTER TABLE RHNEMAILADDRESS DROP CONSTRAINT RHN_EADDRESS_SID_NN; +ALTER TABLE RHNEMAILADDRESS MODIFY STATE_ID NOT NULL; + +-- +-- RHNEMAILADDRESS +-- +ALTER TABLE RHNEMAILADDRESS DROP CONSTRAINT RHN_EADDRESS_UID_NN; +ALTER TABLE RHNEMAILADDRESS MODIFY USER_ID NOT NULL; + +-- +-- RHNEMAILADDRESSSTATE +-- +ALTER TABLE RHNEMAILADDRESSSTATE DROP CONSTRAINT RHN_EASTATE_CREATED_NN; +ALTER TABLE RHNEMAILADDRESSSTATE MODIFY CREATED NOT NULL; + +-- +-- RHNEMAILADDRESSSTATE +-- +ALTER TABLE RHNEMAILADDRESSSTATE DROP CONSTRAINT RHN_EASTATE_ID_NN; +ALTER TABLE RHNEMAILADDRESSSTATE MODIFY ID NOT NULL; + +-- +-- RHNEMAILADDRESSSTATE +-- +ALTER TABLE RHNEMAILADDRESSSTATE DROP CONSTRAINT RHN_EASTATE_LABEL_NN; +ALTER TABLE RHNEMAILADDRESSSTATE MODIFY LABEL NOT NULL; + +-- +-- RHNEMAILADDRESSSTATE +-- +ALTER TABLE RHNEMAILADDRESSSTATE DROP CONSTRAINT RHN_EASTATE_MODIFIED_NN; +ALTER TABLE RHNEMAILADDRESSSTATE MODIFY MODIFIED NOT NULL; + +-- +-- RHNERRATACLONEDTMP +-- +ALTER TABLE RHNERRATACLONEDTMP DROP CONSTRAINT RHN_ECLONEDTMP_CREATED_NN; +ALTER TABLE RHNERRATACLONEDTMP MODIFY CREATED NOT NULL; + +-- +-- RHNERRATACLONEDTMP +-- +ALTER TABLE RHNERRATACLONEDTMP DROP CONSTRAINT RHN_ECLONEDTMP_FEID_NN; +ALTER TABLE RHNERRATACLONEDTMP MODIFY ORIGINAL_ID NOT NULL; + +-- +-- RHNERRATACLONEDTMP +-- +ALTER TABLE RHNERRATACLONEDTMP DROP CONSTRAINT RHN_ECLONEDTMP_MODIFIED_NN; +ALTER TABLE RHNERRATACLONEDTMP MODIFY MODIFIED NOT NULL; + +-- +-- RHNERRATACLONEDTMP +-- +ALTER TABLE RHNERRATACLONEDTMP DROP CONSTRAINT RHN_ECLONEDTMP_TEID_NN; +ALTER TABLE RHNERRATACLONEDTMP MODIFY ID NOT NULL; + +-- +-- RHNERRATAFILECHANNELTMP +-- +ALTER TABLE RHNERRATAFILECHANNELTMP DROP CONSTRAINT RHN_EFILECTMP_CID_NN; +ALTER TABLE RHNERRATAFILECHANNELTMP MODIFY CHANNEL_ID NOT NULL; + +-- +-- RHNERRATAFILECHANNELTMP +-- +ALTER TABLE RHNERRATAFILECHANNELTMP DROP CONSTRAINT RHN_EFILECTMP_CREATED_= NN; +ALTER TABLE RHNERRATAFILECHANNELTMP MODIFY CREATED NOT NULL; + +-- +-- RHNERRATAFILECHANNELTMP +-- +ALTER TABLE RHNERRATAFILECHANNELTMP DROP CONSTRAINT RHN_EFILECTMP_EID_NN; +ALTER TABLE RHNERRATAFILECHANNELTMP MODIFY ERRATA_FILE_ID NOT NULL; + +-- +-- RHNERRATAFILECHANNELTMP +-- +ALTER TABLE RHNERRATAFILECHANNELTMP DROP CONSTRAINT RHN_EFILECTMP_MODIFIED= _NN; +ALTER TABLE RHNERRATAFILECHANNELTMP MODIFY MODIFIED NOT NULL; + +-- +-- RHNERRATAFILECHANNEL +-- +ALTER TABLE RHNERRATAFILECHANNEL DROP CONSTRAINT RHN_EFILEC_CID_NN; +ALTER TABLE RHNERRATAFILECHANNEL MODIFY CHANNEL_ID NOT NULL; + +-- +-- RHNERRATAFILECHANNEL +-- +ALTER TABLE RHNERRATAFILECHANNEL DROP CONSTRAINT RHN_EFILEC_CREATED_NN; +ALTER TABLE RHNERRATAFILECHANNEL MODIFY CREATED NOT NULL; + +-- +-- RHNERRATAFILECHANNEL +-- +ALTER TABLE RHNERRATAFILECHANNEL DROP CONSTRAINT RHN_EFILEC_EID_NN; +ALTER TABLE RHNERRATAFILECHANNEL MODIFY ERRATA_FILE_ID NOT NULL; + +-- +-- RHNERRATAFILECHANNEL +-- +ALTER TABLE RHNERRATAFILECHANNEL DROP CONSTRAINT RHN_EFILEC_MODIFIED_NN; +ALTER TABLE RHNERRATAFILECHANNEL MODIFY MODIFIED NOT NULL; + +-- +-- RHNERRATAFILEPACKAGESOURCE +-- +ALTER TABLE RHNERRATAFILEPACKAGESOURCE DROP CONSTRAINT RHN_EFILEPS_CREATED= _NN; +ALTER TABLE RHNERRATAFILEPACKAGESOURCE MODIFY CREATED NOT NULL; + +-- +-- RHNERRATAFILEPACKAGESOURCE +-- +ALTER TABLE RHNERRATAFILEPACKAGESOURCE DROP CONSTRAINT RHN_EFILEPS_FILEID_= NN; +ALTER TABLE RHNERRATAFILEPACKAGESOURCE MODIFY ERRATA_FILE_ID NOT NULL; + +-- +-- RHNERRATAFILEPACKAGESOURCE +-- +ALTER TABLE RHNERRATAFILEPACKAGESOURCE DROP CONSTRAINT RHN_EFILEPS_MODIFIE= D_NN; +ALTER TABLE RHNERRATAFILEPACKAGESOURCE MODIFY MODIFIED NOT NULL; + +-- +-- RHNERRATAFILEPACKAGESOURCE +-- +ALTER TABLE RHNERRATAFILEPACKAGESOURCE DROP CONSTRAINT RHN_EFILEPS_PID_NN; +ALTER TABLE RHNERRATAFILEPACKAGESOURCE MODIFY PACKAGE_ID NOT NULL; + +-- +-- RHNERRATAFILEPACKAGETMP +-- +ALTER TABLE RHNERRATAFILEPACKAGETMP DROP CONSTRAINT RHN_EFILEPTMP_CREATED_= NN; +ALTER TABLE RHNERRATAFILEPACKAGETMP MODIFY CREATED NOT NULL; + +-- +-- RHNERRATAFILEPACKAGETMP +-- +ALTER TABLE RHNERRATAFILEPACKAGETMP DROP CONSTRAINT RHN_EFILEPTMP_FILEID_N= N; +ALTER TABLE RHNERRATAFILEPACKAGETMP MODIFY ERRATA_FILE_ID NOT NULL; + +-- +-- RHNERRATAFILEPACKAGETMP +-- +ALTER TABLE RHNERRATAFILEPACKAGETMP DROP CONSTRAINT RHN_EFILEPTMP_MODIFIED= _NN; +ALTER TABLE RHNERRATAFILEPACKAGETMP MODIFY MODIFIED NOT NULL; + +-- +-- RHNERRATAFILEPACKAGETMP +-- +ALTER TABLE RHNERRATAFILEPACKAGETMP DROP CONSTRAINT RHN_EFILEPTMP_PID_NN; +ALTER TABLE RHNERRATAFILEPACKAGETMP MODIFY PACKAGE_ID NOT NULL; + +-- +-- RHNERRATAFILEPACKAGE +-- +ALTER TABLE RHNERRATAFILEPACKAGE DROP CONSTRAINT RHN_EFILEP_CREATED_NN; +ALTER TABLE RHNERRATAFILEPACKAGE MODIFY CREATED NOT NULL; + +-- +-- RHNERRATAFILEPACKAGE +-- +ALTER TABLE RHNERRATAFILEPACKAGE DROP CONSTRAINT RHN_EFILEP_FILEID_NN; +ALTER TABLE RHNERRATAFILEPACKAGE MODIFY ERRATA_FILE_ID NOT NULL; + +-- +-- RHNERRATAFILEPACKAGE +-- +ALTER TABLE RHNERRATAFILEPACKAGE DROP CONSTRAINT RHN_EFILEP_MODIFIED_NN; +ALTER TABLE RHNERRATAFILEPACKAGE MODIFY MODIFIED NOT NULL; + +-- +-- RHNERRATAFILEPACKAGE +-- +ALTER TABLE RHNERRATAFILEPACKAGE DROP CONSTRAINT RHN_EFILEP_PID_NN; +ALTER TABLE RHNERRATAFILEPACKAGE MODIFY PACKAGE_ID NOT NULL; + +-- +-- RHNERRATANOTIFICATIONQUEUE +-- +ALTER TABLE RHNERRATANOTIFICATIONQUEUE DROP CONSTRAINT RHN_ENQUEUE_CREATED= _NN; +ALTER TABLE RHNERRATANOTIFICATIONQUEUE MODIFY CREATED NOT NULL; + +-- +-- RHNERRATANOTIFICATIONQUEUE +-- +ALTER TABLE RHNERRATANOTIFICATIONQUEUE DROP CONSTRAINT RHN_ENQUEUE_EID_NN; +ALTER TABLE RHNERRATANOTIFICATIONQUEUE MODIFY ERRATA_ID NOT NULL; + +-- +-- RHNERRATANOTIFICATIONQUEUE +-- +ALTER TABLE RHNERRATANOTIFICATIONQUEUE DROP CONSTRAINT RHN_ENQUEUE_MODIFIE= D_NN; +ALTER TABLE RHNERRATANOTIFICATIONQUEUE MODIFY MODIFIED NOT NULL; + +-- +-- RHNERRATANOTIFICATIONQUEUE +-- +ALTER TABLE RHNERRATANOTIFICATIONQUEUE DROP CONSTRAINT RHN_ENQUEUE_NN; +ALTER TABLE RHNERRATANOTIFICATIONQUEUE MODIFY CHANNEL_ID NOT NULL; + +-- +-- RHNERRATANOTIFICATIONQUEUE +-- +ALTER TABLE RHNERRATANOTIFICATIONQUEUE DROP CONSTRAINT RHN_ENQUEUE_OID_NN; +ALTER TABLE RHNERRATANOTIFICATIONQUEUE MODIFY ORG_ID NOT NULL; + +-- +-- RHNENTITLEMENTLOG +-- +ALTER TABLE RHNENTITLEMENTLOG DROP CONSTRAINT RHN_ENTITLEMENT_LOG_BDATE_NN; +ALTER TABLE RHNENTITLEMENTLOG MODIFY BDATE NOT NULL; + +-- +-- RHNENTITLEMENTLOG +-- +ALTER TABLE RHNENTITLEMENTLOG DROP CONSTRAINT RHN_ENTITLEMENT_LOG_EDATE_NN; +ALTER TABLE RHNENTITLEMENTLOG MODIFY EDATE NOT NULL; + +-- +-- RHNENTITLEMENTLOG +-- +ALTER TABLE RHNENTITLEMENTLOG DROP CONSTRAINT RHN_ENTITLEMENT_LOG_RT_NN; +ALTER TABLE RHNENTITLEMENTLOG MODIFY RUN_TIME NOT NULL; + +-- +-- RHN_ENVIRONMENT +-- +ALTER TABLE RHN_ENVIRONMENT DROP CONSTRAINT RHN_ENVIR_NAME_NN; +ALTER TABLE RHN_ENVIRONMENT MODIFY NAME NOT NULL; + +-- +-- RHNERRATAQUEUE +-- +ALTER TABLE RHNERRATAQUEUE DROP CONSTRAINT RHN_EQUEUE_CID_NN; +ALTER TABLE RHNERRATAQUEUE MODIFY CHANNEL_ID NOT NULL; + +-- +-- RHNERRATAQUEUE +-- +ALTER TABLE RHNERRATAQUEUE DROP CONSTRAINT RHN_EQUEUE_CREATED_NN; +ALTER TABLE RHNERRATAQUEUE MODIFY CREATED NOT NULL; + +-- +-- RHNERRATAQUEUE +-- +ALTER TABLE RHNERRATAQUEUE DROP CONSTRAINT RHN_EQUEUE_EID_NN; +ALTER TABLE RHNERRATAQUEUE MODIFY ERRATA_ID NOT NULL; + +-- +-- RHNERRATAQUEUE +-- +ALTER TABLE RHNERRATAQUEUE DROP CONSTRAINT RHN_EQUEUE_MODIFIED_NN; +ALTER TABLE RHNERRATAQUEUE MODIFY MODIFIED NOT NULL; + +-- +-- RHNERRATACLONED +-- +ALTER TABLE RHNERRATACLONED DROP CONSTRAINT RHN_ERRATACLONE_CREATED_NN; +ALTER TABLE RHNERRATACLONED MODIFY CREATED NOT NULL; + +-- +-- RHNERRATACLONED +-- +ALTER TABLE RHNERRATACLONED DROP CONSTRAINT RHN_ERRATACLONE_FEID_NN; +ALTER TABLE RHNERRATACLONED MODIFY ORIGINAL_ID NOT NULL; + +-- +-- RHNERRATACLONED +-- +ALTER TABLE RHNERRATACLONED DROP CONSTRAINT RHN_ERRATACLONE_MODIFIED_NN; +ALTER TABLE RHNERRATACLONED MODIFY MODIFIED NOT NULL; + +-- +-- RHNERRATACLONED +-- +ALTER TABLE RHNERRATACLONED DROP CONSTRAINT RHN_ERRATACLONE_TEID_NN; +ALTER TABLE RHNERRATACLONED MODIFY ID NOT NULL; + +-- +-- RHNERRATAFILETMP +-- +ALTER TABLE RHNERRATAFILETMP DROP CONSTRAINT RHN_ERRATAFILETMP_CREATED_NN; +ALTER TABLE RHNERRATAFILETMP MODIFY CREATED NOT NULL; + +-- +-- RHNERRATAFILETMP +-- +ALTER TABLE RHNERRATAFILETMP DROP CONSTRAINT RHN_ERRATAFILETMP_ERRATA_NN; +ALTER TABLE RHNERRATAFILETMP MODIFY ERRATA_ID NOT NULL; + +-- +-- RHNERRATAFILETMP +-- +ALTER TABLE RHNERRATAFILETMP DROP CONSTRAINT RHN_ERRATAFILETMP_ID_NN; +ALTER TABLE RHNERRATAFILETMP MODIFY ID NOT NULL; + +-- +-- RHNERRATAFILETMP +-- +ALTER TABLE RHNERRATAFILETMP DROP CONSTRAINT RHN_ERRATAFILETMP_MD5_NN; +ALTER TABLE RHNERRATAFILETMP MODIFY MD5SUM NOT NULL; + +-- +-- RHNERRATAFILETMP +-- +ALTER TABLE RHNERRATAFILETMP DROP CONSTRAINT RHN_ERRATAFILETMP_MODIFIED_NN; +ALTER TABLE RHNERRATAFILETMP MODIFY MODIFIED NOT NULL; + +-- +-- RHNERRATAFILETMP +-- +ALTER TABLE RHNERRATAFILETMP DROP CONSTRAINT RHN_ERRATAFILETMP_NAME_NN; +ALTER TABLE RHNERRATAFILETMP MODIFY FILENAME NOT NULL; + +-- +-- RHNERRATAFILETMP +-- +ALTER TABLE RHNERRATAFILETMP DROP CONSTRAINT RHN_ERRATAFILETMP_TYPE_NN; +ALTER TABLE RHNERRATAFILETMP MODIFY TYPE NOT NULL; + +-- +-- RHNERRATAFILE +-- +ALTER TABLE RHNERRATAFILE DROP CONSTRAINT RHN_ERRATAFILE_CREATED_NN; +ALTER TABLE RHNERRATAFILE MODIFY CREATED NOT NULL; + +-- +-- RHNERRATAFILE +-- +ALTER TABLE RHNERRATAFILE DROP CONSTRAINT RHN_ERRATAFILE_ERRATA_NN; +ALTER TABLE RHNERRATAFILE MODIFY ERRATA_ID NOT NULL; + +-- +-- RHNERRATAFILE +-- +ALTER TABLE RHNERRATAFILE DROP CONSTRAINT RHN_ERRATAFILE_ID_NN; +ALTER TABLE RHNERRATAFILE MODIFY ID NOT NULL; + +-- +-- RHNERRATAFILE +-- +ALTER TABLE RHNERRATAFILE DROP CONSTRAINT RHN_ERRATAFILE_MD5_NN; +ALTER TABLE RHNERRATAFILE MODIFY MD5SUM NOT NULL; + +-- +-- RHNERRATAFILE +-- +ALTER TABLE RHNERRATAFILE DROP CONSTRAINT RHN_ERRATAFILE_MODIFIED_NN; +ALTER TABLE RHNERRATAFILE MODIFY MODIFIED NOT NULL; + +-- +-- RHNERRATAFILE +-- +ALTER TABLE RHNERRATAFILE DROP CONSTRAINT RHN_ERRATAFILE_NAME_NN; +ALTER TABLE RHNERRATAFILE MODIFY FILENAME NOT NULL; + +-- +-- RHNERRATAFILETYPE +-- +ALTER TABLE RHNERRATAFILETYPE DROP CONSTRAINT RHN_ERRATAFILE_TYPE_ID_NN; +ALTER TABLE RHNERRATAFILETYPE MODIFY ID NOT NULL; + +-- +-- RHNERRATAFILETYPE +-- +ALTER TABLE RHNERRATAFILETYPE DROP CONSTRAINT RHN_ERRATAFILE_TYPE_LABEL_NN; +ALTER TABLE RHNERRATAFILETYPE MODIFY LABEL NOT NULL; + +-- +-- RHNERRATAFILE +-- +ALTER TABLE RHNERRATAFILE DROP CONSTRAINT RHN_ERRATAFILE_TYPE_NN; +ALTER TABLE RHNERRATAFILE MODIFY TYPE NOT NULL; + +-- +-- RHNERRATATMP +-- +ALTER TABLE RHNERRATATMP DROP CONSTRAINT RHN_ERRATATMP_ADVISORY_NAME_NN; +ALTER TABLE RHNERRATATMP MODIFY ADVISORY_NAME NOT NULL; + +-- +-- RHNERRATATMP +-- +ALTER TABLE RHNERRATATMP DROP CONSTRAINT RHN_ERRATATMP_ADVISORY_NN; +ALTER TABLE RHNERRATATMP MODIFY ADVISORY NOT NULL; + +-- +-- RHNERRATATMP +-- +ALTER TABLE RHNERRATATMP DROP CONSTRAINT RHN_ERRATATMP_ADVISORY_REL_NN; +ALTER TABLE RHNERRATATMP MODIFY ADVISORY_REL NOT NULL; + +-- +-- RHNERRATATMP +-- +ALTER TABLE RHNERRATATMP DROP CONSTRAINT RHN_ERRATATMP_ADV_TYPE_NN; +ALTER TABLE RHNERRATATMP MODIFY ADVISORY_TYPE NOT NULL; + +-- +-- RHNERRATATMP +-- +ALTER TABLE RHNERRATATMP DROP CONSTRAINT RHN_ERRATATMP_CREATED_NN; +ALTER TABLE RHNERRATATMP MODIFY CREATED NOT NULL; + +-- +-- RHNERRATATMP +-- +ALTER TABLE RHNERRATATMP DROP CONSTRAINT RHN_ERRATATMP_ID_NN; +ALTER TABLE RHNERRATATMP MODIFY ID NOT NULL; + +-- +-- RHNERRATATMP +-- +ALTER TABLE RHNERRATATMP DROP CONSTRAINT RHN_ERRATATMP_ISSUE_NN; +ALTER TABLE RHNERRATATMP MODIFY ISSUE_DATE NOT NULL; + +-- +-- RHNERRATATMP +-- +ALTER TABLE RHNERRATATMP DROP CONSTRAINT RHN_ERRATATMP_LAST_MOD_NN; +ALTER TABLE RHNERRATATMP MODIFY LAST_MODIFIED NOT NULL; + +-- +-- RHNERRATATMP +-- +ALTER TABLE RHNERRATATMP DROP CONSTRAINT RHN_ERRATATMP_MODIFIED_NN; +ALTER TABLE RHNERRATATMP MODIFY MODIFIED NOT NULL; + +-- +-- RHNERRATATMP +-- +ALTER TABLE RHNERRATATMP DROP CONSTRAINT RHN_ERRATATMP_UPDATE_NN; +ALTER TABLE RHNERRATATMP MODIFY UPDATE_DATE NOT NULL; + +-- +-- RHNERRATA +-- +ALTER TABLE RHNERRATA DROP CONSTRAINT RHN_ERRATA_ADVISORY_NAME_NN; +ALTER TABLE RHNERRATA MODIFY ADVISORY_NAME NOT NULL; + +-- +-- RHNERRATA +-- +ALTER TABLE RHNERRATA DROP CONSTRAINT RHN_ERRATA_ADVISORY_NN; +ALTER TABLE RHNERRATA MODIFY ADVISORY NOT NULL; + +-- +-- RHNERRATA +-- +ALTER TABLE RHNERRATA DROP CONSTRAINT RHN_ERRATA_ADVISORY_REL_NN; +ALTER TABLE RHNERRATA MODIFY ADVISORY_REL NOT NULL; + +-- +-- RHNERRATA +-- +ALTER TABLE RHNERRATA DROP CONSTRAINT RHN_ERRATA_ADV_TYPE_NN; +ALTER TABLE RHNERRATA MODIFY ADVISORY_TYPE NOT NULL; + +-- +-- RHNERRATABUGLISTTMP +-- +ALTER TABLE RHNERRATABUGLISTTMP DROP CONSTRAINT RHN_ERRATA_BUGLISTTMP_BID_= NN; +ALTER TABLE RHNERRATABUGLISTTMP MODIFY BUG_ID NOT NULL; + +-- +-- RHNERRATABUGLISTTMP +-- +ALTER TABLE RHNERRATABUGLISTTMP DROP CONSTRAINT RHN_ERRATA_BUGLISTTMP_C_NN; +ALTER TABLE RHNERRATABUGLISTTMP MODIFY CREATED NOT NULL; + +-- +-- RHNERRATABUGLISTTMP +-- +ALTER TABLE RHNERRATABUGLISTTMP DROP CONSTRAINT RHN_ERRATA_BUGLISTTMP_EID_= NN; +ALTER TABLE RHNERRATABUGLISTTMP MODIFY ERRATA_ID NOT NULL; + +-- +-- RHNERRATABUGLISTTMP +-- +ALTER TABLE RHNERRATABUGLISTTMP DROP CONSTRAINT RHN_ERRATA_BUGLISTTMP_M_NN; +ALTER TABLE RHNERRATABUGLISTTMP MODIFY MODIFIED NOT NULL; + +-- +-- RHNERRATABUGLIST +-- +ALTER TABLE RHNERRATABUGLIST DROP CONSTRAINT RHN_ERRATA_BUGLIST_BUG_NN; +ALTER TABLE RHNERRATABUGLIST MODIFY BUG_ID NOT NULL; + +-- +-- RHNERRATABUGLIST +-- +ALTER TABLE RHNERRATABUGLIST DROP CONSTRAINT RHN_ERRATA_BUGLIST_CREATED_NN; +ALTER TABLE RHNERRATABUGLIST MODIFY CREATED NOT NULL; + +-- +-- RHNERRATABUGLIST +-- +ALTER TABLE RHNERRATABUGLIST DROP CONSTRAINT RHN_ERRATA_BUGLIST_ERRATA_NN; +ALTER TABLE RHNERRATABUGLIST MODIFY ERRATA_ID NOT NULL; + +-- +-- RHNERRATABUGLIST +-- +ALTER TABLE RHNERRATABUGLIST DROP CONSTRAINT RHN_ERRATA_BUGLIST_MODIFIED_N= N; +ALTER TABLE RHNERRATABUGLIST MODIFY MODIFIED NOT NULL; + +-- +-- RHNERRATA +-- +ALTER TABLE RHNERRATA DROP CONSTRAINT RHN_ERRATA_CREATED_NN; +ALTER TABLE RHNERRATA MODIFY CREATED NOT NULL; + +-- +-- RHNERRATA +-- +ALTER TABLE RHNERRATA DROP CONSTRAINT RHN_ERRATA_ID_NN; +ALTER TABLE RHNERRATA MODIFY ID NOT NULL; + +-- +-- RHNERRATA +-- +ALTER TABLE RHNERRATA DROP CONSTRAINT RHN_ERRATA_ISSUE_NN; +ALTER TABLE RHNERRATA MODIFY ISSUE_DATE NOT NULL; + +-- +-- RHNERRATA +-- +ALTER TABLE RHNERRATA DROP CONSTRAINT RHN_ERRATA_LAST_MOD_NN; +ALTER TABLE RHNERRATA MODIFY LAST_MODIFIED NOT NULL; + +-- +-- RHNERRATA +-- +ALTER TABLE RHNERRATA DROP CONSTRAINT RHN_ERRATA_MODIFIED_NN; +ALTER TABLE RHNERRATA MODIFY MODIFIED NOT NULL; + +-- +-- RHNERRATA +-- +ALTER TABLE RHNERRATA DROP CONSTRAINT RHN_ERRATA_PRODUCT_NN; +ALTER TABLE RHNERRATA MODIFY PRODUCT NOT NULL; + +-- +-- RHNERRATASEVERITY +-- +ALTER TABLE RHNERRATASEVERITY DROP CONSTRAINT RHN_ERRATA_SEV_ID_NN; +ALTER TABLE RHNERRATASEVERITY MODIFY ID NOT NULL; + +-- +-- RHNERRATASEVERITY +-- +ALTER TABLE RHNERRATASEVERITY DROP CONSTRAINT RHN_ERRATA_SEV_LABEL_NN; +ALTER TABLE RHNERRATASEVERITY MODIFY LABEL NOT NULL; + +-- +-- RHNERRATASEVERITY +-- +ALTER TABLE RHNERRATASEVERITY DROP CONSTRAINT RHN_ERRATA_SEV_RANK_NN; +ALTER TABLE RHNERRATASEVERITY MODIFY RANK NOT NULL; + +-- +-- RHNERRATA +-- +ALTER TABLE RHNERRATA DROP CONSTRAINT RHN_ERRATA_SOLUTION_NN; +ALTER TABLE RHNERRATA MODIFY SOLUTION NOT NULL; + +-- +-- RHNERRATA +-- +ALTER TABLE RHNERRATA DROP CONSTRAINT RHN_ERRATA_SYNOPSIS_NN; +ALTER TABLE RHNERRATA MODIFY SYNOPSIS NOT NULL; + +-- +-- RHNERRATA +-- +ALTER TABLE RHNERRATA DROP CONSTRAINT RHN_ERRATA_UPDATE_NN; +ALTER TABLE RHNERRATA MODIFY UPDATE_DATE NOT NULL; + +-- +-- RHNERRATACVE +-- +ALTER TABLE RHNERRATACVE DROP CONSTRAINT RHN_ERR_CVE_CID_NN; +ALTER TABLE RHNERRATACVE MODIFY CVE_ID NOT NULL; + +-- +-- RHNERRATACVE +-- +ALTER TABLE RHNERRATACVE DROP CONSTRAINT RHN_ERR_CVE_CREATED_NN; +ALTER TABLE RHNERRATACVE MODIFY CREATED NOT NULL; + +-- +-- RHNERRATACVE +-- +ALTER TABLE RHNERRATACVE DROP CONSTRAINT RHN_ERR_CVE_EID_NN; +ALTER TABLE RHNERRATACVE MODIFY ERRATA_ID NOT NULL; + +-- +-- RHNERRATACVE +-- +ALTER TABLE RHNERRATACVE DROP CONSTRAINT RHN_ERR_CVE_MODIFIED_NN; +ALTER TABLE RHNERRATACVE MODIFY MODIFIED NOT NULL; + +-- +-- RHNERRATAKEYWORDTMP +-- +ALTER TABLE RHNERRATAKEYWORDTMP DROP CONSTRAINT RHN_ERR_KEYWORDTMP_CREATED= _NN; +ALTER TABLE RHNERRATAKEYWORDTMP MODIFY CREATED NOT NULL; + +-- +-- RHNERRATAKEYWORDTMP +-- +ALTER TABLE RHNERRATAKEYWORDTMP DROP CONSTRAINT RHN_ERR_KEYWORDTMP_EID_NN; +ALTER TABLE RHNERRATAKEYWORDTMP MODIFY ERRATA_ID NOT NULL; + +-- +-- RHNERRATAKEYWORDTMP +-- +ALTER TABLE RHNERRATAKEYWORDTMP DROP CONSTRAINT RHN_ERR_KEYWORDTMP_MODIFIE= D_NN; +ALTER TABLE RHNERRATAKEYWORDTMP MODIFY MODIFIED NOT NULL; + +-- +-- RHNERRATAKEYWORD +-- +ALTER TABLE RHNERRATAKEYWORD DROP CONSTRAINT RHN_ERR_KEYWORD_CREATED_NN; +ALTER TABLE RHNERRATAKEYWORD MODIFY CREATED NOT NULL; + +-- +-- RHNERRATAKEYWORD +-- +ALTER TABLE RHNERRATAKEYWORD DROP CONSTRAINT RHN_ERR_KEYWORD_EID_NN; +ALTER TABLE RHNERRATAKEYWORD MODIFY ERRATA_ID NOT NULL; + +-- +-- RHNERRATAKEYWORD +-- +ALTER TABLE RHNERRATAKEYWORD DROP CONSTRAINT RHN_ERR_KEYWORD_MODIFIED_NN; +ALTER TABLE RHNERRATAKEYWORD MODIFY MODIFIED NOT NULL; + +-- +-- RHNERRATAPACKAGETMP +-- +ALTER TABLE RHNERRATAPACKAGETMP DROP CONSTRAINT RHN_ERR_PKGTMP_CREATED_NN; +ALTER TABLE RHNERRATAPACKAGETMP MODIFY CREATED NOT NULL; + +-- +-- RHNERRATAPACKAGETMP +-- +ALTER TABLE RHNERRATAPACKAGETMP DROP CONSTRAINT RHN_ERR_PKGTMP_EID_NN; +ALTER TABLE RHNERRATAPACKAGETMP MODIFY ERRATA_ID NOT NULL; + +-- +-- RHNERRATAPACKAGETMP +-- +ALTER TABLE RHNERRATAPACKAGETMP DROP CONSTRAINT RHN_ERR_PKGTMP_MODIFIED_NN; +ALTER TABLE RHNERRATAPACKAGETMP MODIFY MODIFIED NOT NULL; + +-- +-- RHNERRATAPACKAGETMP +-- +ALTER TABLE RHNERRATAPACKAGETMP DROP CONSTRAINT RHN_ERR_PKGTMP_PID_NN; +ALTER TABLE RHNERRATAPACKAGETMP MODIFY PACKAGE_ID NOT NULL; + +-- +-- RHNERRATAPACKAGE +-- +ALTER TABLE RHNERRATAPACKAGE DROP CONSTRAINT RHN_ERR_PKG_CREATED_NN; +ALTER TABLE RHNERRATAPACKAGE MODIFY CREATED NOT NULL; + +-- +-- RHNERRATAPACKAGE +-- +ALTER TABLE RHNERRATAPACKAGE DROP CONSTRAINT RHN_ERR_PKG_EID_NN; +ALTER TABLE RHNERRATAPACKAGE MODIFY ERRATA_ID NOT NULL; + +-- +-- RHNERRATAPACKAGE +-- +ALTER TABLE RHNERRATAPACKAGE DROP CONSTRAINT RHN_ERR_PKG_MODIFIED_NN; +ALTER TABLE RHNERRATAPACKAGE MODIFY MODIFIED NOT NULL; + +-- +-- RHNERRATAPACKAGE +-- +ALTER TABLE RHNERRATAPACKAGE DROP CONSTRAINT RHN_ERR_PKG_PID_NN; +ALTER TABLE RHNERRATAPACKAGE MODIFY PACKAGE_ID NOT NULL; + +-- +-- RHNEXCEPTION +-- +ALTER TABLE RHNEXCEPTION DROP CONSTRAINT RHN_EXC_ID_NN; +ALTER TABLE RHNEXCEPTION MODIFY ID NOT NULL; + +-- +-- RHNEXCEPTION +-- +ALTER TABLE RHNEXCEPTION DROP CONSTRAINT RHN_EXC_LABEL_NN; +ALTER TABLE RHNEXCEPTION MODIFY LABEL NOT NULL; + +-- +-- RHNEXCEPTION +-- +ALTER TABLE RHNEXCEPTION DROP CONSTRAINT RHN_EXC_MSG_NN; +ALTER TABLE RHNEXCEPTION MODIFY MESSAGE NOT NULL; + +-- +-- RHNFEATURE +-- +ALTER TABLE RHNFEATURE DROP CONSTRAINT RHN_FEATURE_CREATED_NN; +ALTER TABLE RHNFEATURE MODIFY CREATED NOT NULL; + +-- +-- RHNFEATURE +-- +ALTER TABLE RHNFEATURE DROP CONSTRAINT RHN_FEATURE_LABEL_NN; +ALTER TABLE RHNFEATURE MODIFY LABEL NOT NULL; + +-- +-- RHNFEATURE +-- +ALTER TABLE RHNFEATURE DROP CONSTRAINT RHN_FEATURE_MODIFIED_NN; +ALTER TABLE RHNFEATURE MODIFY MODIFIED NOT NULL; + +-- +-- RHNFEATURE +-- +ALTER TABLE RHNFEATURE DROP CONSTRAINT RHN_FEATURE_NAME_NN; +ALTER TABLE RHNFEATURE MODIFY NAME NOT NULL; + +-- +-- RHNFILEDOWNLOAD +-- +ALTER TABLE RHNFILEDOWNLOAD DROP CONSTRAINT RHN_FILEDL_FID_NN; +ALTER TABLE RHNFILEDOWNLOAD MODIFY FILE_ID NOT NULL; + +-- +-- RHNFILEDOWNLOAD +-- +ALTER TABLE RHNFILEDOWNLOAD DROP CONSTRAINT RHN_FILEDL_LOCATION_NN; +ALTER TABLE RHNFILEDOWNLOAD MODIFY LOCATION NOT NULL; + +-- +-- RHNFILEDOWNLOAD +-- +ALTER TABLE RHNFILEDOWNLOAD DROP CONSTRAINT RHN_FILEDL_RIP_NN; +ALTER TABLE RHNFILEDOWNLOAD MODIFY REQUESTOR_IP NOT NULL; + +-- +-- RHNFILEDOWNLOAD +-- +ALTER TABLE RHNFILEDOWNLOAD DROP CONSTRAINT RHN_FILEDL_START_NN; +ALTER TABLE RHNFILEDOWNLOAD MODIFY START_TIME NOT NULL; + +-- +-- RHNFILELIST +-- +ALTER TABLE RHNFILELIST DROP CONSTRAINT RHN_FILELIST_CREAT_NN; +ALTER TABLE RHNFILELIST MODIFY CREATED NOT NULL; + +-- +-- RHNFILELIST +-- +ALTER TABLE RHNFILELIST DROP CONSTRAINT RHN_FILELIST_ID_NN; +ALTER TABLE RHNFILELIST MODIFY ID NOT NULL; + +-- +-- RHNFILELIST +-- +ALTER TABLE RHNFILELIST DROP CONSTRAINT RHN_FILELIST_L_NN; +ALTER TABLE RHNFILELIST MODIFY LABEL NOT NULL; + +-- +-- RHNFILELIST +-- +ALTER TABLE RHNFILELIST DROP CONSTRAINT RHN_FILELIST_MOD_NN; +ALTER TABLE RHNFILELIST MODIFY MODIFIED NOT NULL; + +-- +-- RHNFILELIST +-- +ALTER TABLE RHNFILELIST DROP CONSTRAINT RHN_FILELIST_OID_NN; +ALTER TABLE RHNFILELIST MODIFY ORG_ID NOT NULL; + +-- +-- RHNFILELOCATION +-- +ALTER TABLE RHNFILELOCATION DROP CONSTRAINT RHN_FILELOC_FID_NN; +ALTER TABLE RHNFILELOCATION MODIFY FILE_ID NOT NULL; + +-- +-- RHNFILELOCATION +-- +ALTER TABLE RHNFILELOCATION DROP CONSTRAINT RHN_FILELOC_LOC_NN; +ALTER TABLE RHNFILELOCATION MODIFY LOCATION NOT NULL; + +-- +-- RHNFILE +-- +ALTER TABLE RHNFILE DROP CONSTRAINT RHN_FILE_CREATED_NN; +ALTER TABLE RHNFILE MODIFY CREATED NOT NULL; + +-- +-- RHNFILE +-- +ALTER TABLE RHNFILE DROP CONSTRAINT RHN_FILE_FS_NN; +ALTER TABLE RHNFILE MODIFY FILE_SIZE NOT NULL; + +-- +-- RHNFILE +-- +ALTER TABLE RHNFILE DROP CONSTRAINT RHN_FILE_ID_NN; +ALTER TABLE RHNFILE MODIFY ID NOT NULL; + +-- +-- RHNFILE +-- +ALTER TABLE RHNFILE DROP CONSTRAINT RHN_FILE_MD5SUM_NN; +ALTER TABLE RHNFILE MODIFY MD5SUM NOT NULL; + +-- +-- RHNFILE +-- +ALTER TABLE RHNFILE DROP CONSTRAINT RHN_FILE_MODIFIED_NN; +ALTER TABLE RHNFILE MODIFY MODIFIED NOT NULL; + +-- +-- RHNFILE +-- +ALTER TABLE RHNFILE DROP CONSTRAINT RHN_FILE_PATH_NN; +ALTER TABLE RHNFILE MODIFY PATH NOT NULL; + +-- +-- RHNFILELISTMEMBERS +-- +ALTER TABLE RHNFILELISTMEMBERS DROP CONSTRAINT RHN_FLMEMBERS_CFNID_NN; +ALTER TABLE RHNFILELISTMEMBERS MODIFY CONFIG_FILE_NAME_ID NOT NULL; + +-- +-- RHNFILELISTMEMBERS +-- +ALTER TABLE RHNFILELISTMEMBERS DROP CONSTRAINT RHN_FLMEMBERS_CREAT_NN; +ALTER TABLE RHNFILELISTMEMBERS MODIFY CREATED NOT NULL; + +-- +-- RHNFILELISTMEMBERS +-- +ALTER TABLE RHNFILELISTMEMBERS DROP CONSTRAINT RHN_FLMEMBERS_FLID_NN; +ALTER TABLE RHNFILELISTMEMBERS MODIFY FILE_LIST_ID NOT NULL; + +-- +-- RHNFILELISTMEMBERS +-- +ALTER TABLE RHNFILELISTMEMBERS DROP CONSTRAINT RHN_FLMEMBERS_MOD_NN; +ALTER TABLE RHNFILELISTMEMBERS MODIFY MODIFIED NOT NULL; + +-- +-- RHNGRAILCOMPONENTCHOICES +-- +ALTER TABLE RHNGRAILCOMPONENTCHOICES DROP CONSTRAINT RHN_GRAIL_COMP_CH_MOD= E_NN; +ALTER TABLE RHNGRAILCOMPONENTCHOICES MODIFY COMPONENT_MODE NOT NULL; + +-- +-- RHNGRAILCOMPONENTCHOICES +-- +ALTER TABLE RHNGRAILCOMPONENTCHOICES DROP CONSTRAINT RHN_GRAIL_COMP_CH_NN; +ALTER TABLE RHNGRAILCOMPONENTCHOICES MODIFY USER_ID NOT NULL; + +-- +-- RHNGRAILCOMPONENTCHOICES +-- +ALTER TABLE RHNGRAILCOMPONENTCHOICES DROP CONSTRAINT RHN_GRAIL_COMP_CH_ORD= ER_NN; +ALTER TABLE RHNGRAILCOMPONENTCHOICES MODIFY ORDERING NOT NULL; + +-- +-- RHNGRAILCOMPONENTCHOICES +-- +ALTER TABLE RHNGRAILCOMPONENTCHOICES DROP CONSTRAINT RHN_GRAIL_COMP_CH_PKG= _NN; +ALTER TABLE RHNGRAILCOMPONENTCHOICES MODIFY COMPONENT_PKG NOT NULL; + +-- +-- RHNGRAILCOMPONENTS +-- +ALTER TABLE RHNGRAILCOMPONENTS DROP CONSTRAINT RHN_GRAIL_COMP_MODE_NN; +ALTER TABLE RHNGRAILCOMPONENTS MODIFY COMPONENT_MODE NOT NULL; + +-- +-- RHNGRAILCOMPONENTS +-- +ALTER TABLE RHNGRAILCOMPONENTS DROP CONSTRAINT RHN_GRAIL_COMP_PKG_NN; +ALTER TABLE RHNGRAILCOMPONENTS MODIFY COMPONENT_PKG NOT NULL; + +-- +-- RHN_SERVER_MONITORING_INFO +-- +ALTER TABLE RHN_SERVER_MONITORING_INFO DROP CONSTRAINT RHN_HOST_RECID_NN; +ALTER TABLE RHN_SERVER_MONITORING_INFO MODIFY RECID NOT NULL; + +-- +-- RHN_HOST_CHECK_SUITES +-- +ALTER TABLE RHN_HOST_CHECK_SUITES DROP CONSTRAINT RHN_HSTCK_HOST_PROBE_NN; +ALTER TABLE RHN_HOST_CHECK_SUITES MODIFY HOST_PROBE_ID NOT NULL; + +-- +-- RHN_HOST_CHECK_SUITES +-- +ALTER TABLE RHN_HOST_CHECK_SUITES DROP CONSTRAINT RHN_HSTCK_SUITE_ID_NN; +ALTER TABLE RHN_HOST_CHECK_SUITES MODIFY SUITE_ID NOT NULL; + +-- +-- RHN_HOST_PROBE +-- +ALTER TABLE RHN_HOST_PROBE DROP CONSTRAINT RHN_HSTPB_HOST_ID_NN; +ALTER TABLE RHN_HOST_PROBE MODIFY HOST_ID NOT NULL; + +-- +-- RHN_HOST_PROBE +-- +ALTER TABLE RHN_HOST_PROBE DROP CONSTRAINT RHN_HSTPB_PROBE_ID_NN; +ALTER TABLE RHN_HOST_PROBE MODIFY PROBE_ID NOT NULL; + +-- +-- RHN_HOST_PROBE +-- +ALTER TABLE RHN_HOST_PROBE DROP CONSTRAINT RHN_HSTPB_PROBE_TYPE_NN; +ALTER TABLE RHN_HOST_PROBE MODIFY PROBE_TYPE NOT NULL; + +-- +-- RHN_HOST_PROBE +-- +ALTER TABLE RHN_HOST_PROBE DROP CONSTRAINT RHN_HSTPB_SAT_CL_ID_NN; +ALTER TABLE RHN_HOST_PROBE MODIFY SAT_CLUSTER_ID NOT NULL; + +-- +-- RHNINFOPANE +-- +ALTER TABLE RHNINFOPANE DROP CONSTRAINT RHN_INFO_PANE_LABL_NN; +ALTER TABLE RHNINFOPANE MODIFY LABEL NOT NULL; + +-- +-- RHNKICKSTARTCOMMANDNAME +-- +ALTER TABLE RHNKICKSTARTCOMMANDNAME DROP CONSTRAINT RHN_KSCOMMANDNAME_ID_N= N; +ALTER TABLE RHNKICKSTARTCOMMANDNAME MODIFY ID NOT NULL; + +-- +-- RHNKICKSTARTCOMMANDNAME +-- +ALTER TABLE RHNKICKSTARTCOMMANDNAME DROP CONSTRAINT RHN_KSCOMMANDNAME_REQR= D_NN; +ALTER TABLE RHNKICKSTARTCOMMANDNAME MODIFY REQUIRED NOT NULL; + +-- +-- RHNKICKSTARTCOMMANDNAME +-- +ALTER TABLE RHNKICKSTARTCOMMANDNAME DROP CONSTRAINT RHN_KSCOMMANDNAME_SORT= ORDR_NN; +ALTER TABLE RHNKICKSTARTCOMMANDNAME MODIFY SORT_ORDER NOT NULL; + +-- +-- RHNKICKSTARTCOMMANDNAME +-- +ALTER TABLE RHNKICKSTARTCOMMANDNAME DROP CONSTRAINT RHN_KSCOMMANDNAME_USES= _ARGS_NN; +ALTER TABLE RHNKICKSTARTCOMMANDNAME MODIFY USES_ARGUMENTS NOT NULL; + +-- +-- RHNKICKSTARTCOMMAND +-- +ALTER TABLE RHNKICKSTARTCOMMAND DROP CONSTRAINT RHN_KSCOMMAND_CREATED_NN; +ALTER TABLE RHNKICKSTARTCOMMAND MODIFY CREATED NOT NULL; + +-- +-- RHNKICKSTARTCOMMAND +-- +ALTER TABLE RHNKICKSTARTCOMMAND DROP CONSTRAINT RHN_KSCOMMAND_KCNID_NN; +ALTER TABLE RHNKICKSTARTCOMMAND MODIFY KS_COMMAND_NAME_ID NOT NULL; + +-- +-- RHNKICKSTARTCOMMAND +-- +ALTER TABLE RHNKICKSTARTCOMMAND DROP CONSTRAINT RHN_KSCOMMAND_KSID_NN; +ALTER TABLE RHNKICKSTARTCOMMAND MODIFY KICKSTART_ID NOT NULL; + +-- +-- RHNKICKSTARTCOMMAND +-- +ALTER TABLE RHNKICKSTARTCOMMAND DROP CONSTRAINT RHN_KSCOMMAND_MODIFIED_NN; +ALTER TABLE RHNKICKSTARTCOMMAND MODIFY MODIFIED NOT NULL; + +-- +-- RHNKICKSTARTCOMMANDNAME +-- +ALTER TABLE RHNKICKSTARTCOMMANDNAME DROP CONSTRAINT RHN_KSCOMMAND_NAME_NN; +ALTER TABLE RHNKICKSTARTCOMMANDNAME MODIFY NAME NOT NULL; + +-- +-- RHNKICKSTARTDEFAULTREGTOKEN +-- +ALTER TABLE RHNKICKSTARTDEFAULTREGTOKEN DROP CONSTRAINT RHN_KSDRT_CREAT_NN; +ALTER TABLE RHNKICKSTARTDEFAULTREGTOKEN MODIFY CREATED NOT NULL; + +-- +-- RHNKICKSTARTDEFAULTREGTOKEN +-- +ALTER TABLE RHNKICKSTARTDEFAULTREGTOKEN DROP CONSTRAINT RHN_KSDRT_KSID_NN; +ALTER TABLE RHNKICKSTARTDEFAULTREGTOKEN MODIFY KICKSTART_ID NOT NULL; + +-- +-- RHNKICKSTARTDEFAULTREGTOKEN +-- +ALTER TABLE RHNKICKSTARTDEFAULTREGTOKEN DROP CONSTRAINT RHN_KSDRT_MOD_NN; +ALTER TABLE RHNKICKSTARTDEFAULTREGTOKEN MODIFY MODIFIED NOT NULL; + +-- +-- RHNKICKSTARTDEFAULTREGTOKEN +-- +ALTER TABLE RHNKICKSTARTDEFAULTREGTOKEN DROP CONSTRAINT RHN_KSDRT_RTID_NN; +ALTER TABLE RHNKICKSTARTDEFAULTREGTOKEN MODIFY REGTOKEN_ID NOT NULL; + +-- +-- RHNKICKSTARTDEFAULTS +-- +ALTER TABLE RHNKICKSTARTDEFAULTS DROP CONSTRAINT RHN_KSD_CMF_NN; +ALTER TABLE RHNKICKSTARTDEFAULTS MODIFY CFG_MANAGEMENT_FLAG NOT NULL; + +-- +-- RHNKICKSTARTDEFAULTS +-- +ALTER TABLE RHNKICKSTARTDEFAULTS DROP CONSTRAINT RHN_KSD_CREATED_NN; +ALTER TABLE RHNKICKSTARTDEFAULTS MODIFY CREATED NOT NULL; + +-- +-- RHNKICKSTARTDEFAULTS +-- +ALTER TABLE RHNKICKSTARTDEFAULTS DROP CONSTRAINT RHN_KSD_KSID_NN; +ALTER TABLE RHNKICKSTARTDEFAULTS MODIFY KICKSTART_ID NOT NULL; + +-- +-- RHNKICKSTARTDEFAULTS +-- +ALTER TABLE RHNKICKSTARTDEFAULTS DROP CONSTRAINT RHN_KSD_KSTID_NN; +ALTER TABLE RHNKICKSTARTDEFAULTS MODIFY KSTREE_ID NOT NULL; + +-- +-- RHNKICKSTARTDEFAULTS +-- +ALTER TABLE RHNKICKSTARTDEFAULTS DROP CONSTRAINT RHN_KSD_KVT_NN; +ALTER TABLE RHNKICKSTARTDEFAULTS MODIFY VIRTUALIZATION_TYPE NOT NULL; + +-- +-- RHNKICKSTARTDEFAULTS +-- +ALTER TABLE RHNKICKSTARTDEFAULTS DROP CONSTRAINT RHN_KSD_MODIFIED_NN; +ALTER TABLE RHNKICKSTARTDEFAULTS MODIFY MODIFIED NOT NULL; + +-- +-- RHNKICKSTARTDEFAULTS +-- +ALTER TABLE RHNKICKSTARTDEFAULTS DROP CONSTRAINT RHN_KSD_RMF_NN; +ALTER TABLE RHNKICKSTARTDEFAULTS MODIFY REMOTE_COMMAND_FLAG NOT NULL; + +-- +-- RHNKSINSTALLTYPE +-- +ALTER TABLE RHNKSINSTALLTYPE DROP CONSTRAINT RHN_KSINSTALLTYPE_CREATED_NN; +ALTER TABLE RHNKSINSTALLTYPE MODIFY CREATED NOT NULL; + +-- +-- RHNKSINSTALLTYPE +-- +ALTER TABLE RHNKSINSTALLTYPE DROP CONSTRAINT RHN_KSINSTALLTYPE_ID_NN; +ALTER TABLE RHNKSINSTALLTYPE MODIFY ID NOT NULL; + +-- +-- RHNKSINSTALLTYPE +-- +ALTER TABLE RHNKSINSTALLTYPE DROP CONSTRAINT RHN_KSINSTALLTYPE_LABEL_NN; +ALTER TABLE RHNKSINSTALLTYPE MODIFY LABEL NOT NULL; + +-- +-- RHNKSINSTALLTYPE +-- +ALTER TABLE RHNKSINSTALLTYPE DROP CONSTRAINT RHN_KSINSTALLTYPE_MOD_NN; +ALTER TABLE RHNKSINSTALLTYPE MODIFY MODIFIED NOT NULL; + +-- +-- RHNKSINSTALLTYPE +-- +ALTER TABLE RHNKSINSTALLTYPE DROP CONSTRAINT RHN_KSINSTALLTYPE_NAME_NN; +ALTER TABLE RHNKSINSTALLTYPE MODIFY NAME NOT NULL; + +-- +-- RHNKICKSTARTIPRANGE +-- +ALTER TABLE RHNKICKSTARTIPRANGE DROP CONSTRAINT RHN_KSIP_CREATED_NN; +ALTER TABLE RHNKICKSTARTIPRANGE MODIFY CREATED NOT NULL; + +-- +-- RHNKICKSTARTIPRANGE +-- +ALTER TABLE RHNKICKSTARTIPRANGE DROP CONSTRAINT RHN_KSIP_KSID_NN; +ALTER TABLE RHNKICKSTARTIPRANGE MODIFY KICKSTART_ID NOT NULL; + +-- +-- RHNKICKSTARTIPRANGE +-- +ALTER TABLE RHNKICKSTARTIPRANGE DROP CONSTRAINT RHN_KSIP_MAX_NN; +ALTER TABLE RHNKICKSTARTIPRANGE MODIFY MAX NOT NULL; + +-- +-- RHNKICKSTARTIPRANGE +-- +ALTER TABLE RHNKICKSTARTIPRANGE DROP CONSTRAINT RHN_KSIP_MIN_NN; +ALTER TABLE RHNKICKSTARTIPRANGE MODIFY MIN NOT NULL; + +-- +-- RHNKICKSTARTIPRANGE +-- +ALTER TABLE RHNKICKSTARTIPRANGE DROP CONSTRAINT RHN_KSIP_MODIFIED_NN; +ALTER TABLE RHNKICKSTARTIPRANGE MODIFY MODIFIED NOT NULL; + +-- +-- RHNKICKSTARTIPRANGE +-- +ALTER TABLE RHNKICKSTARTIPRANGE DROP CONSTRAINT RHN_KSIP_OID_NN; +ALTER TABLE RHNKICKSTARTIPRANGE MODIFY ORG_ID NOT NULL; + +-- +-- RHNKICKSTARTPACKAGE +-- +ALTER TABLE RHNKICKSTARTPACKAGE DROP CONSTRAINT RHN_KSPACKAGE_CREATED_NN; +ALTER TABLE RHNKICKSTARTPACKAGE MODIFY CREATED NOT NULL; + +-- +-- RHNKICKSTARTPACKAGE +-- +ALTER TABLE RHNKICKSTARTPACKAGE DROP CONSTRAINT RHN_KSPACKAGE_KSID_NN; +ALTER TABLE RHNKICKSTARTPACKAGE MODIFY KICKSTART_ID NOT NULL; + +-- +-- RHNKICKSTARTPACKAGE +-- +ALTER TABLE RHNKICKSTARTPACKAGE DROP CONSTRAINT RHN_KSPACKAGE_MODIFIED_NN; +ALTER TABLE RHNKICKSTARTPACKAGE MODIFY MODIFIED NOT NULL; + +-- +-- RHNKICKSTARTPACKAGE +-- +ALTER TABLE RHNKICKSTARTPACKAGE DROP CONSTRAINT RHN_KSPACKAGE_PNID_NN; +ALTER TABLE RHNKICKSTARTPACKAGE MODIFY PACKAGE_NAME_ID NOT NULL; + +-- +-- RHNKICKSTARTPRESERVEFILELIST +-- +ALTER TABLE RHNKICKSTARTPRESERVEFILELIST DROP CONSTRAINT RHN_KSPRESERVEFL_= CREAT_NN; +ALTER TABLE RHNKICKSTARTPRESERVEFILELIST MODIFY CREATED NOT NULL; + +-- +-- RHNKICKSTARTPRESERVEFILELIST +-- +ALTER TABLE RHNKICKSTARTPRESERVEFILELIST DROP CONSTRAINT RHN_KSPRESERVEFL_= FLID_NN; +ALTER TABLE RHNKICKSTARTPRESERVEFILELIST MODIFY FILE_LIST_ID NOT NULL; + +-- +-- RHNKICKSTARTPRESERVEFILELIST +-- +ALTER TABLE RHNKICKSTARTPRESERVEFILELIST DROP CONSTRAINT RHN_KSPRESERVEFL_= KSID_NN; +ALTER TABLE RHNKICKSTARTPRESERVEFILELIST MODIFY KICKSTART_ID NOT NULL; + +-- +-- RHNKICKSTARTPRESERVEFILELIST +-- +ALTER TABLE RHNKICKSTARTPRESERVEFILELIST DROP CONSTRAINT RHN_KSPRESERVEFL_= MOD_NN; +ALTER TABLE RHNKICKSTARTPRESERVEFILELIST MODIFY MODIFIED NOT NULL; + +-- +-- RHNKICKSTARTSCRIPT +-- +ALTER TABLE RHNKICKSTARTSCRIPT DROP CONSTRAINT RHN_KSSCRIPT_CHROOT_NN; +ALTER TABLE RHNKICKSTARTSCRIPT MODIFY CHROOT NOT NULL; + +-- +-- RHNKICKSTARTSCRIPT +-- +ALTER TABLE RHNKICKSTARTSCRIPT DROP CONSTRAINT RHN_KSSCRIPT_CREAT_NN; +ALTER TABLE RHNKICKSTARTSCRIPT MODIFY CREATED NOT NULL; + +-- +-- RHNKICKSTARTSCRIPT +-- +ALTER TABLE RHNKICKSTARTSCRIPT DROP CONSTRAINT RHN_KSSCRIPT_ID_NN; +ALTER TABLE RHNKICKSTARTSCRIPT MODIFY ID NOT NULL; + +-- +-- RHNKICKSTARTSCRIPT +-- +ALTER TABLE RHNKICKSTARTSCRIPT DROP CONSTRAINT RHN_KSSCRIPT_KSID_NN; +ALTER TABLE RHNKICKSTARTSCRIPT MODIFY KICKSTART_ID NOT NULL; + +-- +-- RHNKICKSTARTSCRIPT +-- +ALTER TABLE RHNKICKSTARTSCRIPT DROP CONSTRAINT RHN_KSSCRIPT_MOD_NN; +ALTER TABLE RHNKICKSTARTSCRIPT MODIFY MODIFIED NOT NULL; + +-- +-- RHNKICKSTARTSCRIPT +-- +ALTER TABLE RHNKICKSTARTSCRIPT DROP CONSTRAINT RHN_KSSCRIPT_POS_NN; +ALTER TABLE RHNKICKSTARTSCRIPT MODIFY POSITION NOT NULL; + +-- +-- RHNKICKSTARTSCRIPT +-- +ALTER TABLE RHNKICKSTARTSCRIPT DROP CONSTRAINT RHN_KSSCRIPT_RAW_NN; +ALTER TABLE RHNKICKSTARTSCRIPT MODIFY RAW_SCRIPT NOT NULL; + +-- +-- RHNKICKSTARTSCRIPT +-- +ALTER TABLE RHNKICKSTARTSCRIPT DROP CONSTRAINT RHN_KSSCRIPT_ST_NN; +ALTER TABLE RHNKICKSTARTSCRIPT MODIFY SCRIPT_TYPE NOT NULL; + +-- +-- RHNKICKSTARTSESSION +-- +ALTER TABLE RHNKICKSTARTSESSION DROP CONSTRAINT RHN_KSS_KVT_NN; +ALTER TABLE RHNKICKSTARTSESSION MODIFY VIRTUALIZATION_TYPE NOT NULL; + +-- +-- RHNKSTREEFILE +-- +ALTER TABLE RHNKSTREEFILE DROP CONSTRAINT RHN_KSTREEFILE_CREATED_NN; +ALTER TABLE RHNKSTREEFILE MODIFY CREATED NOT NULL; + +-- +-- RHNKSTREEFILE +-- +ALTER TABLE RHNKSTREEFILE DROP CONSTRAINT RHN_KSTREEFILE_FILE_SIZE_NN; +ALTER TABLE RHNKSTREEFILE MODIFY FILE_SIZE NOT NULL; + +-- +-- RHNKSTREEFILE +-- +ALTER TABLE RHNKSTREEFILE DROP CONSTRAINT RHN_KSTREEFILE_KID_NN; +ALTER TABLE RHNKSTREEFILE MODIFY KSTREE_ID NOT NULL; + +-- +-- RHNKSTREEFILE +-- +ALTER TABLE RHNKSTREEFILE DROP CONSTRAINT RHN_KSTREEFILE_LASTMOD_NN; +ALTER TABLE RHNKSTREEFILE MODIFY LAST_MODIFIED NOT NULL; + +-- +-- RHNKSTREEFILE +-- +ALTER TABLE RHNKSTREEFILE DROP CONSTRAINT RHN_KSTREEFILE_MD5SUM_NN; +ALTER TABLE RHNKSTREEFILE MODIFY MD5SUM NOT NULL; + +-- +-- RHNKSTREEFILE +-- +ALTER TABLE RHNKSTREEFILE DROP CONSTRAINT RHN_KSTREEFILE_MODIFIED_NN; +ALTER TABLE RHNKSTREEFILE MODIFY MODIFIED NOT NULL; + +-- +-- RHNKSTREEFILE +-- +ALTER TABLE RHNKSTREEFILE DROP CONSTRAINT RHN_KSTREEFILE_RFN_NN; +ALTER TABLE RHNKSTREEFILE MODIFY RELATIVE_FILENAME NOT NULL; + +-- +-- RHNKSTREETYPE +-- +ALTER TABLE RHNKSTREETYPE DROP CONSTRAINT RHN_KSTREETYPE_CREATED_NN; +ALTER TABLE RHNKSTREETYPE MODIFY CREATED NOT NULL; + +-- +-- RHNKSTREETYPE +-- +ALTER TABLE RHNKSTREETYPE DROP CONSTRAINT RHN_KSTREETYPE_ID_NN; +ALTER TABLE RHNKSTREETYPE MODIFY ID NOT NULL; + +-- +-- RHNKSTREETYPE +-- +ALTER TABLE RHNKSTREETYPE DROP CONSTRAINT RHN_KSTREETYPE_LABEL_NN; +ALTER TABLE RHNKSTREETYPE MODIFY LABEL NOT NULL; + +-- +-- RHNKSTREETYPE +-- +ALTER TABLE RHNKSTREETYPE DROP CONSTRAINT RHN_KSTREETYPE_MOD_NN; +ALTER TABLE RHNKSTREETYPE MODIFY MODIFIED NOT NULL; + +-- +-- RHNKSTREETYPE +-- +ALTER TABLE RHNKSTREETYPE DROP CONSTRAINT RHN_KSTREETYPE_NAME_NN; +ALTER TABLE RHNKSTREETYPE MODIFY NAME NOT NULL; + +-- +-- RHNKICKSTARTABLETREE +-- +ALTER TABLE RHNKICKSTARTABLETREE DROP CONSTRAINT RHN_KSTREE_BP_NN; +ALTER TABLE RHNKICKSTARTABLETREE MODIFY BASE_PATH NOT NULL; + +-- +-- RHNKICKSTARTABLETREE +-- +ALTER TABLE RHNKICKSTARTABLETREE DROP CONSTRAINT RHN_KSTREE_CID_NN; +ALTER TABLE RHNKICKSTARTABLETREE MODIFY CHANNEL_ID NOT NULL; + +-- +-- RHNKICKSTARTABLETREE +-- +ALTER TABLE RHNKICKSTARTABLETREE DROP CONSTRAINT RHN_KSTREE_CREATED_NN; +ALTER TABLE RHNKICKSTARTABLETREE MODIFY CREATED NOT NULL; + +-- +-- RHNKICKSTARTABLETREE +-- +ALTER TABLE RHNKICKSTARTABLETREE DROP CONSTRAINT RHN_KSTREE_ID_NN; +ALTER TABLE RHNKICKSTARTABLETREE MODIFY ID NOT NULL; + +-- +-- RHNKICKSTARTABLETREE +-- +ALTER TABLE RHNKICKSTARTABLETREE DROP CONSTRAINT RHN_KSTREE_IT_NN; +ALTER TABLE RHNKICKSTARTABLETREE MODIFY INSTALL_TYPE NOT NULL; + +-- +-- RHNKICKSTARTABLETREE +-- +ALTER TABLE RHNKICKSTARTABLETREE DROP CONSTRAINT RHN_KSTREE_KSTREETYPE_NN; +ALTER TABLE RHNKICKSTARTABLETREE MODIFY KSTREE_TYPE NOT NULL; + +-- +-- RHNKICKSTARTABLETREE +-- +ALTER TABLE RHNKICKSTARTABLETREE DROP CONSTRAINT RHN_KSTREE_LABEL_NN; +ALTER TABLE RHNKICKSTARTABLETREE MODIFY LABEL NOT NULL; + +-- +-- RHNKICKSTARTABLETREE +-- +ALTER TABLE RHNKICKSTARTABLETREE DROP CONSTRAINT RHN_KSTREE_LASTMOD_NN; +ALTER TABLE RHNKICKSTARTABLETREE MODIFY LAST_MODIFIED NOT NULL; + +-- +-- RHNKICKSTARTABLETREE +-- +ALTER TABLE RHNKICKSTARTABLETREE DROP CONSTRAINT RHN_KSTREE_MODIFIED_NN; +ALTER TABLE RHNKICKSTARTABLETREE MODIFY MODIFIED NOT NULL; + +-- +-- RHNKSDATA +-- +ALTER TABLE RHNKSDATA DROP CONSTRAINT RHN_KS_ACTIVE_NN; +ALTER TABLE RHNKSDATA MODIFY ACTIVE NOT NULL; + +-- +-- RHNKICKSTARTCHILDCHANNEL +-- +ALTER TABLE RHNKICKSTARTCHILDCHANNEL DROP CONSTRAINT RHN_KS_CC_CID_NN; +ALTER TABLE RHNKICKSTARTCHILDCHANNEL MODIFY CHANNEL_ID NOT NULL; + +-- +-- RHNKICKSTARTCHILDCHANNEL +-- +ALTER TABLE RHNKICKSTARTCHILDCHANNEL DROP CONSTRAINT RHN_KS_CC_CRE_NN; +ALTER TABLE RHNKICKSTARTCHILDCHANNEL MODIFY CREATED NOT NULL; + +-- +-- RHNKICKSTARTCHILDCHANNEL +-- +ALTER TABLE RHNKICKSTARTCHILDCHANNEL DROP CONSTRAINT RHN_KS_CC_KSD_NN; +ALTER TABLE RHNKICKSTARTCHILDCHANNEL MODIFY KSDATA_ID NOT NULL; + +-- +-- RHNKICKSTARTCHILDCHANNEL +-- +ALTER TABLE RHNKICKSTARTCHILDCHANNEL DROP CONSTRAINT RHN_KS_CC_MOD_NN; +ALTER TABLE RHNKICKSTARTCHILDCHANNEL MODIFY MODIFIED NOT NULL; + +-- +-- RHNKSDATA +-- +ALTER TABLE RHNKSDATA DROP CONSTRAINT RHN_KS_CFG_SAVE_NN; +ALTER TABLE RHNKSDATA MODIFY KSCFG NOT NULL; + +-- +-- RHNKSDATA +-- +ALTER TABLE RHNKSDATA DROP CONSTRAINT RHN_KS_CREATED_NN; +ALTER TABLE RHNKSDATA MODIFY CREATED NOT NULL; + +-- +-- RHNKSDATA +-- +ALTER TABLE RHNKSDATA DROP CONSTRAINT RHN_KS_DEFAULT_NN; +ALTER TABLE RHNKSDATA MODIFY IS_ORG_DEFAULT NOT NULL; + +-- +-- RHNKSDATA +-- +ALTER TABLE RHNKSDATA DROP CONSTRAINT RHN_KS_ID_NN; +ALTER TABLE RHNKSDATA MODIFY ID NOT NULL; + +-- +-- RHNKSDATA +-- +ALTER TABLE RHNKSDATA DROP CONSTRAINT RHN_KS_LABEL_NN; +ALTER TABLE RHNKSDATA MODIFY LABEL NOT NULL; + +-- +-- RHNKSDATA +-- +ALTER TABLE RHNKSDATA DROP CONSTRAINT RHN_KS_MODIFIED_NN; +ALTER TABLE RHNKSDATA MODIFY MODIFIED NOT NULL; + +-- +-- RHNKSDATA +-- +ALTER TABLE RHNKSDATA DROP CONSTRAINT RHN_KS_NONCHROOT_POST_NN; +ALTER TABLE RHNKSDATA MODIFY NONCHROOTPOST NOT NULL; + +-- +-- RHNKSDATA +-- +ALTER TABLE RHNKSDATA DROP CONSTRAINT RHN_KS_OID_NN; +ALTER TABLE RHNKSDATA MODIFY ORG_ID NOT NULL; + +-- +-- RHNKSDATA +-- +ALTER TABLE RHNKSDATA DROP CONSTRAINT RHN_KS_POST_LOG_NN; +ALTER TABLE RHNKSDATA MODIFY POSTLOG NOT NULL; + +-- +-- RHNKSDATA +-- +ALTER TABLE RHNKSDATA DROP CONSTRAINT RHN_KS_PRE_LOG_NN; +ALTER TABLE RHNKSDATA MODIFY PRELOG NOT NULL; + +-- +-- RHNKICKSTARTSESSIONHISTORY +-- +ALTER TABLE RHNKICKSTARTSESSIONHISTORY DROP CONSTRAINT RHN_KS_SESSIONHIST_= CREAT_NN; +ALTER TABLE RHNKICKSTARTSESSIONHISTORY MODIFY CREATED NOT NULL; + +-- +-- RHNKICKSTARTSESSIONHISTORY +-- +ALTER TABLE RHNKICKSTARTSESSIONHISTORY DROP CONSTRAINT RHN_KS_SESSIONHIST_= ID_NN; +ALTER TABLE RHNKICKSTARTSESSIONHISTORY MODIFY ID NOT NULL; + +-- +-- RHNKICKSTARTSESSIONHISTORY +-- +ALTER TABLE RHNKICKSTARTSESSIONHISTORY DROP CONSTRAINT RHN_KS_SESSIONHIST_= KSID_NN; +ALTER TABLE RHNKICKSTARTSESSIONHISTORY MODIFY KICKSTART_SESSION_ID NOT NUL= L; + +-- +-- RHNKICKSTARTSESSIONHISTORY +-- +ALTER TABLE RHNKICKSTARTSESSIONHISTORY DROP CONSTRAINT RHN_KS_SESSIONHIST_= MOD_NN; +ALTER TABLE RHNKICKSTARTSESSIONHISTORY MODIFY MODIFIED NOT NULL; + +-- +-- RHNKICKSTARTSESSIONHISTORY +-- +ALTER TABLE RHNKICKSTARTSESSIONHISTORY DROP CONSTRAINT RHN_KS_SESSIONHIST_= STAT_NN; +ALTER TABLE RHNKICKSTARTSESSIONHISTORY MODIFY STATE_ID NOT NULL; + +-- +-- RHNKICKSTARTSESSIONHISTORY +-- +ALTER TABLE RHNKICKSTARTSESSIONHISTORY DROP CONSTRAINT RHN_KS_SESSIONHIST_= TIME_NN; +ALTER TABLE RHNKICKSTARTSESSIONHISTORY MODIFY TIME NOT NULL; + +-- +-- RHNKICKSTARTSESSION +-- +ALTER TABLE RHNKICKSTARTSESSION DROP CONSTRAINT RHN_KS_SESSION_CREATED_NN; +ALTER TABLE RHNKICKSTARTSESSION MODIFY CREATED NOT NULL; + +-- +-- RHNKICKSTARTSESSION +-- +ALTER TABLE RHNKICKSTARTSESSION DROP CONSTRAINT RHN_KS_SESSION_DC_NN; +ALTER TABLE RHNKICKSTARTSESSION MODIFY DEPLOY_CONFIGS NOT NULL; + +-- +-- RHNKICKSTARTSESSION +-- +ALTER TABLE RHNKICKSTARTSESSION DROP CONSTRAINT RHN_KS_SESSION_ID_NN; +ALTER TABLE RHNKICKSTARTSESSION MODIFY ID NOT NULL; + +-- +-- RHNKICKSTARTSESSION +-- +ALTER TABLE RHNKICKSTARTSESSION DROP CONSTRAINT RHN_KS_SESSION_KSSSID_NN; +ALTER TABLE RHNKICKSTARTSESSION MODIFY STATE_ID NOT NULL; + +-- +-- RHNKICKSTARTSESSION +-- +ALTER TABLE RHNKICKSTARTSESSION DROP CONSTRAINT RHN_KS_SESSION_LAST_ACTION= _NN; +ALTER TABLE RHNKICKSTARTSESSION MODIFY LAST_ACTION NOT NULL; + +-- +-- RHNKICKSTARTSESSION +-- +ALTER TABLE RHNKICKSTARTSESSION DROP CONSTRAINT RHN_KS_SESSION_MODIFIED_NN; +ALTER TABLE RHNKICKSTARTSESSION MODIFY MODIFIED NOT NULL; + +-- +-- RHNKICKSTARTSESSION +-- +ALTER TABLE RHNKICKSTARTSESSION DROP CONSTRAINT RHN_KS_SESSION_OID_NN; +ALTER TABLE RHNKICKSTARTSESSION MODIFY ORG_ID NOT NULL; + +-- +-- RHNKICKSTARTSESSION +-- +ALTER TABLE RHNKICKSTARTSESSION DROP CONSTRAINT RHN_KS_SESSION_PFC_NN; +ALTER TABLE RHNKICKSTARTSESSION MODIFY PACKAGE_FETCH_COUNT NOT NULL; + +-- +-- RHNKICKSTARTSESSIONSTATE +-- +ALTER TABLE RHNKICKSTARTSESSIONSTATE DROP CONSTRAINT RHN_KS_SESSION_STATE_= CREAT_NN; +ALTER TABLE RHNKICKSTARTSESSIONSTATE MODIFY CREATED NOT NULL; + +-- +-- RHNKICKSTARTSESSIONSTATE +-- +ALTER TABLE RHNKICKSTARTSESSIONSTATE DROP CONSTRAINT RHN_KS_SESSION_STATE_= DESC_NN; +ALTER TABLE RHNKICKSTARTSESSIONSTATE MODIFY DESCRIPTION NOT NULL; + +-- +-- RHNKICKSTARTSESSIONSTATE +-- +ALTER TABLE RHNKICKSTARTSESSIONSTATE DROP CONSTRAINT RHN_KS_SESSION_STATE_= ID_NN; +ALTER TABLE RHNKICKSTARTSESSIONSTATE MODIFY ID NOT NULL; + +-- +-- RHNKICKSTARTSESSIONSTATE +-- +ALTER TABLE RHNKICKSTARTSESSIONSTATE DROP CONSTRAINT RHN_KS_SESSION_STATE_= LABEL_NN; +ALTER TABLE RHNKICKSTARTSESSIONSTATE MODIFY LABEL NOT NULL; + +-- +-- RHNKICKSTARTSESSIONSTATE +-- +ALTER TABLE RHNKICKSTARTSESSIONSTATE DROP CONSTRAINT RHN_KS_SESSION_STATE_= MOD_NN; +ALTER TABLE RHNKICKSTARTSESSIONSTATE MODIFY MODIFIED NOT NULL; + +-- +-- RHNKICKSTARTSESSIONSTATE +-- +ALTER TABLE RHNKICKSTARTSESSIONSTATE DROP CONSTRAINT RHN_KS_SESSION_STATE_= NAME_NN; +ALTER TABLE RHNKICKSTARTSESSIONSTATE MODIFY NAME NOT NULL; + +-- +-- RHNKICKSTARTTIMEZONE +-- +ALTER TABLE RHNKICKSTARTTIMEZONE DROP CONSTRAINT RHN_KS_TIMEZONE_ID_NN; +ALTER TABLE RHNKICKSTARTTIMEZONE MODIFY ID NOT NULL; + +-- +-- RHNKICKSTARTTIMEZONE +-- +ALTER TABLE RHNKICKSTARTTIMEZONE DROP CONSTRAINT RHN_KS_TIMEZONE_IT_NN; +ALTER TABLE RHNKICKSTARTTIMEZONE MODIFY INSTALL_TYPE NOT NULL; + +-- +-- RHNKICKSTARTTIMEZONE +-- +ALTER TABLE RHNKICKSTARTTIMEZONE DROP CONSTRAINT RHN_KS_TIMEZONE_LABEL_NN; +ALTER TABLE RHNKICKSTARTTIMEZONE MODIFY LABEL NOT NULL; + +-- +-- RHNKICKSTARTTIMEZONE +-- +ALTER TABLE RHNKICKSTARTTIMEZONE DROP CONSTRAINT RHN_KS_TIMEZONE_NAME_NN; +ALTER TABLE RHNKICKSTARTTIMEZONE MODIFY NAME NOT NULL; + +-- +-- RHNKSDATA +-- +ALTER TABLE RHNKSDATA DROP CONSTRAINT RHN_KS_TYPE_NN; +ALTER TABLE RHNKSDATA MODIFY KS_TYPE NOT NULL; + +-- +-- RHNKSDATA +-- +ALTER TABLE RHNKSDATA DROP CONSTRAINT RHN_KS_VERBOSE_UP2DATE_NN; +ALTER TABLE RHNKSDATA MODIFY VERBOSEUP2DATE NOT NULL; + +-- +-- RHNKICKSTARTVIRTUALIZATIONTYPE +-- +ALTER TABLE RHNKICKSTARTVIRTUALIZATIONTYPE DROP CONSTRAINT RHN_KVT_CREATED= _NN; +ALTER TABLE RHNKICKSTARTVIRTUALIZATIONTYPE MODIFY CREATED NOT NULL; + +-- +-- RHNKICKSTARTVIRTUALIZATIONTYPE +-- +ALTER TABLE RHNKICKSTARTVIRTUALIZATIONTYPE DROP CONSTRAINT RHN_KVT_ID_NN; +ALTER TABLE RHNKICKSTARTVIRTUALIZATIONTYPE MODIFY ID NOT NULL; + +-- +-- RHNKICKSTARTVIRTUALIZATIONTYPE +-- +ALTER TABLE RHNKICKSTARTVIRTUALIZATIONTYPE DROP CONSTRAINT RHN_KVT_LABEL_N= N; +ALTER TABLE RHNKICKSTARTVIRTUALIZATIONTYPE MODIFY LABEL NOT NULL; + +-- +-- RHNKICKSTARTVIRTUALIZATIONTYPE +-- +ALTER TABLE RHNKICKSTARTVIRTUALIZATIONTYPE DROP CONSTRAINT RHN_KVT_MODIFIE= D_NN; +ALTER TABLE RHNKICKSTARTVIRTUALIZATIONTYPE MODIFY MODIFIED NOT NULL; + +-- +-- RHNKICKSTARTVIRTUALIZATIONTYPE +-- +ALTER TABLE RHNKICKSTARTVIRTUALIZATIONTYPE DROP CONSTRAINT RHN_KVT_NAME_NN; +ALTER TABLE RHNKICKSTARTVIRTUALIZATIONTYPE MODIFY NAME NOT NULL; + +-- +-- RHN_LL_NETSAINT +-- +ALTER TABLE RHN_LL_NETSAINT DROP CONSTRAINT RHN_LLNET_NETSAINT_ID_NN; +ALTER TABLE RHN_LL_NETSAINT MODIFY NETSAINT_ID NOT NULL; + +-- +-- RHN_METRICS +-- +ALTER TABLE RHN_METRICS DROP CONSTRAINT RHN_METRIC_CMD_CLASS_NN; +ALTER TABLE RHN_METRICS MODIFY COMMAND_CLASS NOT NULL; + +-- +-- RHN_METRICS +-- +ALTER TABLE RHN_METRICS DROP CONSTRAINT RHN_METRIC_METRIC_ID_NN; +ALTER TABLE RHN_METRICS MODIFY METRIC_ID NOT NULL; + +-- +-- RHN_METRICS +-- +ALTER TABLE RHN_METRICS DROP CONSTRAINT RHN_METRIC_STORAGE_ID_NN; +ALTER TABLE RHN_METRICS MODIFY STORAGE_UNIT_ID NOT NULL; + +-- +-- RHN_INTERFACE_MONITORING +-- +ALTER TABLE RHN_INTERFACE_MONITORING DROP CONSTRAINT RHN_MONIF_SERVER_ID_N= N; +ALTER TABLE RHN_INTERFACE_MONITORING MODIFY SERVER_ID NOT NULL; + +-- +-- RHN_INTERFACE_MONITORING +-- +ALTER TABLE RHN_INTERFACE_MONITORING DROP CONSTRAINT RHN_MONIF_SERVER_NAME= _NN; +ALTER TABLE RHN_INTERFACE_MONITORING MODIFY SERVER_NAME NOT NULL; + +-- +-- RHNMONITORGRANULARITY +-- +ALTER TABLE RHNMONITORGRANULARITY DROP CONSTRAINT RHN_MONITORGRAN_ID_NN; +ALTER TABLE RHNMONITORGRANULARITY MODIFY ID NOT NULL; + +-- +-- RHNMONITORGRANULARITY +-- +ALTER TABLE RHNMONITORGRANULARITY DROP CONSTRAINT RHN_MONITORGRAN_LABEL_NN; +ALTER TABLE RHNMONITORGRANULARITY MODIFY LABEL NOT NULL; + +-- +-- RHNMONITOR +-- +ALTER TABLE RHNMONITOR DROP CONSTRAINT RHN_MONITOR_BID_NN; +ALTER TABLE RHNMONITOR MODIFY BATCH_ID NOT NULL; + +-- +-- RHNMONITOR +-- +ALTER TABLE RHNMONITOR DROP CONSTRAINT RHN_MONITOR_GRANULARITY_NN; +ALTER TABLE RHNMONITOR MODIFY GRANULARITY NOT NULL; + +-- +-- RHNMONITOR +-- +ALTER TABLE RHNMONITOR DROP CONSTRAINT RHN_MONITOR_PROBE_NN; +ALTER TABLE RHNMONITOR MODIFY PROBE_ID NOT NULL; + +-- +-- RHNMONITOR +-- +ALTER TABLE RHNMONITOR DROP CONSTRAINT RHN_MONITOR_SID_NN; +ALTER TABLE RHNMONITOR MODIFY SERVER_ID NOT NULL; + +-- +-- RHNMONITOR +-- +ALTER TABLE RHNMONITOR DROP CONSTRAINT RHN_MONITOR_TS_NN; +ALTER TABLE RHNMONITOR MODIFY TIMESTAMP NOT NULL; + +-- +-- RHN_MULTI_SCOUT_THRESHOLD +-- +ALTER TABLE RHN_MULTI_SCOUT_THRESHOLD DROP CONSTRAINT RHN_MSTHR_PROBE_ID_N= N; +ALTER TABLE RHN_MULTI_SCOUT_THRESHOLD MODIFY PROBE_ID NOT NULL; + +-- +-- RHN_METHOD_TYPES +-- +ALTER TABLE RHN_METHOD_TYPES DROP CONSTRAINT RHN_MTHTP_NOTIF_FMT_NN; +ALTER TABLE RHN_METHOD_TYPES MODIFY NOTIFICATION_FORMAT_ID NOT NULL; + +-- +-- RHN_METHOD_TYPES +-- +ALTER TABLE RHN_METHOD_TYPES DROP CONSTRAINT RHN_MTHTP_RECID_NN; +ALTER TABLE RHN_METHOD_TYPES MODIFY RECID NOT NULL; + +-- +-- RHNMESSAGE +-- +ALTER TABLE RHNMESSAGE DROP CONSTRAINT RHN_M_CREATED_NN; +ALTER TABLE RHNMESSAGE MODIFY CREATED NOT NULL; + +-- +-- RHNMESSAGE +-- +ALTER TABLE RHNMESSAGE DROP CONSTRAINT RHN_M_ID_NN; +ALTER TABLE RHNMESSAGE MODIFY ID NOT NULL; + +-- +-- RHNMESSAGE +-- +ALTER TABLE RHNMESSAGE DROP CONSTRAINT RHN_M_MODIFIED_NN; +ALTER TABLE RHNMESSAGE MODIFY MODIFIED NOT NULL; + +-- +-- RHNMESSAGE +-- +ALTER TABLE RHNMESSAGE DROP CONSTRAINT RHN_M_MT_NN; +ALTER TABLE RHNMESSAGE MODIFY MESSAGE_TYPE NOT NULL; + +-- +-- RHNMESSAGEPRIORITY +-- +ALTER TABLE RHNMESSAGEPRIORITY DROP CONSTRAINT RHN_M_PRIORITY_ID_NN; +ALTER TABLE RHNMESSAGEPRIORITY MODIFY ID NOT NULL; + +-- +-- RHNMESSAGEPRIORITY +-- +ALTER TABLE RHNMESSAGEPRIORITY DROP CONSTRAINT RHN_M_PRIORITY_LABEL_NN; +ALTER TABLE RHNMESSAGEPRIORITY MODIFY LABEL NOT NULL; + +-- +-- RHNMESSAGE +-- +ALTER TABLE RHNMESSAGE DROP CONSTRAINT RHN_M_PRIORITY_NN; +ALTER TABLE RHNMESSAGE MODIFY PRIORITY NOT NULL; + +-- +-- RHNMESSAGETYPE +-- +ALTER TABLE RHNMESSAGETYPE DROP CONSTRAINT RHN_M_TYPE_ID_NN; +ALTER TABLE RHNMESSAGETYPE MODIFY ID NOT NULL; + +-- +-- RHNMESSAGETYPE +-- +ALTER TABLE RHNMESSAGETYPE DROP CONSTRAINT RHN_M_TYPE_LABEL_NN; +ALTER TABLE RHNMESSAGETYPE MODIFY LABEL NOT NULL; + +-- +-- RHNMESSAGETYPE +-- +ALTER TABLE RHNMESSAGETYPE DROP CONSTRAINT RHN_M_TYPE_NAME_NN; +ALTER TABLE RHNMESSAGETYPE MODIFY NAME NOT NULL; + +-- +-- RHN_NOTIFSERVERS +-- +ALTER TABLE RHN_NOTIFSERVERS DROP CONSTRAINT RHN_NOTSV_RECID_NN; +ALTER TABLE RHN_NOTIFSERVERS MODIFY RECID NOT NULL; + +-- +-- RHN_NOTIFICATION_FORMATS +-- +ALTER TABLE RHN_NOTIFICATION_FORMATS DROP CONSTRAINT RHN_NTFMT_BODY_FMT_NN; +ALTER TABLE RHN_NOTIFICATION_FORMATS MODIFY BODY_FORMAT NOT NULL; + +-- +-- RHN_NOTIFICATION_FORMATS +-- +ALTER TABLE RHN_NOTIFICATION_FORMATS DROP CONSTRAINT RHN_NTFMT_DESC_NN; +ALTER TABLE RHN_NOTIFICATION_FORMATS MODIFY DESCRIPTION NOT NULL; + +-- +-- RHN_NOTIFICATION_FORMATS +-- +ALTER TABLE RHN_NOTIFICATION_FORMATS DROP CONSTRAINT RHN_NTFMT_MAX_BODY_NN; +ALTER TABLE RHN_NOTIFICATION_FORMATS MODIFY MAX_BODY_LENGTH NOT NULL; + +-- +-- RHN_NOTIFICATION_FORMATS +-- +ALTER TABLE RHN_NOTIFICATION_FORMATS DROP CONSTRAINT RHN_NTFMT_RECID_NN; +ALTER TABLE RHN_NOTIFICATION_FORMATS MODIFY RECID NOT NULL; + +-- +-- RHNORGCHANNELSETTINGSTYPE +-- +ALTER TABLE RHNORGCHANNELSETTINGSTYPE DROP CONSTRAINT RHN_OCSTNGS_TYPE_CRE= ATED_NN; +ALTER TABLE RHNORGCHANNELSETTINGSTYPE MODIFY CREATED NOT NULL; + +-- +-- RHNORGCHANNELSETTINGSTYPE +-- +ALTER TABLE RHNORGCHANNELSETTINGSTYPE DROP CONSTRAINT RHN_OCSTNGS_TYPE_ID_= NN; +ALTER TABLE RHNORGCHANNELSETTINGSTYPE MODIFY ID NOT NULL; + +-- +-- RHNORGCHANNELSETTINGSTYPE +-- +ALTER TABLE RHNORGCHANNELSETTINGSTYPE DROP CONSTRAINT RHN_OCSTNGS_TYPE_LAB= EL_NN; +ALTER TABLE RHNORGCHANNELSETTINGSTYPE MODIFY LABEL NOT NULL; + +-- +-- RHNORGCHANNELSETTINGSTYPE +-- +ALTER TABLE RHNORGCHANNELSETTINGSTYPE DROP CONSTRAINT RHN_OCSTNGS_TYPE_MOD= IFIED_NN; +ALTER TABLE RHNORGCHANNELSETTINGSTYPE MODIFY MODIFIED NOT NULL; + +-- +-- RHNORGERRATACACHEQUEUE +-- +ALTER TABLE RHNORGERRATACACHEQUEUE DROP CONSTRAINT RHN_OECQ_OID_NN; +ALTER TABLE RHNORGERRATACACHEQUEUE MODIFY ORG_ID NOT NULL; + +-- +-- RHNORGERRATACACHEQUEUE +-- +ALTER TABLE RHNORGERRATACACHEQUEUE DROP CONSTRAINT RHN_OECQ_OID_PROCESSED_= NN; +ALTER TABLE RHNORGERRATACACHEQUEUE MODIFY PROCESSED NOT NULL; + +-- +-- RHNORGERRATACACHEQUEUE +-- +ALTER TABLE RHNORGERRATACACHEQUEUE DROP CONSTRAINT RHN_OECQ_SC_NN; +ALTER TABLE RHNORGERRATACACHEQUEUE MODIFY SERVER_COUNT NOT NULL; + +-- +-- RHNORGCHANNELSETTINGS +-- +ALTER TABLE RHNORGCHANNELSETTINGS DROP CONSTRAINT RHN_ORGCSETTINGS_CID_NN; +ALTER TABLE RHNORGCHANNELSETTINGS MODIFY CHANNEL_ID NOT NULL; + +-- +-- RHNORGCHANNELSETTINGS +-- +ALTER TABLE RHNORGCHANNELSETTINGS DROP CONSTRAINT RHN_ORGCSETTINGS_CREATED= _NN; +ALTER TABLE RHNORGCHANNELSETTINGS MODIFY CREATED NOT NULL; + +-- +-- RHNORGCHANNELSETTINGS +-- +ALTER TABLE RHNORGCHANNELSETTINGS DROP CONSTRAINT RHN_ORGCSETTINGS_MODIFIE= D_NN; +ALTER TABLE RHNORGCHANNELSETTINGS MODIFY MODIFIED NOT NULL; + +-- +-- RHNORGCHANNELSETTINGS +-- +ALTER TABLE RHNORGCHANNELSETTINGS DROP CONSTRAINT RHN_ORGCSETTINGS_OID_NN; +ALTER TABLE RHNORGCHANNELSETTINGS MODIFY ORG_ID NOT NULL; + +-- +-- RHNORGCHANNELSETTINGS +-- +ALTER TABLE RHNORGCHANNELSETTINGS DROP CONSTRAINT RHN_ORGCSETTINGS_SID_NN; +ALTER TABLE RHNORGCHANNELSETTINGS MODIFY SETTING_ID NOT NULL; + +-- +-- RHNORGINFO +-- +ALTER TABLE RHNORGINFO DROP CONSTRAINT RHN_ORGINFO_CREATED_NN; +ALTER TABLE RHNORGINFO MODIFY CREATED NOT NULL; + +-- +-- RHNORGINFO +-- +ALTER TABLE RHNORGINFO DROP CONSTRAINT RHN_ORGINFO_DGT_NN; +ALTER TABLE RHNORGINFO MODIFY DEFAULT_GROUP_TYPE NOT NULL; + +-- +-- RHNORGINFO +-- +ALTER TABLE RHNORGINFO DROP CONSTRAINT RHN_ORGINFO_MODIFIED_NN; +ALTER TABLE RHNORGINFO MODIFY MODIFIED NOT NULL; + +-- +-- RHNORGINFO +-- +ALTER TABLE RHNORGINFO DROP CONSTRAINT RHN_ORGINFO_OID_NN; +ALTER TABLE RHNORGINFO MODIFY ORG_ID NOT NULL; + +-- +-- RHNORGQUOTA +-- +ALTER TABLE RHNORGQUOTA DROP CONSTRAINT RHN_ORGQUOTA_BONUS_NN; +ALTER TABLE RHNORGQUOTA MODIFY BONUS NOT NULL; + +-- +-- RHNORGQUOTA +-- +ALTER TABLE RHNORGQUOTA DROP CONSTRAINT RHN_ORGQUOTA_CREAT_NN; +ALTER TABLE RHNORGQUOTA MODIFY CREATED NOT NULL; + +-- +-- RHNORGQUOTA +-- +ALTER TABLE RHNORGQUOTA DROP CONSTRAINT RHN_ORGQUOTA_MOD_NN; +ALTER TABLE RHNORGQUOTA MODIFY MODIFIED NOT NULL; + +-- +-- RHNORGQUOTA +-- +ALTER TABLE RHNORGQUOTA DROP CONSTRAINT RHN_ORGQUOTA_OID_NN; +ALTER TABLE RHNORGQUOTA MODIFY ORG_ID NOT NULL; + +-- +-- RHNORGQUOTA +-- +ALTER TABLE RHNORGQUOTA DROP CONSTRAINT RHN_ORGQUOTA_TOTAL_NN; +ALTER TABLE RHNORGQUOTA MODIFY TOTAL NOT NULL; + +-- +-- RHNORGQUOTA +-- +ALTER TABLE RHNORGQUOTA DROP CONSTRAINT RHN_ORGQUOTA_USED_NN; +ALTER TABLE RHNORGQUOTA MODIFY USED NOT NULL; + +-- +-- RHNORGENTITLEMENTS +-- +ALTER TABLE RHNORGENTITLEMENTS DROP CONSTRAINT RHN_ORG_ENT_CRE_NN; +ALTER TABLE RHNORGENTITLEMENTS MODIFY CREATED NOT NULL; + +-- +-- RHNORGENTITLEMENTS +-- +ALTER TABLE RHNORGENTITLEMENTS DROP CONSTRAINT RHN_ORG_ENT_EID_NN; +ALTER TABLE RHNORGENTITLEMENTS MODIFY ENTITLEMENT_ID NOT NULL; + +-- +-- RHNORGENTITLEMENTS +-- +ALTER TABLE RHNORGENTITLEMENTS DROP CONSTRAINT RHN_ORG_ENT_MOD_NN; +ALTER TABLE RHNORGENTITLEMENTS MODIFY MODIFIED NOT NULL; + +-- +-- RHNORGENTITLEMENTS +-- +ALTER TABLE RHNORGENTITLEMENTS DROP CONSTRAINT RHN_ORG_ENT_NN; +ALTER TABLE RHNORGENTITLEMENTS MODIFY ORG_ID NOT NULL; + +-- +-- RHNORGENTITLEMENTTYPE +-- +ALTER TABLE RHNORGENTITLEMENTTYPE DROP CONSTRAINT RHN_ORG_ENT_TYPE_CREATED= _NN; +ALTER TABLE RHNORGENTITLEMENTTYPE MODIFY CREATED NOT NULL; + +-- +-- RHNORGENTITLEMENTTYPE +-- +ALTER TABLE RHNORGENTITLEMENTTYPE DROP CONSTRAINT RHN_ORG_ENT_TYPE_ID_NN; +ALTER TABLE RHNORGENTITLEMENTTYPE MODIFY ID NOT NULL; + +-- +-- RHNORGENTITLEMENTTYPE +-- +ALTER TABLE RHNORGENTITLEMENTTYPE DROP CONSTRAINT RHN_ORG_ENT_TYPE_LABEL_N= N; +ALTER TABLE RHNORGENTITLEMENTTYPE MODIFY LABEL NOT NULL; + +-- +-- RHNORGENTITLEMENTTYPE +-- +ALTER TABLE RHNORGENTITLEMENTTYPE DROP CONSTRAINT RHN_ORG_ENT_TYPE_MOD_NN; +ALTER TABLE RHNORGENTITLEMENTTYPE MODIFY MODIFIED NOT NULL; + +-- +-- RHNORGENTITLEMENTTYPE +-- +ALTER TABLE RHNORGENTITLEMENTTYPE DROP CONSTRAINT RHN_ORG_ENT_TYPE_NAME_NN; +ALTER TABLE RHNORGENTITLEMENTTYPE MODIFY NAME NOT NULL; + +-- +-- RHN_OS +-- +ALTER TABLE RHN_OS DROP CONSTRAINT RHN_OS000_RECID_NN; +ALTER TABLE RHN_OS MODIFY RECID NOT NULL; + +-- +-- RHN_OS_COMMANDS_XREF +-- +ALTER TABLE RHN_OS_COMMANDS_XREF DROP CONSTRAINT RHN_OSCXR_COMMANDS_ID_NN; +ALTER TABLE RHN_OS_COMMANDS_XREF MODIFY COMMANDS_ID NOT NULL; + +-- +-- RHN_OS_COMMANDS_XREF +-- +ALTER TABLE RHN_OS_COMMANDS_XREF DROP CONSTRAINT RHN_OSCXR_OS_ID_NN; +ALTER TABLE RHN_OS_COMMANDS_XREF MODIFY OS_ID NOT NULL; + +-- +-- RHNPACKAGEDELTA +-- +ALTER TABLE RHNPACKAGEDELTA DROP CONSTRAINT RHN_PACKAGEDELTA_CREATED_NN; +ALTER TABLE RHNPACKAGEDELTA MODIFY CREATED NOT NULL; + +-- +-- RHNPACKAGEDELTA +-- +ALTER TABLE RHNPACKAGEDELTA DROP CONSTRAINT RHN_PACKAGEDELTA_ID_NN; +ALTER TABLE RHNPACKAGEDELTA MODIFY ID NOT NULL; + +-- +-- RHNPACKAGEDELTA +-- +ALTER TABLE RHNPACKAGEDELTA DROP CONSTRAINT RHN_PACKAGEDELTA_LABEL_NN; +ALTER TABLE RHNPACKAGEDELTA MODIFY LABEL NOT NULL; + +-- +-- RHNPACKAGEDELTA +-- +ALTER TABLE RHNPACKAGEDELTA DROP CONSTRAINT RHN_PACKAGEDELTA_MODIFIED_NN; +ALTER TABLE RHNPACKAGEDELTA MODIFY MODIFIED NOT NULL; + +-- +-- RHNPACKAGESYNCBLACKLIST +-- +ALTER TABLE RHNPACKAGESYNCBLACKLIST DROP CONSTRAINT RHN_PACKAGESYNCBL_CREA= T_NN; +ALTER TABLE RHNPACKAGESYNCBLACKLIST MODIFY CREATED NOT NULL; + +-- +-- RHNPACKAGESYNCBLACKLIST +-- +ALTER TABLE RHNPACKAGESYNCBLACKLIST DROP CONSTRAINT RHN_PACKAGESYNCBL_MOD_= NN; +ALTER TABLE RHNPACKAGESYNCBLACKLIST MODIFY MODIFIED NOT NULL; + +-- +-- RHNPACKAGESYNCBLACKLIST +-- +ALTER TABLE RHNPACKAGESYNCBLACKLIST DROP CONSTRAINT RHN_PACKAGESYNCBL_PNID= _NN; +ALTER TABLE RHNPACKAGESYNCBLACKLIST MODIFY PACKAGE_NAME_ID NOT NULL; + +-- +-- RHNPACKAGE +-- +ALTER TABLE RHNPACKAGE DROP CONSTRAINT RHN_PACKAGE_CREATED_NN; +ALTER TABLE RHNPACKAGE MODIFY CREATED NOT NULL; + +-- +-- RHNPACKAGE +-- +ALTER TABLE RHNPACKAGE DROP CONSTRAINT RHN_PACKAGE_EID_NN; +ALTER TABLE RHNPACKAGE MODIFY EVR_ID NOT NULL; + +-- +-- RHNPACKAGEFILE +-- +ALTER TABLE RHNPACKAGEFILE DROP CONSTRAINT RHN_PACKAGE_FILE_CID_NN; +ALTER TABLE RHNPACKAGEFILE MODIFY CAPABILITY_ID NOT NULL; + +-- +-- RHNPACKAGEFILE +-- +ALTER TABLE RHNPACKAGEFILE DROP CONSTRAINT RHN_PACKAGE_FILE_CREATED_NN; +ALTER TABLE RHNPACKAGEFILE MODIFY CREATED NOT NULL; + +-- +-- RHNPACKAGEFILE +-- +ALTER TABLE RHNPACKAGEFILE DROP CONSTRAINT RHN_PACKAGE_FILE_DEVICES_NN; +ALTER TABLE RHNPACKAGEFILE MODIFY DEVICE NOT NULL; + +-- +-- RHNPACKAGEFILE +-- +ALTER TABLE RHNPACKAGEFILE DROP CONSTRAINT RHN_PACKAGE_FILE_DEV_NN; +ALTER TABLE RHNPACKAGEFILE MODIFY RDEV NOT NULL; + +-- +-- RHNPACKAGEFILE +-- +ALTER TABLE RHNPACKAGEFILE DROP CONSTRAINT RHN_PACKAGE_FILE_FLAGS_NN; +ALTER TABLE RHNPACKAGEFILE MODIFY FLAGS NOT NULL; + +-- +-- RHNPACKAGEFILE +-- +ALTER TABLE RHNPACKAGEFILE DROP CONSTRAINT RHN_PACKAGE_FILE_GROUPNAME_NN; +ALTER TABLE RHNPACKAGEFILE MODIFY GROUPNAME NOT NULL; + +-- +-- RHNPACKAGEFILE +-- +ALTER TABLE RHNPACKAGEFILE DROP CONSTRAINT RHN_PACKAGE_FILE_INODE_NN; +ALTER TABLE RHNPACKAGEFILE MODIFY INODE NOT NULL; + +-- +-- RHNPACKAGEFILE +-- +ALTER TABLE RHNPACKAGEFILE DROP CONSTRAINT RHN_PACKAGE_FILE_MODE_NN; +ALTER TABLE RHNPACKAGEFILE MODIFY FILE_MODE NOT NULL; + +-- +-- RHNPACKAGEFILE +-- +ALTER TABLE RHNPACKAGEFILE DROP CONSTRAINT RHN_PACKAGE_FILE_MODIFIED_NN; +ALTER TABLE RHNPACKAGEFILE MODIFY MODIFIED NOT NULL; + +-- +-- RHNPACKAGEFILE +-- +ALTER TABLE RHNPACKAGEFILE DROP CONSTRAINT RHN_PACKAGE_FILE_MTIME_NN; +ALTER TABLE RHNPACKAGEFILE MODIFY MTIME NOT NULL; + +-- +-- RHNPACKAGEFILE +-- +ALTER TABLE RHNPACKAGEFILE DROP CONSTRAINT RHN_PACKAGE_FILE_PID_NN; +ALTER TABLE RHNPACKAGEFILE MODIFY PACKAGE_ID NOT NULL; + +-- +-- RHNPACKAGEFILE +-- +ALTER TABLE RHNPACKAGEFILE DROP CONSTRAINT RHN_PACKAGE_FILE_SIZE_NN; +ALTER TABLE RHNPACKAGEFILE MODIFY FILE_SIZE NOT NULL; + +-- +-- RHNPACKAGEFILE +-- +ALTER TABLE RHNPACKAGEFILE DROP CONSTRAINT RHN_PACKAGE_FILE_USERNAME_NN; +ALTER TABLE RHNPACKAGEFILE MODIFY USERNAME NOT NULL; + +-- +-- RHNPACKAGEFILE +-- +ALTER TABLE RHNPACKAGEFILE DROP CONSTRAINT RHN_PACKAGE_FILE_VERIFY_NN; +ALTER TABLE RHNPACKAGEFILE MODIFY VERIFYFLAGS NOT NULL; + +-- +-- RHNPACKAGEGROUP +-- +ALTER TABLE RHNPACKAGEGROUP DROP CONSTRAINT RHN_PACKAGE_GROUP_CREATED_NN; +ALTER TABLE RHNPACKAGEGROUP MODIFY CREATED NOT NULL; + +-- +-- RHNPACKAGEGROUP +-- +ALTER TABLE RHNPACKAGEGROUP DROP CONSTRAINT RHN_PACKAGE_GROUP_ID_NN; +ALTER TABLE RHNPACKAGEGROUP MODIFY ID NOT NULL; + +-- +-- RHNPACKAGEGROUP +-- +ALTER TABLE RHNPACKAGEGROUP DROP CONSTRAINT RHN_PACKAGE_GROUP_MODIFIED_NN; +ALTER TABLE RHNPACKAGEGROUP MODIFY MODIFIED NOT NULL; + +-- +-- RHNPACKAGEGROUP +-- +ALTER TABLE RHNPACKAGEGROUP DROP CONSTRAINT RHN_PACKAGE_GROUP_NAME_NN; +ALTER TABLE RHNPACKAGEGROUP MODIFY NAME NOT NULL; + +-- +-- RHNPACKAGE +-- +ALTER TABLE RHNPACKAGE DROP CONSTRAINT RHN_PACKAGE_HE_NN; +ALTER TABLE RHNPACKAGE MODIFY HEADER_END NOT NULL; + +-- +-- RHNPACKAGE +-- +ALTER TABLE RHNPACKAGE DROP CONSTRAINT RHN_PACKAGE_HS_NN; +ALTER TABLE RHNPACKAGE MODIFY HEADER_START NOT NULL; + +-- +-- RHNPACKAGE +-- +ALTER TABLE RHNPACKAGE DROP CONSTRAINT RHN_PACKAGE_ID_NN; +ALTER TABLE RHNPACKAGE MODIFY ID NOT NULL; + +-- +-- RHNPACKAGE +-- +ALTER TABLE RHNPACKAGE DROP CONSTRAINT RHN_PACKAGE_LM_NN; +ALTER TABLE RHNPACKAGE MODIFY LAST_MODIFIED NOT NULL; + +-- +-- RHNPACKAGE +-- +ALTER TABLE RHNPACKAGE DROP CONSTRAINT RHN_PACKAGE_MD5_NN; +ALTER TABLE RHNPACKAGE MODIFY MD5SUM NOT NULL; + +-- +-- RHNPACKAGE +-- +ALTER TABLE RHNPACKAGE DROP CONSTRAINT RHN_PACKAGE_MODIFIED_NN; +ALTER TABLE RHNPACKAGE MODIFY MODIFIED NOT NULL; + +-- +-- RHNPACKAGE +-- +ALTER TABLE RHNPACKAGE DROP CONSTRAINT RHN_PACKAGE_NID_NN; +ALTER TABLE RHNPACKAGE MODIFY NAME_ID NOT NULL; + +-- +-- RHNPACKAGE +-- +ALTER TABLE RHNPACKAGE DROP CONSTRAINT RHN_PACKAGE_PAID_NN; +ALTER TABLE RHNPACKAGE MODIFY PACKAGE_ARCH_ID NOT NULL; + +-- +-- RHNPACKAGE +-- +ALTER TABLE RHNPACKAGE DROP CONSTRAINT RHN_PACKAGE_PKG_SIZE_NN; +ALTER TABLE RHNPACKAGE MODIFY PACKAGE_SIZE NOT NULL; + +-- +-- RHNPACKAGESOURCE +-- +ALTER TABLE RHNPACKAGESOURCE DROP CONSTRAINT RHN_PACKAGE_SIGMD5_NN; +ALTER TABLE RHNPACKAGESOURCE MODIFY SIGMD5 NOT NULL; + +-- +-- RHNPACKAGE +-- +ALTER TABLE RHNPACKAGE DROP CONSTRAINT RHN_PACKAGE_VENDOR_NN; +ALTER TABLE RHNPACKAGE MODIFY VENDOR NOT NULL; + +-- +-- RHNPACKAGEARCH +-- +ALTER TABLE RHNPACKAGEARCH DROP CONSTRAINT RHN_PARCH_ATID_NN; +ALTER TABLE RHNPACKAGEARCH MODIFY ARCH_TYPE_ID NOT NULL; + +-- +-- RHNPACKAGEARCH +-- +ALTER TABLE RHNPACKAGEARCH DROP CONSTRAINT RHN_PARCH_CREATED_NN; +ALTER TABLE RHNPACKAGEARCH MODIFY CREATED NOT NULL; + +-- +-- RHNPACKAGEARCH +-- +ALTER TABLE RHNPACKAGEARCH DROP CONSTRAINT RHN_PARCH_ID_NN; +ALTER TABLE RHNPACKAGEARCH MODIFY ID NOT NULL; + +-- +-- RHNPACKAGEARCH +-- +ALTER TABLE RHNPACKAGEARCH DROP CONSTRAINT RHN_PARCH_LABEL_NN; +ALTER TABLE RHNPACKAGEARCH MODIFY LABEL NOT NULL; + +-- +-- RHNPACKAGEARCH +-- +ALTER TABLE RHNPACKAGEARCH DROP CONSTRAINT RHN_PARCH_MODIFIED_NN; +ALTER TABLE RHNPACKAGEARCH MODIFY MODIFIED NOT NULL; + +-- +-- RHNPACKAGEARCH +-- +ALTER TABLE RHNPACKAGEARCH DROP CONSTRAINT RHN_PARCH_NAME_NN; +ALTER TABLE RHNPACKAGEARCH MODIFY NAME NOT NULL; + +-- +-- RHNPATHCHANNELMAP +-- +ALTER TABLE RHNPATHCHANNELMAP DROP CONSTRAINT RHN_PATH_CHANNEL_MAP_CID_NN; +ALTER TABLE RHNPATHCHANNELMAP MODIFY CHANNEL_ID NOT NULL; + +-- +-- RHNPATHCHANNELMAP +-- +ALTER TABLE RHNPATHCHANNELMAP DROP CONSTRAINT RHN_PATH_CHANNEL_MAP_P_NN; +ALTER TABLE RHNPATHCHANNELMAP MODIFY PATH NOT NULL; + +-- +-- RHNPUSHCLIENT +-- +ALTER TABLE RHNPUSHCLIENT DROP CONSTRAINT RHN_PCLIENT_CREATED_NN; +ALTER TABLE RHNPUSHCLIENT MODIFY CREATED NOT NULL; + +-- +-- RHNPUSHCLIENT +-- +ALTER TABLE RHNPUSHCLIENT DROP CONSTRAINT RHN_PCLIENT_ID_NN; +ALTER TABLE RHNPUSHCLIENT MODIFY ID NOT NULL; + +-- +-- RHNPUSHCLIENT +-- +ALTER TABLE RHNPUSHCLIENT DROP CONSTRAINT RHN_PCLIENT_MODIFIED_NN; +ALTER TABLE RHNPUSHCLIENT MODIFY MODIFIED NOT NULL; + +-- +-- RHNPUSHCLIENT +-- +ALTER TABLE RHNPUSHCLIENT DROP CONSTRAINT RHN_PCLIENT_NAME_NN; +ALTER TABLE RHNPUSHCLIENT MODIFY NAME NOT NULL; + +-- +-- RHNPUSHCLIENT +-- +ALTER TABLE RHNPUSHCLIENT DROP CONSTRAINT RHN_PCLIENT_SID_NN; +ALTER TABLE RHNPUSHCLIENT MODIFY SERVER_ID NOT NULL; + +-- +-- RHNPUSHCLIENT +-- +ALTER TABLE RHNPUSHCLIENT DROP CONSTRAINT RHN_PCLIENT_SKEY_NN; +ALTER TABLE RHNPUSHCLIENT MODIFY SHARED_KEY NOT NULL; + +-- +-- RHNPUSHCLIENTSTATE +-- +ALTER TABLE RHNPUSHCLIENTSTATE DROP CONSTRAINT RHN_PCLIENT_STATE_CREATED_N= N; +ALTER TABLE RHNPUSHCLIENTSTATE MODIFY CREATED NOT NULL; + +-- +-- RHNPUSHCLIENTSTATE +-- +ALTER TABLE RHNPUSHCLIENTSTATE DROP CONSTRAINT RHN_PCLIENT_STATE_ID_NN; +ALTER TABLE RHNPUSHCLIENTSTATE MODIFY ID NOT NULL; + +-- +-- RHNPUSHCLIENTSTATE +-- +ALTER TABLE RHNPUSHCLIENTSTATE DROP CONSTRAINT RHN_PCLIENT_STATE_LABEL_NN; +ALTER TABLE RHNPUSHCLIENTSTATE MODIFY LABEL NOT NULL; + +-- +-- RHNPUSHCLIENTSTATE +-- +ALTER TABLE RHNPUSHCLIENTSTATE DROP CONSTRAINT RHN_PCLIENT_STATE_MODIFIED_= NN; +ALTER TABLE RHNPUSHCLIENTSTATE MODIFY MODIFIED NOT NULL; + +-- +-- RHNPUSHCLIENTSTATE +-- +ALTER TABLE RHNPUSHCLIENTSTATE DROP CONSTRAINT RHN_PCLIENT_STATE_NAME_NN; +ALTER TABLE RHNPUSHCLIENTSTATE MODIFY NAME NOT NULL; + +-- +-- RHNPUSHCLIENT +-- +ALTER TABLE RHNPUSHCLIENT DROP CONSTRAINT RHN_PCLIENT_STID_NN; +ALTER TABLE RHNPUSHCLIENT MODIFY STATE_ID NOT NULL; + +-- +-- RHNPRODUCTCHANNEL +-- +ALTER TABLE RHNPRODUCTCHANNEL DROP CONSTRAINT RHN_PC_CID_NN; +ALTER TABLE RHNPRODUCTCHANNEL MODIFY CHANNEL_ID NOT NULL; + +-- +-- RHNPRODUCTCHANNEL +-- +ALTER TABLE RHNPRODUCTCHANNEL DROP CONSTRAINT RHN_PC_CREATED_NN; +ALTER TABLE RHNPRODUCTCHANNEL MODIFY CREATED NOT NULL; + +-- +-- RHNPRODUCTCHANNEL +-- +ALTER TABLE RHNPRODUCTCHANNEL DROP CONSTRAINT RHN_PC_MODIFIED_NN; +ALTER TABLE RHNPRODUCTCHANNEL MODIFY MODIFIED NOT NULL; + +-- +-- RHNPRODUCTCHANNEL +-- +ALTER TABLE RHNPRODUCTCHANNEL DROP CONSTRAINT RHN_PC_PID_NN; +ALTER TABLE RHNPRODUCTCHANNEL MODIFY PRODUCT_ID NOT NULL; + +-- +-- RHNPACKAGEDELTAELEMENT +-- +ALTER TABLE RHNPACKAGEDELTAELEMENT DROP CONSTRAINT RHN_PDELEMENT_PDID_NN; +ALTER TABLE RHNPACKAGEDELTAELEMENT MODIFY PACKAGE_DELTA_ID NOT NULL; + +-- +-- RHNPACKAGEDELTAELEMENT +-- +ALTER TABLE RHNPACKAGEDELTAELEMENT DROP CONSTRAINT RHN_PDELEMENT_TPID_NN; +ALTER TABLE RHNPACKAGEDELTAELEMENT MODIFY TRANSACTION_PACKAGE_ID NOT NULL; + +-- +-- RHNPACKAGEEVR +-- +ALTER TABLE RHNPACKAGEEVR DROP CONSTRAINT RHN_PE_ID_NN; +ALTER TABLE RHNPACKAGEEVR MODIFY ID NOT NULL; + +-- +-- RHNPACKAGEEVR +-- +ALTER TABLE RHNPACKAGEEVR DROP CONSTRAINT RHN_PE_RELEASE_NN; +ALTER TABLE RHNPACKAGEEVR MODIFY RELEASE NOT NULL; + +-- +-- RHNPACKAGEEVR +-- +ALTER TABLE RHNPACKAGEEVR DROP CONSTRAINT RHN_PE_VERSION_NN; +ALTER TABLE RHNPACKAGEEVR MODIFY VERSION NOT NULL; + +-- +-- RHNPACKAGEFILEDELETEQUEUE +-- +ALTER TABLE RHNPACKAGEFILEDELETEQUEUE DROP CONSTRAINT RHN_PFDQUEUE_CREATED= _NN; +ALTER TABLE RHNPACKAGEFILEDELETEQUEUE MODIFY CREATED NOT NULL; + +-- +-- RHN_PAGER_TYPES +-- +ALTER TABLE RHN_PAGER_TYPES DROP CONSTRAINT RHN_PGRTP_RECID_NN; +ALTER TABLE RHN_PAGER_TYPES MODIFY RECID NOT NULL; + +-- +-- RHN_PHYSICAL_LOCATION +-- +ALTER TABLE RHN_PHYSICAL_LOCATION DROP CONSTRAINT RHN_PHSLC_CUST_ID_NN; +ALTER TABLE RHN_PHYSICAL_LOCATION MODIFY CUSTOMER_ID NOT NULL; + +-- +-- RHN_PHYSICAL_LOCATION +-- +ALTER TABLE RHN_PHYSICAL_LOCATION DROP CONSTRAINT RHN_PHSLC_RECID_NN; +ALTER TABLE RHN_PHYSICAL_LOCATION MODIFY RECID NOT NULL; + +-- +-- RHNPACKAGEKEYASSOCIATION +-- +ALTER TABLE RHNPACKAGEKEYASSOCIATION DROP CONSTRAINT RHN_PKEYA_CREATED_NN; +ALTER TABLE RHNPACKAGEKEYASSOCIATION MODIFY CREATED NOT NULL; + +-- +-- RHNPACKAGEKEYASSOCIATION +-- +ALTER TABLE RHNPACKAGEKEYASSOCIATION DROP CONSTRAINT RHN_PKEYA_KID_NN; +ALTER TABLE RHNPACKAGEKEYASSOCIATION MODIFY KEY_ID NOT NULL; + +-- +-- RHNPACKAGEKEYASSOCIATION +-- +ALTER TABLE RHNPACKAGEKEYASSOCIATION DROP CONSTRAINT RHN_PKEYA_MODIFIED_NN; +ALTER TABLE RHNPACKAGEKEYASSOCIATION MODIFY MODIFIED NOT NULL; + +-- +-- RHNPACKAGEKEYASSOCIATION +-- +ALTER TABLE RHNPACKAGEKEYASSOCIATION DROP CONSTRAINT RHN_PKEYA_PID_NN; +ALTER TABLE RHNPACKAGEKEYASSOCIATION MODIFY PACKAGE_ID NOT NULL; + +-- +-- RHNPACKAGEKEY +-- +ALTER TABLE RHNPACKAGEKEY DROP CONSTRAINT RHN_PKEY_CREATED_NN; +ALTER TABLE RHNPACKAGEKEY MODIFY CREATED NOT NULL; + +-- +-- RHNPACKAGEKEY +-- +ALTER TABLE RHNPACKAGEKEY DROP CONSTRAINT RHN_PKEY_ID_NN; +ALTER TABLE RHNPACKAGEKEY MODIFY ID NOT NULL; + +-- +-- RHNPACKAGEKEY +-- +ALTER TABLE RHNPACKAGEKEY DROP CONSTRAINT RHN_PKEY_KEY_NN; +ALTER TABLE RHNPACKAGEKEY MODIFY KEY_ID NOT NULL; + +-- +-- RHNPACKAGEKEY +-- +ALTER TABLE RHNPACKAGEKEY DROP CONSTRAINT RHN_PKEY_MODIFIED_NN; +ALTER TABLE RHNPACKAGEKEY MODIFY MODIFIED NOT NULL; + +-- +-- RHNPACKAGEKEY +-- +ALTER TABLE RHNPACKAGEKEY DROP CONSTRAINT RHN_PKEY_TYPE_ID_NN; +ALTER TABLE RHNPACKAGEKEY MODIFY KEY_TYPE_ID NOT NULL; + +-- +-- RHNPACKAGENEVRA +-- +ALTER TABLE RHNPACKAGENEVRA DROP CONSTRAINT RHN_PKGNEVRA_EID_NN; +ALTER TABLE RHNPACKAGENEVRA MODIFY EVR_ID NOT NULL; + +-- +-- RHNPACKAGENEVRA +-- +ALTER TABLE RHNPACKAGENEVRA DROP CONSTRAINT RHN_PKGNEVRA_ID_NN; +ALTER TABLE RHNPACKAGENEVRA MODIFY ID NOT NULL; + +-- +-- RHNPACKAGENEVRA +-- +ALTER TABLE RHNPACKAGENEVRA DROP CONSTRAINT RHN_PKGNEVRA_NID_NN; +ALTER TABLE RHNPACKAGENEVRA MODIFY NAME_ID NOT NULL; + +-- +-- RHNPACKAGESOURCE +-- +ALTER TABLE RHNPACKAGESOURCE DROP CONSTRAINT RHN_PKGSRC_BH_NN; +ALTER TABLE RHNPACKAGESOURCE MODIFY BUILD_HOST NOT NULL; + +-- +-- RHNPACKAGESOURCE +-- +ALTER TABLE RHNPACKAGESOURCE DROP CONSTRAINT RHN_PKGSRC_BT_NN; +ALTER TABLE RHNPACKAGESOURCE MODIFY BUILD_TIME NOT NULL; + +-- +-- RHNPACKAGESOURCE +-- +ALTER TABLE RHNPACKAGESOURCE DROP CONSTRAINT RHN_PKGSRC_COOKIE_NN; +ALTER TABLE RHNPACKAGESOURCE MODIFY COOKIE NOT NULL; + +-- +-- RHNPACKAGESOURCE +-- +ALTER TABLE RHNPACKAGESOURCE DROP CONSTRAINT RHN_PKGSRC_CREATED_NN; +ALTER TABLE RHNPACKAGESOURCE MODIFY CREATED NOT NULL; + +-- +-- RHNPACKAGESOURCE +-- +ALTER TABLE RHNPACKAGESOURCE DROP CONSTRAINT RHN_PKGSRC_GROUP_NN; +ALTER TABLE RHNPACKAGESOURCE MODIFY PACKAGE_GROUP NOT NULL; + +-- +-- RHNPACKAGESOURCE +-- +ALTER TABLE RHNPACKAGESOURCE DROP CONSTRAINT RHN_PKGSRC_ID_NN; +ALTER TABLE RHNPACKAGESOURCE MODIFY ID NOT NULL; + +-- +-- RHNPACKAGESOURCE +-- +ALTER TABLE RHNPACKAGESOURCE DROP CONSTRAINT RHN_PKGSRC_LM_NN; +ALTER TABLE RHNPACKAGESOURCE MODIFY LAST_MODIFIED NOT NULL; + +-- +-- RHNPACKAGESOURCE +-- +ALTER TABLE RHNPACKAGESOURCE DROP CONSTRAINT RHN_PKGSRC_MD5SUM_NN; +ALTER TABLE RHNPACKAGESOURCE MODIFY MD5SUM NOT NULL; + +-- +-- RHNPACKAGESOURCE +-- +ALTER TABLE RHNPACKAGESOURCE DROP CONSTRAINT RHN_PKGSRC_MODIFIED_NN; +ALTER TABLE RHNPACKAGESOURCE MODIFY MODIFIED NOT NULL; + +-- +-- RHNPACKAGESOURCE +-- +ALTER TABLE RHNPACKAGESOURCE DROP CONSTRAINT RHN_PKGSRC_PAYSIZE_NN; +ALTER TABLE RHNPACKAGESOURCE MODIFY PAYLOAD_SIZE NOT NULL; + +-- +-- RHNPACKAGESOURCE +-- +ALTER TABLE RHNPACKAGESOURCE DROP CONSTRAINT RHN_PKGSRC_PS_NN; +ALTER TABLE RHNPACKAGESOURCE MODIFY PACKAGE_SIZE NOT NULL; + +-- +-- RHNPACKAGESOURCE +-- +ALTER TABLE RHNPACKAGESOURCE DROP CONSTRAINT RHN_PKGSRC_RPM_VER_NN; +ALTER TABLE RHNPACKAGESOURCE MODIFY RPM_VERSION NOT NULL; + +-- +-- RHNPACKAGESOURCE +-- +ALTER TABLE RHNPACKAGESOURCE DROP CONSTRAINT RHN_PKGSRC_SRID_NN; +ALTER TABLE RHNPACKAGESOURCE MODIFY SOURCE_RPM_ID NOT NULL; + +-- +-- RHNPACKAGESOURCE +-- +ALTER TABLE RHNPACKAGESOURCE DROP CONSTRAINT RHN_PKGSRC_VENDOR_NN; +ALTER TABLE RHNPACKAGESOURCE MODIFY VENDOR NOT NULL; + +-- +-- RHNPACKAGECAPABILITY +-- +ALTER TABLE RHNPACKAGECAPABILITY DROP CONSTRAINT RHN_PKG_CAPABILITY_CREATE= D_NN; +ALTER TABLE RHNPACKAGECAPABILITY MODIFY CREATED NOT NULL; + +-- +-- RHNPACKAGECAPABILITY +-- +ALTER TABLE RHNPACKAGECAPABILITY DROP CONSTRAINT RHN_PKG_CAPABILITY_ID_NN; +ALTER TABLE RHNPACKAGECAPABILITY MODIFY ID NOT NULL; + +-- +-- RHNPACKAGECAPABILITY +-- +ALTER TABLE RHNPACKAGECAPABILITY DROP CONSTRAINT RHN_PKG_CAPABILITY_MODIFI= ED_NN; +ALTER TABLE RHNPACKAGECAPABILITY MODIFY MODIFIED NOT NULL; + +-- +-- RHNPACKAGECAPABILITY +-- +ALTER TABLE RHNPACKAGECAPABILITY DROP CONSTRAINT RHN_PKG_CAPABILITY_NAME_N= N; +ALTER TABLE RHNPACKAGECAPABILITY MODIFY NAME NOT NULL; + +-- +-- RHNPACKAGECHANGELOG +-- +ALTER TABLE RHNPACKAGECHANGELOG DROP CONSTRAINT RHN_PKG_CHANGELOG_CREATED_= NN; +ALTER TABLE RHNPACKAGECHANGELOG MODIFY CREATED NOT NULL; + +-- +-- RHNPACKAGECHANGELOG +-- +ALTER TABLE RHNPACKAGECHANGELOG DROP CONSTRAINT RHN_PKG_CHANGELOG_MODIFIED= _NN; +ALTER TABLE RHNPACKAGECHANGELOG MODIFY MODIFIED NOT NULL; + +-- +-- RHNPACKAGECHANGELOG +-- +ALTER TABLE RHNPACKAGECHANGELOG DROP CONSTRAINT RHN_PKG_CHANGELOG_NAME; +ALTER TABLE RHNPACKAGECHANGELOG MODIFY NAME NOT NULL; + +-- +-- RHNPACKAGECHANGELOG +-- +ALTER TABLE RHNPACKAGECHANGELOG DROP CONSTRAINT RHN_PKG_CHANGELOG_PID_NN; +ALTER TABLE RHNPACKAGECHANGELOG MODIFY PACKAGE_ID NOT NULL; + +-- +-- RHNPACKAGECHANGELOG +-- +ALTER TABLE RHNPACKAGECHANGELOG DROP CONSTRAINT RHN_PKG_CHANGELOG_TEXT; +ALTER TABLE RHNPACKAGECHANGELOG MODIFY TEXT NOT NULL; + +-- +-- RHNPACKAGECHANGELOG +-- +ALTER TABLE RHNPACKAGECHANGELOG DROP CONSTRAINT RHN_PKG_CHANGELOG_TIME; +ALTER TABLE RHNPACKAGECHANGELOG MODIFY TIME NOT NULL; + +-- +-- RHNPACKAGECHANGELOG +-- +ALTER TABLE RHNPACKAGECHANGELOG DROP CONSTRAINT RHN_PKG_CL_ID_NN; +ALTER TABLE RHNPACKAGECHANGELOG MODIFY ID NOT NULL; + +-- +-- RHNPACKAGECONFLICTS +-- +ALTER TABLE RHNPACKAGECONFLICTS DROP CONSTRAINT RHN_PKG_CONFLICTS_CID_NN; +ALTER TABLE RHNPACKAGECONFLICTS MODIFY CAPABILITY_ID NOT NULL; + +-- +-- RHNPACKAGECONFLICTS +-- +ALTER TABLE RHNPACKAGECONFLICTS DROP CONSTRAINT RHN_PKG_CONFLICTS_CTIME_NN; +ALTER TABLE RHNPACKAGECONFLICTS MODIFY CREATED NOT NULL; + +-- +-- RHNPACKAGECONFLICTS +-- +ALTER TABLE RHNPACKAGECONFLICTS DROP CONSTRAINT RHN_PKG_CONFLICTS_MTIME_NN; +ALTER TABLE RHNPACKAGECONFLICTS MODIFY MODIFIED NOT NULL; + +-- +-- RHNPACKAGECONFLICTS +-- +ALTER TABLE RHNPACKAGECONFLICTS DROP CONSTRAINT RHN_PKG_CONFLICTS_PID_NN; +ALTER TABLE RHNPACKAGECONFLICTS MODIFY PACKAGE_ID NOT NULL; + +-- +-- RHNPACKAGECONFLICTS +-- +ALTER TABLE RHNPACKAGECONFLICTS DROP CONSTRAINT RHN_PKG_CONFLICTS_SENSE_NN; +ALTER TABLE RHNPACKAGECONFLICTS MODIFY SENSE NOT NULL; + +-- +-- RHNPACKAGEKEYTYPE +-- +ALTER TABLE RHNPACKAGEKEYTYPE DROP CONSTRAINT RHN_PKG_KEY_TYPE_CREATED_NN; +ALTER TABLE RHNPACKAGEKEYTYPE MODIFY CREATED NOT NULL; + +-- +-- RHNPACKAGEKEYTYPE +-- +ALTER TABLE RHNPACKAGEKEYTYPE DROP CONSTRAINT RHN_PKG_KEY_TYPE_ID_NN; +ALTER TABLE RHNPACKAGEKEYTYPE MODIFY ID NOT NULL; + +-- +-- RHNPACKAGEKEYTYPE +-- +ALTER TABLE RHNPACKAGEKEYTYPE DROP CONSTRAINT RHN_PKG_KEY_TYPE_LABEL_NN; +ALTER TABLE RHNPACKAGEKEYTYPE MODIFY LABEL NOT NULL; + +-- +-- RHNPACKAGEKEYTYPE +-- +ALTER TABLE RHNPACKAGEKEYTYPE DROP CONSTRAINT RHN_PKG_KEY_TYPE_MODIFIED_NN; +ALTER TABLE RHNPACKAGEKEYTYPE MODIFY MODIFIED NOT NULL; + +-- +-- RHNPACKAGEOBSOLETES +-- +ALTER TABLE RHNPACKAGEOBSOLETES DROP CONSTRAINT RHN_PKG_OBSOLETES_CID_NN; +ALTER TABLE RHNPACKAGEOBSOLETES MODIFY CAPABILITY_ID NOT NULL; + +-- +-- RHNPACKAGEOBSOLETES +-- +ALTER TABLE RHNPACKAGEOBSOLETES DROP CONSTRAINT RHN_PKG_OBSOLETES_CTIME_NN; +ALTER TABLE RHNPACKAGEOBSOLETES MODIFY CREATED NOT NULL; + +-- +-- RHNPACKAGEOBSOLETES +-- +ALTER TABLE RHNPACKAGEOBSOLETES DROP CONSTRAINT RHN_PKG_OBSOLETES_MTIME_NN; +ALTER TABLE RHNPACKAGEOBSOLETES MODIFY MODIFIED NOT NULL; + +-- +-- RHNPACKAGEOBSOLETES +-- +ALTER TABLE RHNPACKAGEOBSOLETES DROP CONSTRAINT RHN_PKG_OBSOLETES_PID_NN; +ALTER TABLE RHNPACKAGEOBSOLETES MODIFY PACKAGE_ID NOT NULL; + +-- +-- RHNPACKAGEOBSOLETES +-- +ALTER TABLE RHNPACKAGEOBSOLETES DROP CONSTRAINT RHN_PKG_OBSOLETES_SENSE_NN; +ALTER TABLE RHNPACKAGEOBSOLETES MODIFY SENSE NOT NULL; + +-- +-- RHNPACKAGEPROVIDER +-- +ALTER TABLE RHNPACKAGEPROVIDER DROP CONSTRAINT RHN_PKG_PROVIDER_CREATED_NN; +ALTER TABLE RHNPACKAGEPROVIDER MODIFY CREATED NOT NULL; + +-- +-- RHNPACKAGEPROVIDER +-- +ALTER TABLE RHNPACKAGEPROVIDER DROP CONSTRAINT RHN_PKG_PROVIDER_ID_NN; +ALTER TABLE RHNPACKAGEPROVIDER MODIFY ID NOT NULL; + +-- +-- RHNPACKAGEPROVIDER +-- +ALTER TABLE RHNPACKAGEPROVIDER DROP CONSTRAINT RHN_PKG_PROVIDER_KEY_NN; +ALTER TABLE RHNPACKAGEPROVIDER MODIFY NAME NOT NULL; + +-- +-- RHNPACKAGEPROVIDER +-- +ALTER TABLE RHNPACKAGEPROVIDER DROP CONSTRAINT RHN_PKG_PROVIDER_MODIFIED_N= N; +ALTER TABLE RHNPACKAGEPROVIDER MODIFY MODIFIED NOT NULL; + +-- +-- RHNPACKAGEPROVIDES +-- +ALTER TABLE RHNPACKAGEPROVIDES DROP CONSTRAINT RHN_PKG_PROVIDES_CID_NN; +ALTER TABLE RHNPACKAGEPROVIDES MODIFY CAPABILITY_ID NOT NULL; + +-- +-- RHNPACKAGEPROVIDES +-- +ALTER TABLE RHNPACKAGEPROVIDES DROP CONSTRAINT RHN_PKG_PROVIDES_CTIME_NN; +ALTER TABLE RHNPACKAGEPROVIDES MODIFY CREATED NOT NULL; + +-- +-- RHNPACKAGEPROVIDES +-- +ALTER TABLE RHNPACKAGEPROVIDES DROP CONSTRAINT RHN_PKG_PROVIDES_MTIME_NN; +ALTER TABLE RHNPACKAGEPROVIDES MODIFY MODIFIED NOT NULL; + +-- +-- RHNPACKAGEPROVIDES +-- +ALTER TABLE RHNPACKAGEPROVIDES DROP CONSTRAINT RHN_PKG_PROVIDES_PID_NN; +ALTER TABLE RHNPACKAGEPROVIDES MODIFY PACKAGE_ID NOT NULL; + +-- +-- RHNPACKAGEPROVIDES +-- +ALTER TABLE RHNPACKAGEPROVIDES DROP CONSTRAINT RHN_PKG_PROVIDES_SENSE_NN; +ALTER TABLE RHNPACKAGEPROVIDES MODIFY SENSE NOT NULL; + +-- +-- RHNPACKAGEREQUIRES +-- +ALTER TABLE RHNPACKAGEREQUIRES DROP CONSTRAINT RHN_PKG_REQUIRES_CID_NN; +ALTER TABLE RHNPACKAGEREQUIRES MODIFY CAPABILITY_ID NOT NULL; + +-- +-- RHNPACKAGEREQUIRES +-- +ALTER TABLE RHNPACKAGEREQUIRES DROP CONSTRAINT RHN_PKG_REQUIRES_CTIME_NN; +ALTER TABLE RHNPACKAGEREQUIRES MODIFY CREATED NOT NULL; + +-- +-- RHNPACKAGEREQUIRES +-- +ALTER TABLE RHNPACKAGEREQUIRES DROP CONSTRAINT RHN_PKG_REQUIRES_MTIME_NN; +ALTER TABLE RHNPACKAGEREQUIRES MODIFY MODIFIED NOT NULL; + +-- +-- RHNPACKAGEREQUIRES +-- +ALTER TABLE RHNPACKAGEREQUIRES DROP CONSTRAINT RHN_PKG_REQUIRES_PID_NN; +ALTER TABLE RHNPACKAGEREQUIRES MODIFY PACKAGE_ID NOT NULL; + +-- +-- RHNPACKAGEREQUIRES +-- +ALTER TABLE RHNPACKAGEREQUIRES DROP CONSTRAINT RHN_PKG_REQUIRES_SENSE_NN; +ALTER TABLE RHNPACKAGEREQUIRES MODIFY SENSE NOT NULL; + +-- +-- RHNPACKAGESENSEMAP +-- +ALTER TABLE RHNPACKAGESENSEMAP DROP CONSTRAINT RHN_PKG_SENSEMAP_SENSE_NN; +ALTER TABLE RHNPACKAGESENSEMAP MODIFY SENSE NOT NULL; + +-- +-- RHNPACKAGESENSEMAP +-- +ALTER TABLE RHNPACKAGESENSEMAP DROP CONSTRAINT RHN_PKG_SENSEMAP_SID_NN; +ALTER TABLE RHNPACKAGESENSEMAP MODIFY SENSE_ID NOT NULL; + +-- +-- RHNPACKAGESENSE +-- +ALTER TABLE RHNPACKAGESENSE DROP CONSTRAINT RHN_PKG_SENSE_ID_NN; +ALTER TABLE RHNPACKAGESENSE MODIFY ID NOT NULL; + +-- +-- RHNPACKAGESENSE +-- +ALTER TABLE RHNPACKAGESENSE DROP CONSTRAINT RHN_PKG_SENSE_LABEL_NN; +ALTER TABLE RHNPACKAGESENSE MODIFY LABEL NOT NULL; + +-- +-- RHNPACKAGENAME +-- +ALTER TABLE RHNPACKAGENAME DROP CONSTRAINT RHN_PN_ID_NN; +ALTER TABLE RHNPACKAGENAME MODIFY ID NOT NULL; + +-- +-- RHNPACKAGENAME +-- +ALTER TABLE RHNPACKAGENAME DROP CONSTRAINT RHN_PN_NAME_NN; +ALTER TABLE RHNPACKAGENAME MODIFY NAME NOT NULL; + +-- +-- RHN_PROBE_PARAM_VALUE +-- +ALTER TABLE RHN_PROBE_PARAM_VALUE DROP CONSTRAINT RHN_PPVAL_COMMAND_ID_NN; +ALTER TABLE RHN_PROBE_PARAM_VALUE MODIFY COMMAND_ID NOT NULL; + +-- +-- RHN_PROBE_PARAM_VALUE +-- +ALTER TABLE RHN_PROBE_PARAM_VALUE DROP CONSTRAINT RHN_PPVAL_PARAM_NAME_NN; +ALTER TABLE RHN_PROBE_PARAM_VALUE MODIFY PARAM_NAME NOT NULL; + +-- +-- RHN_PROBE_PARAM_VALUE +-- +ALTER TABLE RHN_PROBE_PARAM_VALUE DROP CONSTRAINT RHN_PPVAL_PROBE_ID_NN; +ALTER TABLE RHN_PROBE_PARAM_VALUE MODIFY PROBE_ID NOT NULL; + +-- +-- RHN_PROBE_STATE +-- +ALTER TABLE RHN_PROBE_STATE DROP CONSTRAINT RHN_PRBST_PROBE_ID_NN; +ALTER TABLE RHN_PROBE_STATE MODIFY PROBE_ID NOT NULL; + +-- +-- RHN_PROBE_STATE +-- +ALTER TABLE RHN_PROBE_STATE DROP CONSTRAINT RHN_PRBST_SCOUT_ID_NN; +ALTER TABLE RHN_PROBE_STATE MODIFY SCOUT_ID NOT NULL; + +-- +-- RHN_PROBE_TYPES +-- +ALTER TABLE RHN_PROBE_TYPES DROP CONSTRAINT RHN_PRBTP_PROBE_TYPE_NN; +ALTER TABLE RHN_PROBE_TYPES MODIFY PROBE_TYPE NOT NULL; + +-- +-- RHN_PROBE_TYPES +-- +ALTER TABLE RHN_PROBE_TYPES DROP CONSTRAINT RHN_PRBTP_TYPE_DESC_NN; +ALTER TABLE RHN_PROBE_TYPES MODIFY TYPE_DESCRIPTION NOT NULL; + +-- +-- RHNPRIVATECHANNELFAMILY +-- +ALTER TABLE RHNPRIVATECHANNELFAMILY DROP CONSTRAINT RHN_PRIVCF_CFID_NN; +ALTER TABLE RHNPRIVATECHANNELFAMILY MODIFY CHANNEL_FAMILY_ID NOT NULL; + +-- +-- RHNPRIVATECHANNELFAMILY +-- +ALTER TABLE RHNPRIVATECHANNELFAMILY DROP CONSTRAINT RHN_PRIVCF_CREATED_NN; +ALTER TABLE RHNPRIVATECHANNELFAMILY MODIFY CREATED NOT NULL; + +-- +-- RHNPRIVATECHANNELFAMILY +-- +ALTER TABLE RHNPRIVATECHANNELFAMILY DROP CONSTRAINT RHN_PRIVCF_CURMEMBERS_= NN; +ALTER TABLE RHNPRIVATECHANNELFAMILY MODIFY CURRENT_MEMBERS NOT NULL; + +-- +-- RHNPRIVATECHANNELFAMILY +-- +ALTER TABLE RHNPRIVATECHANNELFAMILY DROP CONSTRAINT RHN_PRIVCF_MODIFIED_NN; +ALTER TABLE RHNPRIVATECHANNELFAMILY MODIFY MODIFIED NOT NULL; + +-- +-- RHNPRIVATECHANNELFAMILY +-- +ALTER TABLE RHNPRIVATECHANNELFAMILY DROP CONSTRAINT RHN_PRIVCF_OID_NN; +ALTER TABLE RHNPRIVATECHANNELFAMILY MODIFY ORG_ID NOT NULL; + +-- +-- RHN_PROBE +-- +ALTER TABLE RHN_PROBE DROP CONSTRAINT RHN_PROBE_CHK_INT_NN; +ALTER TABLE RHN_PROBE MODIFY CHECK_INTERVAL_MINUTES NOT NULL; + +-- +-- RHN_PROBE +-- +ALTER TABLE RHN_PROBE DROP CONSTRAINT RHN_PROBE_COMMAND_ID_NN; +ALTER TABLE RHN_PROBE MODIFY COMMAND_ID NOT NULL; + +-- +-- RHN_PROBE +-- +ALTER TABLE RHN_PROBE DROP CONSTRAINT RHN_PROBE_CUST_ID_NN; +ALTER TABLE RHN_PROBE MODIFY CUSTOMER_ID NOT NULL; + +-- +-- RHN_PROBE +-- +ALTER TABLE RHN_PROBE DROP CONSTRAINT RHN_PROBE_DESCRIPTION_NN; +ALTER TABLE RHN_PROBE MODIFY DESCRIPTION NOT NULL; + +-- +-- RHN_PROBE +-- +ALTER TABLE RHN_PROBE DROP CONSTRAINT RHN_PROBE_PROBE_TYPE_NN; +ALTER TABLE RHN_PROBE MODIFY PROBE_TYPE NOT NULL; + +-- +-- RHN_PROBE +-- +ALTER TABLE RHN_PROBE DROP CONSTRAINT RHN_PROBE_RECID_NN; +ALTER TABLE RHN_PROBE MODIFY RECID NOT NULL; + +-- +-- RHN_PROBE +-- +ALTER TABLE RHN_PROBE DROP CONSTRAINT RHN_PROBE_RETRY_INT_NN; +ALTER TABLE RHN_PROBE MODIFY RETRY_INTERVAL_MINUTES NOT NULL; + +-- +-- RHNPRODUCTNAME +-- +ALTER TABLE RHNPRODUCTNAME DROP CONSTRAINT RHN_PRODUCTNAME_ID_NN; +ALTER TABLE RHNPRODUCTNAME MODIFY ID NOT NULL; + +-- +-- RHNPRODUCTNAME +-- +ALTER TABLE RHNPRODUCTNAME DROP CONSTRAINT RHN_PRODUCTNAME_LBL_NN; +ALTER TABLE RHNPRODUCTNAME MODIFY LABEL NOT NULL; + +-- +-- RHNPRODUCTNAME +-- +ALTER TABLE RHNPRODUCTNAME DROP CONSTRAINT RHN_PRODUCTNAME_NAME_NN; +ALTER TABLE RHNPRODUCTNAME MODIFY NAME NOT NULL; + +-- +-- RHNPRODUCT +-- +ALTER TABLE RHNPRODUCT DROP CONSTRAINT RHN_PRODUCT_CAT_NN; +ALTER TABLE RHNPRODUCT MODIFY PRODUCT_LINE_ID NOT NULL; + +-- +-- RHNPRODUCT +-- +ALTER TABLE RHNPRODUCT DROP CONSTRAINT RHN_PRODUCT_CREATED_NN; +ALTER TABLE RHNPRODUCT MODIFY CREATED NOT NULL; + +-- +-- RHNPRODUCT +-- +ALTER TABLE RHNPRODUCT DROP CONSTRAINT RHN_PRODUCT_ID_NN; +ALTER TABLE RHNPRODUCT MODIFY ID NOT NULL; + +-- +-- RHNPRODUCT +-- +ALTER TABLE RHNPRODUCT DROP CONSTRAINT RHN_PRODUCT_LABEL_NN; +ALTER TABLE RHNPRODUCT MODIFY LABEL NOT NULL; + +-- +-- RHNPRODUCT +-- +ALTER TABLE RHNPRODUCT DROP CONSTRAINT RHN_PRODUCT_LM_NN; +ALTER TABLE RHNPRODUCT MODIFY LAST_MODIFIED NOT NULL; + +-- +-- RHNPRODUCT +-- +ALTER TABLE RHNPRODUCT DROP CONSTRAINT RHN_PRODUCT_MODIFIED_NN; +ALTER TABLE RHNPRODUCT MODIFY MODIFIED NOT NULL; + +-- +-- RHNPRODUCT +-- +ALTER TABLE RHNPRODUCT DROP CONSTRAINT RHN_PRODUCT_NAME_NN; +ALTER TABLE RHNPRODUCT MODIFY NAME NOT NULL; + +-- +-- RHNPRODUCTLINE +-- +ALTER TABLE RHNPRODUCTLINE DROP CONSTRAINT RHN_PROD_LINE_CREATED_NN; +ALTER TABLE RHNPRODUCTLINE MODIFY CREATED NOT NULL; + +-- +-- RHNPRODUCTLINE +-- +ALTER TABLE RHNPRODUCTLINE DROP CONSTRAINT RHN_PROD_LINE_ID_NN; +ALTER TABLE RHNPRODUCTLINE MODIFY ID NOT NULL; + +-- +-- RHNPRODUCTLINE +-- +ALTER TABLE RHNPRODUCTLINE DROP CONSTRAINT RHN_PROD_LINE_LABEL_NN; +ALTER TABLE RHNPRODUCTLINE MODIFY LABEL NOT NULL; + +-- +-- RHNPRODUCTLINE +-- +ALTER TABLE RHNPRODUCTLINE DROP CONSTRAINT RHN_PROD_LINE_LM_NN; +ALTER TABLE RHNPRODUCTLINE MODIFY LAST_MODIFIED NOT NULL; + +-- +-- RHNPRODUCTLINE +-- +ALTER TABLE RHNPRODUCTLINE DROP CONSTRAINT RHN_PROD_LINE_MODIFIED_NN; +ALTER TABLE RHNPRODUCTLINE MODIFY MODIFIED NOT NULL; + +-- +-- RHNPRODUCTLINE +-- +ALTER TABLE RHNPRODUCTLINE DROP CONSTRAINT RHN_PROD_LINE_NAME_NN; +ALTER TABLE RHNPRODUCTLINE MODIFY NAME NOT NULL; + +-- +-- RHNPROVISIONSTATE +-- +ALTER TABLE RHNPROVISIONSTATE DROP CONSTRAINT RHN_PROVSTATE_CREAT_NN; +ALTER TABLE RHNPROVISIONSTATE MODIFY CREATED NOT NULL; + +-- +-- RHNPROVISIONSTATE +-- +ALTER TABLE RHNPROVISIONSTATE DROP CONSTRAINT RHN_PROVSTATE_DESC_NN; +ALTER TABLE RHNPROVISIONSTATE MODIFY DESCRIPTION NOT NULL; + +-- +-- RHNPROVISIONSTATE +-- +ALTER TABLE RHNPROVISIONSTATE DROP CONSTRAINT RHN_PROVSTATE_ID_NN; +ALTER TABLE RHNPROVISIONSTATE MODIFY ID NOT NULL; + +-- +-- RHNPROVISIONSTATE +-- +ALTER TABLE RHNPROVISIONSTATE DROP CONSTRAINT RHN_PROVSTATE_LABEL_NN; +ALTER TABLE RHNPROVISIONSTATE MODIFY LABEL NOT NULL; + +-- +-- RHNPROVISIONSTATE +-- +ALTER TABLE RHNPROVISIONSTATE DROP CONSTRAINT RHN_PROVSTATE_MOD_NN; +ALTER TABLE RHNPROVISIONSTATE MODIFY MODIFIED NOT NULL; + +-- +-- RHNPROXYINFO +-- +ALTER TABLE RHNPROXYINFO DROP CONSTRAINT RHN_PROXY_INFO_SID_NN; +ALTER TABLE RHNPROXYINFO MODIFY SERVER_ID NOT NULL; + +-- +-- RHNPUBLICCHANNELFAMILY +-- +ALTER TABLE RHNPUBLICCHANNELFAMILY DROP CONSTRAINT RHN_PUBCF_CFID_NN; +ALTER TABLE RHNPUBLICCHANNELFAMILY MODIFY CHANNEL_FAMILY_ID NOT NULL; + +-- +-- RHNPUBLICCHANNELFAMILY +-- +ALTER TABLE RHNPUBLICCHANNELFAMILY DROP CONSTRAINT RHN_PUBCF_CREAT_NN; +ALTER TABLE RHNPUBLICCHANNELFAMILY MODIFY CREATED NOT NULL; + +-- +-- RHNPUBLICCHANNELFAMILY +-- +ALTER TABLE RHNPUBLICCHANNELFAMILY DROP CONSTRAINT RHN_PUBCF_MOD_NN; +ALTER TABLE RHNPUBLICCHANNELFAMILY MODIFY MODIFIED NOT NULL; + +-- +-- RHNPUSHDISPATCHER +-- +ALTER TABLE RHNPUSHDISPATCHER DROP CONSTRAINT RHN_PUSHDISPATCH_CREAT_NN; +ALTER TABLE RHNPUSHDISPATCHER MODIFY CREATED NOT NULL; + +-- +-- RHNPUSHDISPATCHER +-- +ALTER TABLE RHNPUSHDISPATCHER DROP CONSTRAINT RHN_PUSHDISPATCH_HN_NN; +ALTER TABLE RHNPUSHDISPATCHER MODIFY HOSTNAME NOT NULL; + +-- +-- RHNPUSHDISPATCHER +-- +ALTER TABLE RHNPUSHDISPATCHER DROP CONSTRAINT RHN_PUSHDISPATCH_ID_NN; +ALTER TABLE RHNPUSHDISPATCHER MODIFY ID NOT NULL; + +-- +-- RHNPUSHDISPATCHER +-- +ALTER TABLE RHNPUSHDISPATCHER DROP CONSTRAINT RHN_PUSHDISPATCH_JID_NN; +ALTER TABLE RHNPUSHDISPATCHER MODIFY JABBER_ID NOT NULL; + +-- +-- RHNPUSHDISPATCHER +-- +ALTER TABLE RHNPUSHDISPATCHER DROP CONSTRAINT RHN_PUSHDISPATCH_LC_NN; +ALTER TABLE RHNPUSHDISPATCHER MODIFY LAST_CHECKIN NOT NULL; + +-- +-- RHNPUSHDISPATCHER +-- +ALTER TABLE RHNPUSHDISPATCHER DROP CONSTRAINT RHN_PUSHDISPATCH_MOD_NN; +ALTER TABLE RHNPUSHDISPATCHER MODIFY MODIFIED NOT NULL; + +-- +-- RHNPUSHDISPATCHER +-- +ALTER TABLE RHNPUSHDISPATCHER DROP CONSTRAINT RHN_PUSHDISPATCH_PORT_NN; +ALTER TABLE RHNPUSHDISPATCHER MODIFY PORT NOT NULL; + +-- +-- RHN_QUANTA +-- +ALTER TABLE RHN_QUANTA DROP CONSTRAINT RHN_QNTA0_QUANTUM_ID_NN; +ALTER TABLE RHN_QUANTA MODIFY QUANTUM_ID NOT NULL; + +-- +-- RHNRAM +-- +ALTER TABLE RHNRAM DROP CONSTRAINT RHN_RAM_CREATED_NN; +ALTER TABLE RHNRAM MODIFY CREATED NOT NULL; + +-- +-- RHNRAM +-- +ALTER TABLE RHNRAM DROP CONSTRAINT RHN_RAM_ID_NN; +ALTER TABLE RHNRAM MODIFY ID NOT NULL; + +-- +-- RHNRAM +-- +ALTER TABLE RHNRAM DROP CONSTRAINT RHN_RAM_MODIFIED_NN; +ALTER TABLE RHNRAM MODIFY MODIFIED NOT NULL; + +-- +-- RHNRAM +-- +ALTER TABLE RHNRAM DROP CONSTRAINT RHN_RAM_RAM_NN; +ALTER TABLE RHNRAM MODIFY RAM NOT NULL; + +-- +-- RHNRAM +-- +ALTER TABLE RHNRAM DROP CONSTRAINT RHN_RAM_SERVER_NN; +ALTER TABLE RHNRAM MODIFY SERVER_ID NOT NULL; + +-- +-- RHNRAM +-- +ALTER TABLE RHNRAM DROP CONSTRAINT RHN_RAM_SWAP_NN; +ALTER TABLE RHNRAM MODIFY SWAP NOT NULL; + +-- +-- RHNRELEASECHANNELMAP +-- +ALTER TABLE RHNRELEASECHANNELMAP DROP CONSTRAINT RHN_RCM_CAID_NN; +ALTER TABLE RHNRELEASECHANNELMAP MODIFY CHANNEL_ARCH_ID NOT NULL; + +-- +-- RHNRELEASECHANNELMAP +-- +ALTER TABLE RHNRELEASECHANNELMAP DROP CONSTRAINT RHN_RCM_CID_NN; +ALTER TABLE RHNRELEASECHANNELMAP MODIFY CHANNEL_ID NOT NULL; + +-- +-- RHNRELEASECHANNELMAP +-- +ALTER TABLE RHNRELEASECHANNELMAP DROP CONSTRAINT RHN_RCM_PRODCT_NN; +ALTER TABLE RHNRELEASECHANNELMAP MODIFY PRODUCT NOT NULL; + +-- +-- RHNRELEASECHANNELMAP +-- +ALTER TABLE RHNRELEASECHANNELMAP DROP CONSTRAINT RHN_RCM_RELSE_NN; +ALTER TABLE RHNRELEASECHANNELMAP MODIFY RELEASE NOT NULL; + +-- +-- RHNRELEASECHANNELMAP +-- +ALTER TABLE RHNRELEASECHANNELMAP DROP CONSTRAINT RHN_RCM_VERSN_NN; +ALTER TABLE RHNRELEASECHANNELMAP MODIFY VERSION NOT NULL; + +-- +-- RHN_REDIRECT_CRITERIA +-- +ALTER TABLE RHN_REDIRECT_CRITERIA DROP CONSTRAINT RHN_RDRCR_INVERTED_NN; +ALTER TABLE RHN_REDIRECT_CRITERIA MODIFY INVERTED NOT NULL; + +-- +-- RHN_REDIRECT_CRITERIA +-- +ALTER TABLE RHN_REDIRECT_CRITERIA DROP CONSTRAINT RHN_RDRCR_MATCH_PARAM_NN; +ALTER TABLE RHN_REDIRECT_CRITERIA MODIFY MATCH_PARAM NOT NULL; + +-- +-- RHN_REDIRECT_CRITERIA +-- +ALTER TABLE RHN_REDIRECT_CRITERIA DROP CONSTRAINT RHN_RDRCR_RECID_NN; +ALTER TABLE RHN_REDIRECT_CRITERIA MODIFY RECID NOT NULL; + +-- +-- RHN_REDIRECT_CRITERIA +-- +ALTER TABLE RHN_REDIRECT_CRITERIA DROP CONSTRAINT RHN_RDRCR_REDIRECT_ID_NN; +ALTER TABLE RHN_REDIRECT_CRITERIA MODIFY REDIRECT_ID NOT NULL; + +-- +-- RHN_REDIRECTS +-- +ALTER TABLE RHN_REDIRECTS DROP CONSTRAINT RHN_RDRCT_EXPIRATION_NN; +ALTER TABLE RHN_REDIRECTS MODIFY EXPIRATION NOT NULL; + +-- +-- RHN_REDIRECTS +-- +ALTER TABLE RHN_REDIRECTS DROP CONSTRAINT RHN_RDRCT_RECID_NN; +ALTER TABLE RHN_REDIRECTS MODIFY RECID NOT NULL; + +-- +-- RHN_REDIRECTS +-- +ALTER TABLE RHN_REDIRECTS DROP CONSTRAINT RHN_RDRCT_RECURRING_NN; +ALTER TABLE RHN_REDIRECTS MODIFY RECURRING NOT NULL; + +-- +-- RHN_REDIRECTS +-- +ALTER TABLE RHN_REDIRECTS DROP CONSTRAINT RHN_RDRCT_REDIRECT_TYPE_NN; +ALTER TABLE RHN_REDIRECTS MODIFY REDIRECT_TYPE NOT NULL; + +-- +-- RHN_REDIRECTS +-- +ALTER TABLE RHN_REDIRECTS DROP CONSTRAINT RHN_RDRCT_START_DATE_NN; +ALTER TABLE RHN_REDIRECTS MODIFY START_DATE NOT NULL; + +-- +-- RHN_REDIRECT_EMAIL_TARGETS +-- +ALTER TABLE RHN_REDIRECT_EMAIL_TARGETS DROP CONSTRAINT RHN_RDRET_EMAIL_ADD= R_NN; +ALTER TABLE RHN_REDIRECT_EMAIL_TARGETS MODIFY EMAIL_ADDRESS NOT NULL; + +-- +-- RHN_REDIRECT_EMAIL_TARGETS +-- +ALTER TABLE RHN_REDIRECT_EMAIL_TARGETS DROP CONSTRAINT RHN_RDRET_REDIRECT_= ID_NN; +ALTER TABLE RHN_REDIRECT_EMAIL_TARGETS MODIFY REDIRECT_ID NOT NULL; + +-- +-- RHN_REDIRECT_GROUP_TARGETS +-- +ALTER TABLE RHN_REDIRECT_GROUP_TARGETS DROP CONSTRAINT RHN_RDRGT_GROUP_ID_= NN; +ALTER TABLE RHN_REDIRECT_GROUP_TARGETS MODIFY CONTACT_GROUP_ID NOT NULL; + +-- +-- RHN_REDIRECT_GROUP_TARGETS +-- +ALTER TABLE RHN_REDIRECT_GROUP_TARGETS DROP CONSTRAINT RHN_RDRGT_REDIRECT_= ID_NN; +ALTER TABLE RHN_REDIRECT_GROUP_TARGETS MODIFY REDIRECT_ID NOT NULL; + +-- +-- RHN_REDIRECT_METHOD_TARGETS +-- +ALTER TABLE RHN_REDIRECT_METHOD_TARGETS DROP CONSTRAINT RHN_RDRME_METHOD_I= D; +ALTER TABLE RHN_REDIRECT_METHOD_TARGETS MODIFY CONTACT_METHOD_ID NOT NULL; + +-- +-- RHN_REDIRECT_METHOD_TARGETS +-- +ALTER TABLE RHN_REDIRECT_METHOD_TARGETS DROP CONSTRAINT RHN_RDRME_REDIRECT= _ID; +ALTER TABLE RHN_REDIRECT_METHOD_TARGETS MODIFY REDIRECT_ID NOT NULL; + +-- +-- RHN_REDIRECT_MATCH_TYPES +-- +ALTER TABLE RHN_REDIRECT_MATCH_TYPES DROP CONSTRAINT RHN_RDRMT_NAME_NN; +ALTER TABLE RHN_REDIRECT_MATCH_TYPES MODIFY NAME NOT NULL; + +-- +-- RHN_REDIRECT_TYPES +-- +ALTER TABLE RHN_REDIRECT_TYPES DROP CONSTRAINT RHN_RDRTP_NAME_NN; +ALTER TABLE RHN_REDIRECT_TYPES MODIFY NAME NOT NULL; + +-- +-- RHNREGTOKENCONFIGCHANNELS +-- +ALTER TABLE RHNREGTOKENCONFIGCHANNELS DROP CONSTRAINT RHN_REGTOK_CONFCHAN_= CCID_NN; +ALTER TABLE RHNREGTOKENCONFIGCHANNELS MODIFY CONFIG_CHANNEL_ID NOT NULL; + +-- +-- RHNREGTOKENCONFIGCHANNELS +-- +ALTER TABLE RHNREGTOKENCONFIGCHANNELS DROP CONSTRAINT RHN_REGTOK_CONFCHAN_= POS_NN; +ALTER TABLE RHNREGTOKENCONFIGCHANNELS MODIFY POSITION NOT NULL; + +-- +-- RHNREGTOKENCONFIGCHANNELS +-- +ALTER TABLE RHNREGTOKENCONFIGCHANNELS DROP CONSTRAINT RHN_REGTOK_CONFCHAN_= TID_NN; +ALTER TABLE RHNREGTOKENCONFIGCHANNELS MODIFY TOKEN_ID NOT NULL; + +-- +-- RHNREGTOKEN +-- +ALTER TABLE RHNREGTOKEN DROP CONSTRAINT RHN_REG_TOKEN_DEF_NN; +ALTER TABLE RHNREGTOKEN MODIFY DISABLED NOT NULL; + +-- +-- RHNREGTOKENORGDEFAULT +-- +ALTER TABLE RHNREGTOKENORGDEFAULT DROP CONSTRAINT RHN_REG_TOKEN_DEF_OID_NN; +ALTER TABLE RHNREGTOKENORGDEFAULT MODIFY ORG_ID NOT NULL; + +-- +-- RHNREGTOKEN +-- +ALTER TABLE RHNREGTOKEN DROP CONSTRAINT RHN_REG_TOKEN_DEPLOYCONFS_NN; +ALTER TABLE RHNREGTOKEN MODIFY DEPLOY_CONFIGS NOT NULL; + +-- +-- RHNREGTOKEN +-- +ALTER TABLE RHNREGTOKEN DROP CONSTRAINT RHN_REG_TOKEN_ID_NN; +ALTER TABLE RHNREGTOKEN MODIFY ID NOT NULL; + +-- +-- RHNREGTOKEN +-- +ALTER TABLE RHNREGTOKEN DROP CONSTRAINT RHN_REG_TOKEN_NOTE_NN; +ALTER TABLE RHNREGTOKEN MODIFY NOTE NOT NULL; + +-- +-- RHNREGTOKEN +-- +ALTER TABLE RHNREGTOKEN DROP CONSTRAINT RHN_REG_TOKEN_OID_NN; +ALTER TABLE RHNREGTOKEN MODIFY ORG_ID NOT NULL; + +-- +-- RHNREGTOKENCHANNELS +-- +ALTER TABLE RHNREGTOKENCHANNELS DROP CONSTRAINT RHN_REG_TOK_CHN_SG_NN; +ALTER TABLE RHNREGTOKENCHANNELS MODIFY CHANNEL_ID NOT NULL; + +-- +-- RHNREGTOKENCHANNELS +-- +ALTER TABLE RHNREGTOKENCHANNELS DROP CONSTRAINT RHN_REG_TOK_CHN_TID_NN; +ALTER TABLE RHNREGTOKENCHANNELS MODIFY TOKEN_ID NOT NULL; + +-- +-- RHNREGTOKENENTITLEMENT +-- +ALTER TABLE RHNREGTOKENENTITLEMENT DROP CONSTRAINT RHN_REG_TOK_ENT_RTID_NN; +ALTER TABLE RHNREGTOKENENTITLEMENT MODIFY REG_TOKEN_ID NOT NULL; + +-- +-- RHNREGTOKENENTITLEMENT +-- +ALTER TABLE RHNREGTOKENENTITLEMENT DROP CONSTRAINT RHN_REG_TOK_ENT_SGTID_N= N; +ALTER TABLE RHNREGTOKENENTITLEMENT MODIFY SERVER_GROUP_TYPE_ID NOT NULL; + +-- +-- RHNREGTOKENGROUPS +-- +ALTER TABLE RHNREGTOKENGROUPS DROP CONSTRAINT RHN_REG_TOK_GRP_SG_NN; +ALTER TABLE RHNREGTOKENGROUPS MODIFY SERVER_GROUP_ID NOT NULL; + +-- +-- RHNREGTOKENGROUPS +-- +ALTER TABLE RHNREGTOKENGROUPS DROP CONSTRAINT RHN_REG_TOK_GRP_TID_NN; +ALTER TABLE RHNREGTOKENGROUPS MODIFY TOKEN_ID NOT NULL; + +-- +-- RHNREGTOKENPACKAGES +-- +ALTER TABLE RHNREGTOKENPACKAGES DROP CONSTRAINT RHN_REG_TOK_PKG_ID_NN; +ALTER TABLE RHNREGTOKENPACKAGES MODIFY ID NOT NULL; + +-- +-- RHNREGTOKENPACKAGES +-- +ALTER TABLE RHNREGTOKENPACKAGES DROP CONSTRAINT RHN_REG_TOK_PKG_SG_NN; +ALTER TABLE RHNREGTOKENPACKAGES MODIFY NAME_ID NOT NULL; + +-- +-- RHNREGTOKENPACKAGES +-- +ALTER TABLE RHNREGTOKENPACKAGES DROP CONSTRAINT RHN_REG_TOK_PKG_TID_NN; +ALTER TABLE RHNREGTOKENPACKAGES MODIFY TOKEN_ID NOT NULL; + +-- +-- RHNRELATIONSHIPTYPE +-- +ALTER TABLE RHNRELATIONSHIPTYPE DROP CONSTRAINT RHN_RELTYPE_CREATED_NN; +ALTER TABLE RHNRELATIONSHIPTYPE MODIFY CREATED NOT NULL; + +-- +-- RHNRELATIONSHIPTYPE +-- +ALTER TABLE RHNRELATIONSHIPTYPE DROP CONSTRAINT RHN_RELTYPE_ID_NN; +ALTER TABLE RHNRELATIONSHIPTYPE MODIFY ID NOT NULL; + +-- +-- RHNRELATIONSHIPTYPE +-- +ALTER TABLE RHNRELATIONSHIPTYPE DROP CONSTRAINT RHN_RELTYPE_LABEL_NN; +ALTER TABLE RHNRELATIONSHIPTYPE MODIFY LABEL NOT NULL; + +-- +-- RHNRELATIONSHIPTYPE +-- +ALTER TABLE RHNRELATIONSHIPTYPE DROP CONSTRAINT RHN_RELTYPE_MODIFIED_NN; +ALTER TABLE RHNRELATIONSHIPTYPE MODIFY MODIFIED NOT NULL; + +-- +-- RHNREPOREGENQUEUE +-- +ALTER TABLE RHNREPOREGENQUEUE DROP CONSTRAINT RHN_REPOREGENQ_CHAN_LABEL_NN; +ALTER TABLE RHNREPOREGENQUEUE MODIFY CHANNEL_LABEL NOT NULL; + +-- +-- RHNREPOREGENQUEUE +-- +ALTER TABLE RHNREPOREGENQUEUE DROP CONSTRAINT RHN_REPOREGENQ_CREATED_NN; +ALTER TABLE RHNREPOREGENQUEUE MODIFY CREATED NOT NULL; + +-- +-- RHNREPOREGENQUEUE +-- +ALTER TABLE RHNREPOREGENQUEUE DROP CONSTRAINT RHN_REPOREGENQ_ID_NN; +ALTER TABLE RHNREPOREGENQUEUE MODIFY ID NOT NULL; + +-- +-- RHNREPOREGENQUEUE +-- +ALTER TABLE RHNREPOREGENQUEUE DROP CONSTRAINT RHN_REPOREGENQ_MODIFIED_NN; +ALTER TABLE RHNREPOREGENQUEUE MODIFY MODIFIED NOT NULL; + +-- +-- RHNREDHATCANONVERSION +-- +ALTER TABLE RHNREDHATCANONVERSION DROP CONSTRAINT RHN_RH_CANON_VER_CREATED= _NN; +ALTER TABLE RHNREDHATCANONVERSION MODIFY CREATED NOT NULL; + +-- +-- RHNREDHATCANONVERSION +-- +ALTER TABLE RHNREDHATCANONVERSION DROP CONSTRAINT RHN_RH_CANON_VER_CV_NN; +ALTER TABLE RHNREDHATCANONVERSION MODIFY CANON_VERSION NOT NULL; + +-- +-- RHNREDHATCANONVERSION +-- +ALTER TABLE RHNREDHATCANONVERSION DROP CONSTRAINT RHN_RH_CANON_VER_MODIFIE= D_NN; +ALTER TABLE RHNREDHATCANONVERSION MODIFY MODIFIED NOT NULL; + +-- +-- RHNREDHATCANONVERSION +-- +ALTER TABLE RHNREDHATCANONVERSION DROP CONSTRAINT RHN_RH_CANON_VER_V_NN; +ALTER TABLE RHNREDHATCANONVERSION MODIFY VERSION NOT NULL; + +-- +-- RHNSERVERACTIONVERIFYMISSING +-- +ALTER TABLE RHNSERVERACTIONVERIFYMISSING DROP CONSTRAINT RHN_SACTIONVM_AID= _NN; +ALTER TABLE RHNSERVERACTIONVERIFYMISSING MODIFY ACTION_ID NOT NULL; + +-- +-- RHNSERVERACTIONVERIFYMISSING +-- +ALTER TABLE RHNSERVERACTIONVERIFYMISSING DROP CONSTRAINT RHN_SACTIONVM_CRE= AT_NN; +ALTER TABLE RHNSERVERACTIONVERIFYMISSING MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERACTIONVERIFYMISSING +-- +ALTER TABLE RHNSERVERACTIONVERIFYMISSING DROP CONSTRAINT RHN_SACTIONVM_MOD= _NN; +ALTER TABLE RHNSERVERACTIONVERIFYMISSING MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERACTIONVERIFYMISSING +-- +ALTER TABLE RHNSERVERACTIONVERIFYMISSING DROP CONSTRAINT RHN_SACTIONVM_PAI= D_NN; +ALTER TABLE RHNSERVERACTIONVERIFYMISSING MODIFY PACKAGE_ARCH_ID NOT NULL; + +-- +-- RHNSERVERACTIONVERIFYMISSING +-- +ALTER TABLE RHNSERVERACTIONVERIFYMISSING DROP CONSTRAINT RHN_SACTIONVM_PCI= D_NN; +ALTER TABLE RHNSERVERACTIONVERIFYMISSING MODIFY PACKAGE_CAPABILITY_ID NOT = NULL; + +-- +-- RHNSERVERACTIONVERIFYMISSING +-- +ALTER TABLE RHNSERVERACTIONVERIFYMISSING DROP CONSTRAINT RHN_SACTIONVM_PEI= D_NN; +ALTER TABLE RHNSERVERACTIONVERIFYMISSING MODIFY PACKAGE_EVR_ID NOT NULL; + +-- +-- RHNSERVERACTIONVERIFYMISSING +-- +ALTER TABLE RHNSERVERACTIONVERIFYMISSING DROP CONSTRAINT RHN_SACTIONVM_PNI= D_NN; +ALTER TABLE RHNSERVERACTIONVERIFYMISSING MODIFY PACKAGE_NAME_ID NOT NULL; + +-- +-- RHNSERVERACTIONVERIFYMISSING +-- +ALTER TABLE RHNSERVERACTIONVERIFYMISSING DROP CONSTRAINT RHN_SACTIONVM_SID= _NN; +ALTER TABLE RHNSERVERACTIONVERIFYMISSING MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSERVERACTIONVERIFYRESULT +-- +ALTER TABLE RHNSERVERACTIONVERIFYRESULT DROP CONSTRAINT RHN_SACTIONVR_AID_= NN; +ALTER TABLE RHNSERVERACTIONVERIFYRESULT MODIFY ACTION_ID NOT NULL; + +-- +-- RHNSERVERACTIONVERIFYRESULT +-- +ALTER TABLE RHNSERVERACTIONVERIFYRESULT DROP CONSTRAINT RHN_SACTIONVR_CREA= T_NN; +ALTER TABLE RHNSERVERACTIONVERIFYRESULT MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERACTIONVERIFYRESULT +-- +ALTER TABLE RHNSERVERACTIONVERIFYRESULT DROP CONSTRAINT RHN_SACTIONVR_DEVN= UM_NN; +ALTER TABLE RHNSERVERACTIONVERIFYRESULT MODIFY DEVNUM_DIFFERS NOT NULL; + +-- +-- RHNSERVERACTIONVERIFYRESULT +-- +ALTER TABLE RHNSERVERACTIONVERIFYRESULT DROP CONSTRAINT RHN_SACTIONVR_GID_= NN; +ALTER TABLE RHNSERVERACTIONVERIFYRESULT MODIFY GID_DIFFERS NOT NULL; + +-- +-- RHNSERVERACTIONVERIFYRESULT +-- +ALTER TABLE RHNSERVERACTIONVERIFYRESULT DROP CONSTRAINT RHN_SACTIONVR_MD5_= NN; +ALTER TABLE RHNSERVERACTIONVERIFYRESULT MODIFY MD5_DIFFERS NOT NULL; + +-- +-- RHNSERVERACTIONVERIFYRESULT +-- +ALTER TABLE RHNSERVERACTIONVERIFYRESULT DROP CONSTRAINT RHN_SACTIONVR_MODE= _NN; +ALTER TABLE RHNSERVERACTIONVERIFYRESULT MODIFY MODE_DIFFERS NOT NULL; + +-- +-- RHNSERVERACTIONVERIFYRESULT +-- +ALTER TABLE RHNSERVERACTIONVERIFYRESULT DROP CONSTRAINT RHN_SACTIONVR_MOD_= NN; +ALTER TABLE RHNSERVERACTIONVERIFYRESULT MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERACTIONVERIFYRESULT +-- +ALTER TABLE RHNSERVERACTIONVERIFYRESULT DROP CONSTRAINT RHN_SACTIONVR_MTIM= E_NN; +ALTER TABLE RHNSERVERACTIONVERIFYRESULT MODIFY MTIME_DIFFERS NOT NULL; + +-- +-- RHNSERVERACTIONVERIFYRESULT +-- +ALTER TABLE RHNSERVERACTIONVERIFYRESULT DROP CONSTRAINT RHN_SACTIONVR_PAID= _NN; +ALTER TABLE RHNSERVERACTIONVERIFYRESULT MODIFY PACKAGE_ARCH_ID NOT NULL; + +-- +-- RHNSERVERACTIONVERIFYRESULT +-- +ALTER TABLE RHNSERVERACTIONVERIFYRESULT DROP CONSTRAINT RHN_SACTIONVR_PCID= _NN; +ALTER TABLE RHNSERVERACTIONVERIFYRESULT MODIFY PACKAGE_CAPABILITY_ID NOT N= ULL; + +-- +-- RHNSERVERACTIONVERIFYRESULT +-- +ALTER TABLE RHNSERVERACTIONVERIFYRESULT DROP CONSTRAINT RHN_SACTIONVR_PEID= _NN; +ALTER TABLE RHNSERVERACTIONVERIFYRESULT MODIFY PACKAGE_EVR_ID NOT NULL; + +-- +-- RHNSERVERACTIONVERIFYRESULT +-- +ALTER TABLE RHNSERVERACTIONVERIFYRESULT DROP CONSTRAINT RHN_SACTIONVR_PNID= _NN; +ALTER TABLE RHNSERVERACTIONVERIFYRESULT MODIFY PACKAGE_NAME_ID NOT NULL; + +-- +-- RHNSERVERACTIONVERIFYRESULT +-- +ALTER TABLE RHNSERVERACTIONVERIFYRESULT DROP CONSTRAINT RHN_SACTIONVR_READ= LINK_NN; +ALTER TABLE RHNSERVERACTIONVERIFYRESULT MODIFY READLINK_DIFFERS NOT NULL; + +-- +-- RHNSERVERACTIONVERIFYRESULT +-- +ALTER TABLE RHNSERVERACTIONVERIFYRESULT DROP CONSTRAINT RHN_SACTIONVR_SID_= NN; +ALTER TABLE RHNSERVERACTIONVERIFYRESULT MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSERVERACTIONVERIFYRESULT +-- +ALTER TABLE RHNSERVERACTIONVERIFYRESULT DROP CONSTRAINT RHN_SACTIONVR_SIZE= _NN; +ALTER TABLE RHNSERVERACTIONVERIFYRESULT MODIFY SIZE_DIFFERS NOT NULL; + +-- +-- RHNSERVERACTIONVERIFYRESULT +-- +ALTER TABLE RHNSERVERACTIONVERIFYRESULT DROP CONSTRAINT RHN_SACTIONVR_UID_= NN; +ALTER TABLE RHNSERVERACTIONVERIFYRESULT MODIFY UID_DIFFERS NOT NULL; + +-- +-- RHNSERVERACTIONPACKAGERESULT +-- +ALTER TABLE RHNSERVERACTIONPACKAGERESULT DROP CONSTRAINT RHN_SAP_RESULT_AP= ID_NN; +ALTER TABLE RHNSERVERACTIONPACKAGERESULT MODIFY ACTION_PACKAGE_ID NOT NULL; + +-- +-- RHNSERVERACTIONPACKAGERESULT +-- +ALTER TABLE RHNSERVERACTIONPACKAGERESULT DROP CONSTRAINT RHN_SAP_RESULT_CR= EAT_NN; +ALTER TABLE RHNSERVERACTIONPACKAGERESULT MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERACTIONPACKAGERESULT +-- +ALTER TABLE RHNSERVERACTIONPACKAGERESULT DROP CONSTRAINT RHN_SAP_RESULT_MO= D_NN; +ALTER TABLE RHNSERVERACTIONPACKAGERESULT MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERACTIONPACKAGERESULT +-- +ALTER TABLE RHNSERVERACTIONPACKAGERESULT DROP CONSTRAINT RHN_SAP_RESULT_RC= _NN; +ALTER TABLE RHNSERVERACTIONPACKAGERESULT MODIFY RESULT_CODE NOT NULL; + +-- +-- RHNSERVERACTIONPACKAGERESULT +-- +ALTER TABLE RHNSERVERACTIONPACKAGERESULT DROP CONSTRAINT RHN_SAP_RESULT_SI= D_NN; +ALTER TABLE RHNSERVERACTIONPACKAGERESULT MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSERVERARCH +-- +ALTER TABLE RHNSERVERARCH DROP CONSTRAINT RHN_SARCH_ATID_NN; +ALTER TABLE RHNSERVERARCH MODIFY ARCH_TYPE_ID NOT NULL; + +-- +-- RHNSERVERARCH +-- +ALTER TABLE RHNSERVERARCH DROP CONSTRAINT RHN_SARCH_CREATED_NN; +ALTER TABLE RHNSERVERARCH MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERARCH +-- +ALTER TABLE RHNSERVERARCH DROP CONSTRAINT RHN_SARCH_ID_NN; +ALTER TABLE RHNSERVERARCH MODIFY ID NOT NULL; + +-- +-- RHNSERVERARCH +-- +ALTER TABLE RHNSERVERARCH DROP CONSTRAINT RHN_SARCH_LABEL_NN; +ALTER TABLE RHNSERVERARCH MODIFY LABEL NOT NULL; + +-- +-- RHNSERVERARCH +-- +ALTER TABLE RHNSERVERARCH DROP CONSTRAINT RHN_SARCH_MODIFIED_NN; +ALTER TABLE RHNSERVERARCH MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERARCH +-- +ALTER TABLE RHNSERVERARCH DROP CONSTRAINT RHN_SARCH_NAME_NN; +ALTER TABLE RHNSERVERARCH MODIFY NAME NOT NULL; + +-- +-- RHNSATELLITECERT +-- +ALTER TABLE RHNSATELLITECERT DROP CONSTRAINT RHN_SATCERT_CERT_NN; +ALTER TABLE RHNSATELLITECERT MODIFY CERT NOT NULL; + +-- +-- RHNSATELLITECERT +-- +ALTER TABLE RHNSATELLITECERT DROP CONSTRAINT RHN_SATCERT_CREATED_NN; +ALTER TABLE RHNSATELLITECERT MODIFY CREATED NOT NULL; + +-- +-- RHNSATELLITECERT +-- +ALTER TABLE RHNSATELLITECERT DROP CONSTRAINT RHN_SATCERT_LABEL_NN; +ALTER TABLE RHNSATELLITECERT MODIFY LABEL NOT NULL; + +-- +-- RHNSATELLITECERT +-- +ALTER TABLE RHNSATELLITECERT DROP CONSTRAINT RHN_SATCERT_MODIFIED_NN; +ALTER TABLE RHNSATELLITECERT MODIFY MODIFIED NOT NULL; + +-- +-- RHN_SAT_CLUSTER +-- +ALTER TABLE RHN_SAT_CLUSTER DROP CONSTRAINT RHN_SATCL_CUST_ID_NN; +ALTER TABLE RHN_SAT_CLUSTER MODIFY CUSTOMER_ID NOT NULL; + +-- +-- RHN_SAT_CLUSTER +-- +ALTER TABLE RHN_SAT_CLUSTER DROP CONSTRAINT RHN_SATCL_DEPLOYED_NN; +ALTER TABLE RHN_SAT_CLUSTER MODIFY DEPLOYED NOT NULL; + +-- +-- RHN_SAT_CLUSTER +-- +ALTER TABLE RHN_SAT_CLUSTER DROP CONSTRAINT RHN_SATCL_DESC_NN; +ALTER TABLE RHN_SAT_CLUSTER MODIFY DESCRIPTION NOT NULL; + +-- +-- RHN_SAT_CLUSTER +-- +ALTER TABLE RHN_SAT_CLUSTER DROP CONSTRAINT RHN_SATCL_LOCATION_ID_NN; +ALTER TABLE RHN_SAT_CLUSTER MODIFY PHYSICAL_LOCATION_ID NOT NULL; + +-- +-- RHN_SAT_CLUSTER +-- +ALTER TABLE RHN_SAT_CLUSTER DROP CONSTRAINT RHN_SATCL_RECID_NN; +ALTER TABLE RHN_SAT_CLUSTER MODIFY RECID NOT NULL; + +-- +-- RHN_SAT_CLUSTER +-- +ALTER TABLE RHN_SAT_CLUSTER DROP CONSTRAINT RHN_SATCL_TARGET_TYPE_NN; +ALTER TABLE RHN_SAT_CLUSTER MODIFY TARGET_TYPE NOT NULL; + +-- +-- RHNSATELLITEINFO +-- +ALTER TABLE RHNSATELLITEINFO DROP CONSTRAINT RHN_SATELLITE_INFO_CERT_NN; +ALTER TABLE RHNSATELLITEINFO MODIFY CERT NOT NULL; + +-- +-- RHNSATELLITEINFO +-- +ALTER TABLE RHNSATELLITEINFO DROP CONSTRAINT RHN_SATELLITE_INFO_CREATED_NN; +ALTER TABLE RHNSATELLITEINFO MODIFY CREATED NOT NULL; + +-- +-- RHNSATELLITEINFO +-- +ALTER TABLE RHNSATELLITEINFO DROP CONSTRAINT RHN_SATELLITE_INFO_MODIFIED_N= N; +ALTER TABLE RHNSATELLITEINFO MODIFY MODIFIED NOT NULL; + +-- +-- RHNSATELLITEINFO +-- +ALTER TABLE RHNSATELLITEINFO DROP CONSTRAINT RHN_SATELLITE_INFO_OWNER_NN; +ALTER TABLE RHNSATELLITEINFO MODIFY OWNER NOT NULL; + +-- +-- RHNSATELLITEINFO +-- +ALTER TABLE RHNSATELLITEINFO DROP CONSTRAINT RHN_SATELLITE_INFO_PRODUCT_NN; +ALTER TABLE RHNSATELLITEINFO MODIFY PRODUCT NOT NULL; + +-- +-- RHNSATELLITEINFO +-- +ALTER TABLE RHNSATELLITEINFO DROP CONSTRAINT RHN_SATELLITE_INFO_SID_NN; +ALTER TABLE RHNSATELLITEINFO MODIFY SERVER_ID NOT NULL; + +-- +-- RHN_SAT_NODE +-- +ALTER TABLE RHN_SAT_NODE DROP CONSTRAINT RHN_SATND_DQ_LOG_LEVEL_NN; +ALTER TABLE RHN_SAT_NODE MODIFY DQ_LOG_LEVEL NOT NULL; + +-- +-- RHN_SAT_NODE +-- +ALTER TABLE RHN_SAT_NODE DROP CONSTRAINT RHN_SATND_MAC_ADDRESS_NN; +ALTER TABLE RHN_SAT_NODE MODIFY MAC_ADDRESS NOT NULL; + +-- +-- RHN_SAT_NODE +-- +ALTER TABLE RHN_SAT_NODE DROP CONSTRAINT RHN_SATND_RECID_NN; +ALTER TABLE RHN_SAT_NODE MODIFY RECID NOT NULL; + +-- +-- RHN_SAT_NODE +-- +ALTER TABLE RHN_SAT_NODE DROP CONSTRAINT RHN_SATND_SAT_CLUSTER_ID_NN; +ALTER TABLE RHN_SAT_NODE MODIFY SAT_CLUSTER_ID NOT NULL; + +-- +-- RHN_SAT_NODE +-- +ALTER TABLE RHN_SAT_NODE DROP CONSTRAINT RHN_SATND_SCHED_LOG_LEVEL_NN; +ALTER TABLE RHN_SAT_NODE MODIFY SCHED_LOG_LEVEL NOT NULL; + +-- +-- RHN_SAT_NODE +-- +ALTER TABLE RHN_SAT_NODE DROP CONSTRAINT RHN_SATND_SPUT_LOG_LEVEL_NN; +ALTER TABLE RHN_SAT_NODE MODIFY SPUT_LOG_LEVEL NOT NULL; + +-- +-- RHN_SAT_NODE +-- +ALTER TABLE RHN_SAT_NODE DROP CONSTRAINT RHN_SATND_SSK_NN; +ALTER TABLE RHN_SAT_NODE MODIFY SCOUT_SHARED_KEY NOT NULL; + +-- +-- RHN_SAT_NODE +-- +ALTER TABLE RHN_SAT_NODE DROP CONSTRAINT RHN_SATND_TARGET_TYPE_NN; +ALTER TABLE RHN_SAT_NODE MODIFY TARGET_TYPE NOT NULL; + +-- +-- RHNSATELLITESERVERGROUP +-- +ALTER TABLE RHNSATELLITESERVERGROUP DROP CONSTRAINT RHN_SATSG_CREAT_NN; +ALTER TABLE RHNSATELLITESERVERGROUP MODIFY CREATED NOT NULL; + +-- +-- RHNSATELLITESERVERGROUP +-- +ALTER TABLE RHNSATELLITESERVERGROUP DROP CONSTRAINT RHN_SATSG_MOD_NN; +ALTER TABLE RHNSATELLITESERVERGROUP MODIFY MODIFIED NOT NULL; + +-- +-- RHNSATELLITESERVERGROUP +-- +ALTER TABLE RHNSATELLITESERVERGROUP DROP CONSTRAINT RHN_SATSG_SGTYPE_NN; +ALTER TABLE RHNSATELLITESERVERGROUP MODIFY SERVER_GROUP_TYPE NOT NULL; + +-- +-- RHNSATELLITESERVERGROUP +-- +ALTER TABLE RHNSATELLITESERVERGROUP DROP CONSTRAINT RHN_SATSG_SID_NN; +ALTER TABLE RHNSATELLITESERVERGROUP MODIFY SERVER_ID NOT NULL; + +-- +-- RHN_SATELLITE_STATE +-- +ALTER TABLE RHN_SATELLITE_STATE DROP CONSTRAINT RHN_SATST_SAT_ID_NN; +ALTER TABLE RHN_SATELLITE_STATE MODIFY SATELLITE_ID NOT NULL; + +-- +-- RHNSATELLITECHANNELFAMILY +-- +ALTER TABLE RHNSATELLITECHANNELFAMILY DROP CONSTRAINT RHN_SAT_CF_CFID_NN; +ALTER TABLE RHNSATELLITECHANNELFAMILY MODIFY CHANNEL_FAMILY_ID NOT NULL; + +-- +-- RHNSATELLITECHANNELFAMILY +-- +ALTER TABLE RHNSATELLITECHANNELFAMILY DROP CONSTRAINT RHN_SAT_CF_CREATED_N= N; +ALTER TABLE RHNSATELLITECHANNELFAMILY MODIFY CREATED NOT NULL; + +-- +-- RHNSATELLITECHANNELFAMILY +-- +ALTER TABLE RHNSATELLITECHANNELFAMILY DROP CONSTRAINT RHN_SAT_CF_MODIFIED_= NN; +ALTER TABLE RHNSATELLITECHANNELFAMILY MODIFY MODIFIED NOT NULL; + +-- +-- RHNSATELLITECHANNELFAMILY +-- +ALTER TABLE RHNSATELLITECHANNELFAMILY DROP CONSTRAINT RHN_SAT_CF_SID_NN; +ALTER TABLE RHNSATELLITECHANNELFAMILY MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSAVEDSEARCH +-- +ALTER TABLE RHNSAVEDSEARCH DROP CONSTRAINT RHN_SAVEDSEARCH_ID_NN; +ALTER TABLE RHNSAVEDSEARCH MODIFY ID NOT NULL; + +-- +-- RHNSAVEDSEARCH +-- +ALTER TABLE RHNSAVEDSEARCH DROP CONSTRAINT RHN_SAVEDSEARCH_INVERT_NN; +ALTER TABLE RHNSAVEDSEARCH MODIFY INVERT NOT NULL; + +-- +-- RHNSAVEDSEARCH +-- +ALTER TABLE RHNSAVEDSEARCH DROP CONSTRAINT RHN_SAVEDSEARCH_NAME_NN; +ALTER TABLE RHNSAVEDSEARCH MODIFY NAME NOT NULL; + +-- +-- RHNSAVEDSEARCH +-- +ALTER TABLE RHNSAVEDSEARCH DROP CONSTRAINT RHN_SAVEDSEARCH_SFIELD_NN; +ALTER TABLE RHNSAVEDSEARCH MODIFY SEARCH_FIELD NOT NULL; + +-- +-- RHNSAVEDSEARCH +-- +ALTER TABLE RHNSAVEDSEARCH DROP CONSTRAINT RHN_SAVEDSEARCH_SSET_NN; +ALTER TABLE RHNSAVEDSEARCH MODIFY SEARCH_SET NOT NULL; + +-- +-- RHNSAVEDSEARCH +-- +ALTER TABLE RHNSAVEDSEARCH DROP CONSTRAINT RHN_SAVEDSEARCH_SSTRING_NN; +ALTER TABLE RHNSAVEDSEARCH MODIFY SEARCH_STRING NOT NULL; + +-- +-- RHNSAVEDSEARCH +-- +ALTER TABLE RHNSAVEDSEARCH DROP CONSTRAINT RHN_SAVEDSEARCH_TYPE_NN; +ALTER TABLE RHNSAVEDSEARCH MODIFY TYPE NOT NULL; + +-- +-- RHNSAVEDSEARCH +-- +ALTER TABLE RHNSAVEDSEARCH DROP CONSTRAINT RHN_SAVEDSEARCH_WCID_NN; +ALTER TABLE RHNSAVEDSEARCH MODIFY WEB_CONTACT_ID NOT NULL; + +-- +-- RHNSERVERCUSTOMDATAVALUE +-- +ALTER TABLE RHNSERVERCUSTOMDATAVALUE DROP CONSTRAINT RHN_SCDV_CREATED_NN; +ALTER TABLE RHNSERVERCUSTOMDATAVALUE MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERCUSTOMDATAVALUE +-- +ALTER TABLE RHNSERVERCUSTOMDATAVALUE DROP CONSTRAINT RHN_SCDV_KID_NN; +ALTER TABLE RHNSERVERCUSTOMDATAVALUE MODIFY KEY_ID NOT NULL; + +-- +-- RHNSERVERCUSTOMDATAVALUE +-- +ALTER TABLE RHNSERVERCUSTOMDATAVALUE DROP CONSTRAINT RHN_SCDV_MODIFIED_NN; +ALTER TABLE RHNSERVERCUSTOMDATAVALUE MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERCUSTOMDATAVALUE +-- +ALTER TABLE RHNSERVERCUSTOMDATAVALUE DROP CONSTRAINT RHN_SCDV_SID_NN; +ALTER TABLE RHNSERVERCUSTOMDATAVALUE MODIFY SERVER_ID NOT NULL; + +-- +-- RHN_SCHEDULE_DAYS +-- +ALTER TABLE RHN_SCHEDULE_DAYS DROP CONSTRAINT RHN_SCHDY_RECID_NN; +ALTER TABLE RHN_SCHEDULE_DAYS MODIFY RECID NOT NULL; + +-- +-- RHN_SCHEDULES +-- +ALTER TABLE RHN_SCHEDULES DROP CONSTRAINT RHN_SCHED_DESC_NN; +ALTER TABLE RHN_SCHEDULES MODIFY DESCRIPTION NOT NULL; + +-- +-- RHN_SCHEDULES +-- +ALTER TABLE RHN_SCHEDULES DROP CONSTRAINT RHN_SCHED_RECID_NN; +ALTER TABLE RHN_SCHEDULES MODIFY RECID NOT NULL; + +-- +-- RHN_SCHEDULES +-- +ALTER TABLE RHN_SCHEDULES DROP CONSTRAINT RHN_SCHED_TYPE_ID_NN; +ALTER TABLE RHN_SCHEDULES MODIFY SCHEDULE_TYPE_ID NOT NULL; + +-- +-- RHN_SCHEDULE_TYPES +-- +ALTER TABLE RHN_SCHEDULE_TYPES DROP CONSTRAINT RHN_SCHTP_RECID_NN; +ALTER TABLE RHN_SCHEDULE_TYPES MODIFY RECID NOT NULL; + +-- +-- RHN_SCHEDULE_WEEKS +-- +ALTER TABLE RHN_SCHEDULE_WEEKS DROP CONSTRAINT RHN_SCHWK_RECID_NN; +ALTER TABLE RHN_SCHEDULE_WEEKS MODIFY RECID NOT NULL; + +-- +-- RHN_SCHEDULE_WEEKS +-- +ALTER TABLE RHN_SCHEDULE_WEEKS DROP CONSTRAINT RHN_SCHWK_SCHED_ID_NN; +ALTER TABLE RHN_SCHEDULE_WEEKS MODIFY SCHEDULE_ID NOT NULL; + +-- +-- RHN_SAT_CLUSTER_PROBE +-- +ALTER TABLE RHN_SAT_CLUSTER_PROBE DROP CONSTRAINT RHN_SCLPB_PROBE_ID_NN; +ALTER TABLE RHN_SAT_CLUSTER_PROBE MODIFY PROBE_ID NOT NULL; + +-- +-- RHN_SAT_CLUSTER_PROBE +-- +ALTER TABLE RHN_SAT_CLUSTER_PROBE DROP CONSTRAINT RHN_SCLPB_PROBE_TYPE_NN; +ALTER TABLE RHN_SAT_CLUSTER_PROBE MODIFY PROBE_TYPE NOT NULL; + +-- +-- RHN_SAT_CLUSTER_PROBE +-- +ALTER TABLE RHN_SAT_CLUSTER_PROBE DROP CONSTRAINT RHN_SCLPB_SAT_CLUSTER_ID= _NN; +ALTER TABLE RHN_SAT_CLUSTER_PROBE MODIFY SAT_CLUSTER_ID NOT NULL; + +-- +-- RHNSERVERCHANNELARCHCOMPAT +-- +ALTER TABLE RHNSERVERCHANNELARCHCOMPAT DROP CONSTRAINT RHN_SC_AC_CAID_NN; +ALTER TABLE RHNSERVERCHANNELARCHCOMPAT MODIFY CHANNEL_ARCH_ID NOT NULL; + +-- +-- RHNSERVERCHANNELARCHCOMPAT +-- +ALTER TABLE RHNSERVERCHANNELARCHCOMPAT DROP CONSTRAINT RHN_SC_AC_CREATED_N= N; +ALTER TABLE RHNSERVERCHANNELARCHCOMPAT MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERCHANNELARCHCOMPAT +-- +ALTER TABLE RHNSERVERCHANNELARCHCOMPAT DROP CONSTRAINT RHN_SC_AC_MODIFIED_= NN; +ALTER TABLE RHNSERVERCHANNELARCHCOMPAT MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERCHANNELARCHCOMPAT +-- +ALTER TABLE RHNSERVERCHANNELARCHCOMPAT DROP CONSTRAINT RHN_SC_AC_SAID_NN; +ALTER TABLE RHNSERVERCHANNELARCHCOMPAT MODIFY SERVER_ARCH_ID NOT NULL; + +-- +-- RHNSERVERCHANNEL +-- +ALTER TABLE RHNSERVERCHANNEL DROP CONSTRAINT RHN_SC_CID_NN; +ALTER TABLE RHNSERVERCHANNEL MODIFY CHANNEL_ID NOT NULL; + +-- +-- RHNSERVERCHANNEL +-- +ALTER TABLE RHNSERVERCHANNEL DROP CONSTRAINT RHN_SC_CREATED_NN; +ALTER TABLE RHNSERVERCHANNEL MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERCHANNEL +-- +ALTER TABLE RHNSERVERCHANNEL DROP CONSTRAINT RHN_SC_MODIFIED_NN; +ALTER TABLE RHNSERVERCHANNEL MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERCHANNEL +-- +ALTER TABLE RHNSERVERCHANNEL DROP CONSTRAINT RHN_SC_SID_NN; +ALTER TABLE RHNSERVERCHANNEL MODIFY SERVER_ID NOT NULL; + +-- +-- RHN_SEMANTIC_DATA_TYPE +-- +ALTER TABLE RHN_SEMANTIC_DATA_TYPE DROP CONSTRAINT RHN_SDTYP_DESC_NN; +ALTER TABLE RHN_SEMANTIC_DATA_TYPE MODIFY DESCRIPTION NOT NULL; + +-- +-- RHN_SEMANTIC_DATA_TYPE +-- +ALTER TABLE RHN_SEMANTIC_DATA_TYPE DROP CONSTRAINT RHN_SDTYP_NAME_NN; +ALTER TABLE RHN_SEMANTIC_DATA_TYPE MODIFY NAME NOT NULL; + +-- +-- RHNSNPSERVERQUEUE +-- +ALTER TABLE RHNSNPSERVERQUEUE DROP CONSTRAINT RHN_SEC_NP_PROCESSED_NN; +ALTER TABLE RHNSNPSERVERQUEUE MODIFY PROCESSED NOT NULL; + +-- +-- RHNSNPSERVERQUEUE +-- +ALTER TABLE RHNSNPSERVERQUEUE DROP CONSTRAINT RHN_SEC_NP_SID_NN; +ALTER TABLE RHNSNPSERVERQUEUE MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSERVERACTIONSCRIPTRESULT +-- +ALTER TABLE RHNSERVERACTIONSCRIPTRESULT DROP CONSTRAINT RHN_SERVERAS_RESUL= T_ASID_NN; +ALTER TABLE RHNSERVERACTIONSCRIPTRESULT MODIFY ACTION_SCRIPT_ID NOT NULL; + +-- +-- RHNSERVERACTIONSCRIPTRESULT +-- +ALTER TABLE RHNSERVERACTIONSCRIPTRESULT DROP CONSTRAINT RHN_SERVERAS_RESUL= T_CREAT_NN; +ALTER TABLE RHNSERVERACTIONSCRIPTRESULT MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERACTIONSCRIPTRESULT +-- +ALTER TABLE RHNSERVERACTIONSCRIPTRESULT DROP CONSTRAINT RHN_SERVERAS_RESUL= T_MOD_NN; +ALTER TABLE RHNSERVERACTIONSCRIPTRESULT MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERACTIONSCRIPTRESULT +-- +ALTER TABLE RHNSERVERACTIONSCRIPTRESULT DROP CONSTRAINT RHN_SERVERAS_RESUL= T_RETURN_NN; +ALTER TABLE RHNSERVERACTIONSCRIPTRESULT MODIFY RETURN_CODE NOT NULL; + +-- +-- RHNSERVERACTIONSCRIPTRESULT +-- +ALTER TABLE RHNSERVERACTIONSCRIPTRESULT DROP CONSTRAINT RHN_SERVERAS_RESUL= T_SID_NN; +ALTER TABLE RHNSERVERACTIONSCRIPTRESULT MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSERVERACTIONSCRIPTRESULT +-- +ALTER TABLE RHNSERVERACTIONSCRIPTRESULT DROP CONSTRAINT RHN_SERVERAS_RESUL= T_START_NN; +ALTER TABLE RHNSERVERACTIONSCRIPTRESULT MODIFY START_DATE NOT NULL; + +-- +-- RHNSERVERACTIONSCRIPTRESULT +-- +ALTER TABLE RHNSERVERACTIONSCRIPTRESULT DROP CONSTRAINT RHN_SERVERAS_RESUL= T_STOP_NN; +ALTER TABLE RHNSERVERACTIONSCRIPTRESULT MODIFY STOP_DATE NOT NULL; + +-- +-- RHNSERVERCONFIGCHANNEL +-- +ALTER TABLE RHNSERVERCONFIGCHANNEL DROP CONSTRAINT RHN_SERVERCC_CCID_NN; +ALTER TABLE RHNSERVERCONFIGCHANNEL MODIFY CONFIG_CHANNEL_ID NOT NULL; + +-- +-- RHNSERVERCONFIGCHANNEL +-- +ALTER TABLE RHNSERVERCONFIGCHANNEL DROP CONSTRAINT RHN_SERVERCC_CREAT_NN; +ALTER TABLE RHNSERVERCONFIGCHANNEL MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERCONFIGCHANNEL +-- +ALTER TABLE RHNSERVERCONFIGCHANNEL DROP CONSTRAINT RHN_SERVERCC_MOD_NN; +ALTER TABLE RHNSERVERCONFIGCHANNEL MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERCONFIGCHANNEL +-- +ALTER TABLE RHNSERVERCONFIGCHANNEL DROP CONSTRAINT RHN_SERVERCC_SID_NN; +ALTER TABLE RHNSERVERCONFIGCHANNEL MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSERVERGROUPTYPE +-- +ALTER TABLE RHNSERVERGROUPTYPE DROP CONSTRAINT RHN_SERVERGROUPTYPE_CREATED= _NN; +ALTER TABLE RHNSERVERGROUPTYPE MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERGROUPTYPE +-- +ALTER TABLE RHNSERVERGROUPTYPE DROP CONSTRAINT RHN_SERVERGROUPTYPE_ID_NN; +ALTER TABLE RHNSERVERGROUPTYPE MODIFY ID NOT NULL; + +-- +-- RHNSERVERGROUPTYPE +-- +ALTER TABLE RHNSERVERGROUPTYPE DROP CONSTRAINT RHN_SERVERGROUPTYPE_ISBASE_= NN; +ALTER TABLE RHNSERVERGROUPTYPE MODIFY IS_BASE NOT NULL; + +-- +-- RHNSERVERGROUPTYPE +-- +ALTER TABLE RHNSERVERGROUPTYPE DROP CONSTRAINT RHN_SERVERGROUPTYPE_LABEL_N= N; +ALTER TABLE RHNSERVERGROUPTYPE MODIFY LABEL NOT NULL; + +-- +-- RHNSERVERGROUPTYPE +-- +ALTER TABLE RHNSERVERGROUPTYPE DROP CONSTRAINT RHN_SERVERGROUPTYPE_MOD_NN; +ALTER TABLE RHNSERVERGROUPTYPE MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERGROUPTYPE +-- +ALTER TABLE RHNSERVERGROUPTYPE DROP CONSTRAINT RHN_SERVERGROUPTYPE_NAME_NN; +ALTER TABLE RHNSERVERGROUPTYPE MODIFY NAME NOT NULL; + +-- +-- RHNSERVERGROUPTYPE +-- +ALTER TABLE RHNSERVERGROUPTYPE DROP CONSTRAINT RHN_SERVERGROUPTYPE_PERM_NN; +ALTER TABLE RHNSERVERGROUPTYPE MODIFY PERMANENT NOT NULL; + +-- +-- RHNSERVERGROUP +-- +ALTER TABLE RHNSERVERGROUP DROP CONSTRAINT RHN_SERVERGROUP_CREATED_NN; +ALTER TABLE RHNSERVERGROUP MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERGROUP +-- +ALTER TABLE RHNSERVERGROUP DROP CONSTRAINT RHN_SERVERGROUP_CURMEMBERS_NN; +ALTER TABLE RHNSERVERGROUP MODIFY CURRENT_MEMBERS NOT NULL; + +-- +-- RHNSERVERGROUP +-- +ALTER TABLE RHNSERVERGROUP DROP CONSTRAINT RHN_SERVERGROUP_DESC_NN; +ALTER TABLE RHNSERVERGROUP MODIFY DESCRIPTION NOT NULL; + +-- +-- RHNSERVERGROUP +-- +ALTER TABLE RHNSERVERGROUP DROP CONSTRAINT RHN_SERVERGROUP_ID_NN; +ALTER TABLE RHNSERVERGROUP MODIFY ID NOT NULL; + +-- +-- RHNSERVERGROUP +-- +ALTER TABLE RHNSERVERGROUP DROP CONSTRAINT RHN_SERVERGROUP_MODIFIED_NN; +ALTER TABLE RHNSERVERGROUP MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERGROUP +-- +ALTER TABLE RHNSERVERGROUP DROP CONSTRAINT RHN_SERVERGROUP_NAME_NN; +ALTER TABLE RHNSERVERGROUP MODIFY NAME NOT NULL; + +-- +-- RHNSERVERGROUP +-- +ALTER TABLE RHNSERVERGROUP DROP CONSTRAINT RHN_SERVERGROUP_OID_NN; +ALTER TABLE RHNSERVERGROUP MODIFY ORG_ID NOT NULL; + +-- +-- RHNSERVERGROUPNOTES +-- +ALTER TABLE RHNSERVERGROUPNOTES DROP CONSTRAINT RHN_SERVERGRP_NOTE_CREATED= _NN; +ALTER TABLE RHNSERVERGROUPNOTES MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERGROUPNOTES +-- +ALTER TABLE RHNSERVERGROUPNOTES DROP CONSTRAINT RHN_SERVERGRP_NOTE_ID_NN; +ALTER TABLE RHNSERVERGROUPNOTES MODIFY ID NOT NULL; + +-- +-- RHNSERVERGROUPNOTES +-- +ALTER TABLE RHNSERVERGROUPNOTES DROP CONSTRAINT RHN_SERVERGRP_NOTE_MODIFIE= D_NN; +ALTER TABLE RHNSERVERGROUPNOTES MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERGROUPNOTES +-- +ALTER TABLE RHNSERVERGROUPNOTES DROP CONSTRAINT RHN_SERVERGRP_NOTE_NN; +ALTER TABLE RHNSERVERGROUPNOTES MODIFY SERVER_GROUP_ID NOT NULL; + +-- +-- RHNSERVERGROUPNOTES +-- +ALTER TABLE RHNSERVERGROUPNOTES DROP CONSTRAINT RHN_SERVERGRP_NOTE_NOTE_NN; +ALTER TABLE RHNSERVERGROUPNOTES MODIFY NOTE NOT NULL; + +-- +-- RHNSERVERGROUPNOTES +-- +ALTER TABLE RHNSERVERGROUPNOTES DROP CONSTRAINT RHN_SERVERGRP_NOTE_SUBJECT= _NN; +ALTER TABLE RHNSERVERGROUPNOTES MODIFY SUBJECT NOT NULL; + +-- +-- RHNSERVERHISTORY +-- +ALTER TABLE RHNSERVERHISTORY DROP CONSTRAINT RHN_SERVERHISTORY_CREATED_NN; +ALTER TABLE RHNSERVERHISTORY MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERHISTORY +-- +ALTER TABLE RHNSERVERHISTORY DROP CONSTRAINT RHN_SERVERHISTORY_ID_NN; +ALTER TABLE RHNSERVERHISTORY MODIFY ID NOT NULL; + +-- +-- RHNSERVERHISTORY +-- +ALTER TABLE RHNSERVERHISTORY DROP CONSTRAINT RHN_SERVERHISTORY_MODIFIED_NN; +ALTER TABLE RHNSERVERHISTORY MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERHISTORY +-- +ALTER TABLE RHNSERVERHISTORY DROP CONSTRAINT RHN_SERVERHISTORY_SID_NN; +ALTER TABLE RHNSERVERHISTORY MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSERVERHISTORY +-- +ALTER TABLE RHNSERVERHISTORY DROP CONSTRAINT RHN_SERVERHISTORY_SUMMARY_NN; +ALTER TABLE RHNSERVERHISTORY MODIFY SUMMARY NOT NULL; + +-- +-- RHNSERVERLOCATION +-- +ALTER TABLE RHNSERVERLOCATION DROP CONSTRAINT RHN_SERVERLOCATION_CREATED_N= N; +ALTER TABLE RHNSERVERLOCATION MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERLOCATION +-- +ALTER TABLE RHNSERVERLOCATION DROP CONSTRAINT RHN_SERVERLOCATION_ID_NN; +ALTER TABLE RHNSERVERLOCATION MODIFY ID NOT NULL; + +-- +-- RHNSERVERLOCATION +-- +ALTER TABLE RHNSERVERLOCATION DROP CONSTRAINT RHN_SERVERLOCATION_MODIFIED_= NN; +ALTER TABLE RHNSERVERLOCATION MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERLOCATION +-- +ALTER TABLE RHNSERVERLOCATION DROP CONSTRAINT RHN_SERVERLOCATION_SID_NN; +ALTER TABLE RHNSERVERLOCATION MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSERVERNETWORK +-- +ALTER TABLE RHNSERVERNETWORK DROP CONSTRAINT RHN_SERVERNETWORK_CREATED_NN; +ALTER TABLE RHNSERVERNETWORK MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERNETWORK +-- +ALTER TABLE RHNSERVERNETWORK DROP CONSTRAINT RHN_SERVERNETWORK_ID_NN; +ALTER TABLE RHNSERVERNETWORK MODIFY ID NOT NULL; + +-- +-- RHNSERVERNETWORK +-- +ALTER TABLE RHNSERVERNETWORK DROP CONSTRAINT RHN_SERVERNETWORK_MODIFIED_NN; +ALTER TABLE RHNSERVERNETWORK MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERNETWORK +-- +ALTER TABLE RHNSERVERNETWORK DROP CONSTRAINT RHN_SERVERNETWORK_SID_NN; +ALTER TABLE RHNSERVERNETWORK MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSERVERNOTES +-- +ALTER TABLE RHNSERVERNOTES DROP CONSTRAINT RHN_SERVERNOTES_CREATED_NN; +ALTER TABLE RHNSERVERNOTES MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERNOTES +-- +ALTER TABLE RHNSERVERNOTES DROP CONSTRAINT RHN_SERVERNOTES_ID_NN; +ALTER TABLE RHNSERVERNOTES MODIFY ID NOT NULL; + +-- +-- RHNSERVERNOTES +-- +ALTER TABLE RHNSERVERNOTES DROP CONSTRAINT RHN_SERVERNOTES_MODIFIED_NN; +ALTER TABLE RHNSERVERNOTES MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERNOTES +-- +ALTER TABLE RHNSERVERNOTES DROP CONSTRAINT RHN_SERVERNOTES_SID_NN; +ALTER TABLE RHNSERVERNOTES MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSERVERNOTES +-- +ALTER TABLE RHNSERVERNOTES DROP CONSTRAINT RHN_SERVERNOTES_SUBJECT_NN; +ALTER TABLE RHNSERVERNOTES MODIFY SUBJECT NOT NULL; + +-- +-- RHNSERVERPACKAGE +-- +ALTER TABLE RHNSERVERPACKAGE DROP CONSTRAINT RHN_SERVERPACKAGE_EID_NN; +ALTER TABLE RHNSERVERPACKAGE MODIFY EVR_ID NOT NULL; + +-- +-- RHNSERVERPACKAGE +-- +ALTER TABLE RHNSERVERPACKAGE DROP CONSTRAINT RHN_SERVERPACKAGE_NID_NN; +ALTER TABLE RHNSERVERPACKAGE MODIFY NAME_ID NOT NULL; + +-- +-- RHNSERVERPACKAGE +-- +ALTER TABLE RHNSERVERPACKAGE DROP CONSTRAINT RHN_SERVERPACKAGE_SID_NN; +ALTER TABLE RHNSERVERPACKAGE MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSERVERPATH +-- +ALTER TABLE RHNSERVERPATH DROP CONSTRAINT RHN_SERVERPATH_CREAT_NN; +ALTER TABLE RHNSERVERPATH MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERPATH +-- +ALTER TABLE RHNSERVERPATH DROP CONSTRAINT RHN_SERVERPATH_HOSTNAME_NN; +ALTER TABLE RHNSERVERPATH MODIFY HOSTNAME NOT NULL; + +-- +-- RHNSERVERPATH +-- +ALTER TABLE RHNSERVERPATH DROP CONSTRAINT RHN_SERVERPATH_MOD_NN; +ALTER TABLE RHNSERVERPATH MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERPATH +-- +ALTER TABLE RHNSERVERPATH DROP CONSTRAINT RHN_SERVERPATH_POS_NN; +ALTER TABLE RHNSERVERPATH MODIFY POSITION NOT NULL; + +-- +-- RHNSERVERPATH +-- +ALTER TABLE RHNSERVERPATH DROP CONSTRAINT RHN_SERVERPATH_PSID_NN; +ALTER TABLE RHNSERVERPATH MODIFY PROXY_SERVER_ID NOT NULL; + +-- +-- RHNSERVERPATH +-- +ALTER TABLE RHNSERVERPATH DROP CONSTRAINT RHN_SERVERPATH_SID_NN; +ALTER TABLE RHNSERVERPATH MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSERVERPRESERVEFILELIST +-- +ALTER TABLE RHNSERVERPRESERVEFILELIST DROP CONSTRAINT RHN_SERVERPFL_CREAT_= NN; +ALTER TABLE RHNSERVERPRESERVEFILELIST MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERPRESERVEFILELIST +-- +ALTER TABLE RHNSERVERPRESERVEFILELIST DROP CONSTRAINT RHN_SERVERPFL_FLID_N= N; +ALTER TABLE RHNSERVERPRESERVEFILELIST MODIFY FILE_LIST_ID NOT NULL; + +-- +-- RHNSERVERPRESERVEFILELIST +-- +ALTER TABLE RHNSERVERPRESERVEFILELIST DROP CONSTRAINT RHN_SERVERPFL_KSID_N= N; +ALTER TABLE RHNSERVERPRESERVEFILELIST MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSERVERPRESERVEFILELIST +-- +ALTER TABLE RHNSERVERPRESERVEFILELIST DROP CONSTRAINT RHN_SERVERPFL_MOD_NN; +ALTER TABLE RHNSERVERPRESERVEFILELIST MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERACTION +-- +ALTER TABLE RHNSERVERACTION DROP CONSTRAINT RHN_SERVER_ACTION_AID_NN; +ALTER TABLE RHNSERVERACTION MODIFY ACTION_ID NOT NULL; + +-- +-- RHNSERVERACTION +-- +ALTER TABLE RHNSERVERACTION DROP CONSTRAINT RHN_SERVER_ACTION_CREATED_NN; +ALTER TABLE RHNSERVERACTION MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERACTION +-- +ALTER TABLE RHNSERVERACTION DROP CONSTRAINT RHN_SERVER_ACTION_MODIFIED_NN; +ALTER TABLE RHNSERVERACTION MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERACTION +-- +ALTER TABLE RHNSERVERACTION DROP CONSTRAINT RHN_SERVER_ACTION_REMAINING_NN; +ALTER TABLE RHNSERVERACTION MODIFY REMAINING_TRIES NOT NULL; + +-- +-- RHNSERVERACTION +-- +ALTER TABLE RHNSERVERACTION DROP CONSTRAINT RHN_SERVER_ACTION_SID_NN; +ALTER TABLE RHNSERVERACTION MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSERVERACTION +-- +ALTER TABLE RHNSERVERACTION DROP CONSTRAINT RHN_SERVER_ACTION_STATUS_NN; +ALTER TABLE RHNSERVERACTION MODIFY STATUS NOT NULL; + +-- +-- RHNSERVER +-- +ALTER TABLE RHNSERVER DROP CONSTRAINT RHN_SERVER_AUTO_DELIVER_NN; +ALTER TABLE RHNSERVER MODIFY AUTO_DELIVER NOT NULL; + +-- +-- RHNSERVER +-- +ALTER TABLE RHNSERVER DROP CONSTRAINT RHN_SERVER_AUTO_UPDATE_NN; +ALTER TABLE RHNSERVER MODIFY AUTO_UPDATE NOT NULL; + +-- +-- RHNSERVERCACHEINFO +-- +ALTER TABLE RHNSERVERCACHEINFO DROP CONSTRAINT RHN_SERVER_CACHE_INFO_SID_N= N; +ALTER TABLE RHNSERVERCACHEINFO MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSERVER +-- +ALTER TABLE RHNSERVER DROP CONSTRAINT RHN_SERVER_CREATED_NN; +ALTER TABLE RHNSERVER MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERDMI +-- +ALTER TABLE RHNSERVERDMI DROP CONSTRAINT RHN_SERVER_DMI_CREATED_NN; +ALTER TABLE RHNSERVERDMI MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERDMI +-- +ALTER TABLE RHNSERVERDMI DROP CONSTRAINT RHN_SERVER_DMI_ID_NN; +ALTER TABLE RHNSERVERDMI MODIFY ID NOT NULL; + +-- +-- RHNSERVERDMI +-- +ALTER TABLE RHNSERVERDMI DROP CONSTRAINT RHN_SERVER_DMI_MODIFIED_NN; +ALTER TABLE RHNSERVERDMI MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERDMI +-- +ALTER TABLE RHNSERVERDMI DROP CONSTRAINT RHN_SERVER_DMI_SID_NN; +ALTER TABLE RHNSERVERDMI MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSERVER +-- +ALTER TABLE RHNSERVER DROP CONSTRAINT RHN_SERVER_DSI_NN; +ALTER TABLE RHNSERVER MODIFY DIGITAL_SERVER_ID NOT NULL; + +-- +-- RHNSERVER +-- +ALTER TABLE RHNSERVER DROP CONSTRAINT RHN_SERVER_ID_NN; +ALTER TABLE RHNSERVER MODIFY ID NOT NULL; + +-- +-- RHNSERVERINFO +-- +ALTER TABLE RHNSERVERINFO DROP CONSTRAINT RHN_SERVER_INFO_SID_NN; +ALTER TABLE RHNSERVERINFO MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSERVERINSTALLINFO +-- +ALTER TABLE RHNSERVERINSTALLINFO DROP CONSTRAINT RHN_SERVER_INSTALL_INFO_C= R_NN; +ALTER TABLE RHNSERVERINSTALLINFO MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERINSTALLINFO +-- +ALTER TABLE RHNSERVERINSTALLINFO DROP CONSTRAINT RHN_SERVER_INSTALL_INFO_I= D_NN; +ALTER TABLE RHNSERVERINSTALLINFO MODIFY ID NOT NULL; + +-- +-- RHNSERVERINSTALLINFO +-- +ALTER TABLE RHNSERVERINSTALLINFO DROP CONSTRAINT RHN_SERVER_INSTALL_INFO_I= M_NN; +ALTER TABLE RHNSERVERINSTALLINFO MODIFY INSTALL_METHOD NOT NULL; + +-- +-- RHNSERVERINSTALLINFO +-- +ALTER TABLE RHNSERVERINSTALLINFO DROP CONSTRAINT RHN_SERVER_INSTALL_INFO_M= D_NN; +ALTER TABLE RHNSERVERINSTALLINFO MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERINSTALLINFO +-- +ALTER TABLE RHNSERVERINSTALLINFO DROP CONSTRAINT RHN_SERVER_INSTALL_INFO_S= ID_NN; +ALTER TABLE RHNSERVERINSTALLINFO MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSERVER +-- +ALTER TABLE RHNSERVER DROP CONSTRAINT RHN_SERVER_LB_NN; +ALTER TABLE RHNSERVER MODIFY LAST_BOOT NOT NULL; + +-- +-- RHNSERVERLOCK +-- +ALTER TABLE RHNSERVERLOCK DROP CONSTRAINT RHN_SERVER_LOCK_CREATED_NN; +ALTER TABLE RHNSERVERLOCK MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERLOCK +-- +ALTER TABLE RHNSERVERLOCK DROP CONSTRAINT RHN_SERVER_LOCK_SID_NN; +ALTER TABLE RHNSERVERLOCK MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSERVER +-- +ALTER TABLE RHNSERVER DROP CONSTRAINT RHN_SERVER_MODIFIED_NN; +ALTER TABLE RHNSERVER MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVER +-- +ALTER TABLE RHNSERVER DROP CONSTRAINT RHN_SERVER_OID_NN; +ALTER TABLE RHNSERVER MODIFY ORG_ID NOT NULL; + +-- +-- RHNSERVER +-- +ALTER TABLE RHNSERVER DROP CONSTRAINT RHN_SERVER_OS_NN; +ALTER TABLE RHNSERVER MODIFY OS NOT NULL; + +-- +-- RHNSERVERPROFILE +-- +ALTER TABLE RHNSERVERPROFILE DROP CONSTRAINT RHN_SERVER_PROFILE_BCID_NN; +ALTER TABLE RHNSERVERPROFILE MODIFY BASE_CHANNEL NOT NULL; + +-- +-- RHNSERVERPROFILE +-- +ALTER TABLE RHNSERVERPROFILE DROP CONSTRAINT RHN_SERVER_PROFILE_CREATED_NN; +ALTER TABLE RHNSERVERPROFILE MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERPROFILE +-- +ALTER TABLE RHNSERVERPROFILE DROP CONSTRAINT RHN_SERVER_PROFILE_ID_NN; +ALTER TABLE RHNSERVERPROFILE MODIFY ID NOT NULL; + +-- +-- RHNSERVERPROFILE +-- +ALTER TABLE RHNSERVERPROFILE DROP CONSTRAINT RHN_SERVER_PROFILE_MODIFIED_N= N; +ALTER TABLE RHNSERVERPROFILE MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERPROFILE +-- +ALTER TABLE RHNSERVERPROFILE DROP CONSTRAINT RHN_SERVER_PROFILE_OID_NN; +ALTER TABLE RHNSERVERPROFILE MODIFY ORG_ID NOT NULL; + +-- +-- RHNSERVERPROFILE +-- +ALTER TABLE RHNSERVERPROFILE DROP CONSTRAINT RHN_SERVER_PROFILE_PTYPE_NN; +ALTER TABLE RHNSERVERPROFILE MODIFY PROFILE_TYPE_ID NOT NULL; + +-- +-- RHNSERVER +-- +ALTER TABLE RHNSERVER DROP CONSTRAINT RHN_SERVER_RELEASE_NN; +ALTER TABLE RHNSERVER MODIFY RELEASE NOT NULL; + +-- +-- RHNSERVER +-- +ALTER TABLE RHNSERVER DROP CONSTRAINT RHN_SERVER_SAID_NN; +ALTER TABLE RHNSERVER MODIFY SERVER_ARCH_ID NOT NULL; + +-- +-- RHNSERVER +-- +ALTER TABLE RHNSERVER DROP CONSTRAINT RHN_SERVER_SECRET_NN; +ALTER TABLE RHNSERVER MODIFY SECRET NOT NULL; + +-- +-- RHNSERVERUUID +-- +ALTER TABLE RHNSERVERUUID DROP CONSTRAINT RHN_SERVER_UUID_SID_NN; +ALTER TABLE RHNSERVERUUID MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSERVERUUID +-- +ALTER TABLE RHNSERVERUUID DROP CONSTRAINT RHN_SERVER_UUID_UUID_NN; +ALTER TABLE RHNSERVERUUID MODIFY UUID NOT NULL; + +-- +-- RHNSET +-- +ALTER TABLE RHNSET DROP CONSTRAINT RHN_SET_ELEM_NN; +ALTER TABLE RHNSET MODIFY ELEMENT NOT NULL; + +-- +-- RHNSET +-- +ALTER TABLE RHNSET DROP CONSTRAINT RHN_SET_LABEL_NN; +ALTER TABLE RHNSET MODIFY LABEL NOT NULL; + +-- +-- RHNSET +-- +ALTER TABLE RHNSET DROP CONSTRAINT RHN_SET_USER_NN; +ALTER TABLE RHNSET MODIFY USER_ID NOT NULL; + +-- +-- RHNSERVEREVENT +-- +ALTER TABLE RHNSERVEREVENT DROP CONSTRAINT RHN_SE_CREATED_NN; +ALTER TABLE RHNSERVEREVENT MODIFY CREATED NOT NULL; + +-- +-- RHNSERVEREVENT +-- +ALTER TABLE RHNSERVEREVENT DROP CONSTRAINT RHN_SE_DETAILS_NN; +ALTER TABLE RHNSERVEREVENT MODIFY DETAILS NOT NULL; + +-- +-- RHNSERVEREVENT +-- +ALTER TABLE RHNSERVEREVENT DROP CONSTRAINT RHN_SE_ID_NN; +ALTER TABLE RHNSERVEREVENT MODIFY ID NOT NULL; + +-- +-- RHNSERVEREVENT +-- +ALTER TABLE RHNSERVEREVENT DROP CONSTRAINT RHN_SE_MODIFIED_NN; +ALTER TABLE RHNSERVEREVENT MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVEREVENT +-- +ALTER TABLE RHNSERVEREVENT DROP CONSTRAINT RHN_SE_SERVER_ID_NN; +ALTER TABLE RHNSERVEREVENT MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSGTYPEVIRTSUBLEVEL +-- +ALTER TABLE RHNSGTYPEVIRTSUBLEVEL DROP CONSTRAINT RHN_SGTVSL_CREATED_NN; +ALTER TABLE RHNSGTYPEVIRTSUBLEVEL MODIFY CREATED NOT NULL; + +-- +-- RHNSGTYPEVIRTSUBLEVEL +-- +ALTER TABLE RHNSGTYPEVIRTSUBLEVEL DROP CONSTRAINT RHN_SGTVSL_MODIFIED_NN; +ALTER TABLE RHNSGTYPEVIRTSUBLEVEL MODIFY MODIFIED NOT NULL; + +-- +-- RHNSGTYPEVIRTSUBLEVEL +-- +ALTER TABLE RHNSGTYPEVIRTSUBLEVEL DROP CONSTRAINT RHN_SGTVSL_SGTID_NN; +ALTER TABLE RHNSGTYPEVIRTSUBLEVEL MODIFY SERVER_GROUP_TYPE_ID NOT NULL; + +-- +-- RHNSGTYPEVIRTSUBLEVEL +-- +ALTER TABLE RHNSGTYPEVIRTSUBLEVEL DROP CONSTRAINT RHN_SGTVSL_VSLID_NN; +ALTER TABLE RHNSGTYPEVIRTSUBLEVEL MODIFY VIRT_SUB_LEVEL_ID NOT NULL; + +-- +-- RHNSGTYPEBASEADDONCOMPAT +-- +ALTER TABLE RHNSGTYPEBASEADDONCOMPAT DROP CONSTRAINT RHN_SGT_BAC_AID_NN; +ALTER TABLE RHNSGTYPEBASEADDONCOMPAT MODIFY ADDON_ID NOT NULL; + +-- +-- RHNSGTYPEBASEADDONCOMPAT +-- +ALTER TABLE RHNSGTYPEBASEADDONCOMPAT DROP CONSTRAINT RHN_SGT_BAC_BID_NN; +ALTER TABLE RHNSGTYPEBASEADDONCOMPAT MODIFY BASE_ID NOT NULL; + +-- +-- RHNSERVERGROUPTYPEFEATURE +-- +ALTER TABLE RHNSERVERGROUPTYPEFEATURE DROP CONSTRAINT RHN_SGT_FEAT_CREATED= _NN; +ALTER TABLE RHNSERVERGROUPTYPEFEATURE MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERGROUPTYPEFEATURE +-- +ALTER TABLE RHNSERVERGROUPTYPEFEATURE DROP CONSTRAINT RHN_SGT_FEAT_MOD_NN; +ALTER TABLE RHNSERVERGROUPTYPEFEATURE MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERGROUPTYPEFEATURE +-- +ALTER TABLE RHNSERVERGROUPTYPEFEATURE DROP CONSTRAINT RHN_SGT_FID_NN; +ALTER TABLE RHNSERVERGROUPTYPEFEATURE MODIFY FEATURE_ID NOT NULL; + +-- +-- RHNSERVERGROUPTYPEFEATURE +-- +ALTER TABLE RHNSERVERGROUPTYPEFEATURE DROP CONSTRAINT RHN_SGT_SGTID_NN; +ALTER TABLE RHNSERVERGROUPTYPEFEATURE MODIFY SERVER_GROUP_TYPE_ID NOT NULL; + +-- +-- RHNSERVERGROUPMEMBERS +-- +ALTER TABLE RHNSERVERGROUPMEMBERS DROP CONSTRAINT RHN_SG_GROUP_NN; +ALTER TABLE RHNSERVERGROUPMEMBERS MODIFY SERVER_GROUP_ID NOT NULL; + +-- +-- RHNSERVERGROUPMEMBERS +-- +ALTER TABLE RHNSERVERGROUPMEMBERS DROP CONSTRAINT RHN_SG_MEMBERS_NN; +ALTER TABLE RHNSERVERGROUPMEMBERS MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSERVERGROUPMEMBERS +-- +ALTER TABLE RHNSERVERGROUPMEMBERS DROP CONSTRAINT RHN_SG_MEMBER_CRE_NN; +ALTER TABLE RHNSERVERGROUPMEMBERS MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERGROUPMEMBERS +-- +ALTER TABLE RHNSERVERGROUPMEMBERS DROP CONSTRAINT RHN_SG_MEMBER_MOD_NN; +ALTER TABLE RHNSERVERGROUPMEMBERS MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERMESSAGE +-- +ALTER TABLE RHNSERVERMESSAGE DROP CONSTRAINT RHN_SM_CREATED_NN; +ALTER TABLE RHNSERVERMESSAGE MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERMESSAGE +-- +ALTER TABLE RHNSERVERMESSAGE DROP CONSTRAINT RHN_SM_MESSAGE_ID_NN; +ALTER TABLE RHNSERVERMESSAGE MODIFY MESSAGE_ID NOT NULL; + +-- +-- RHNSERVERMESSAGE +-- +ALTER TABLE RHNSERVERMESSAGE DROP CONSTRAINT RHN_SM_MODIFIED_NN; +ALTER TABLE RHNSERVERMESSAGE MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERMESSAGE +-- +ALTER TABLE RHNSERVERMESSAGE DROP CONSTRAINT RHN_SM_SERVER_ID_NN; +ALTER TABLE RHNSERVERMESSAGE MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSNAPSHOTCHANNEL +-- +ALTER TABLE RHNSNAPSHOTCHANNEL DROP CONSTRAINT RHN_SNAPCHAN_CID_NN; +ALTER TABLE RHNSNAPSHOTCHANNEL MODIFY CHANNEL_ID NOT NULL; + +-- +-- RHNSNAPSHOTCHANNEL +-- +ALTER TABLE RHNSNAPSHOTCHANNEL DROP CONSTRAINT RHN_SNAPCHAN_SID_NN; +ALTER TABLE RHNSNAPSHOTCHANNEL MODIFY SNAPSHOT_ID NOT NULL; + +-- +-- RHNSNAPSHOTCONFIGCHANNEL +-- +ALTER TABLE RHNSNAPSHOTCONFIGCHANNEL DROP CONSTRAINT RHN_SNAPSHOTCC_CCID_N= N; +ALTER TABLE RHNSNAPSHOTCONFIGCHANNEL MODIFY CONFIG_CHANNEL_ID NOT NULL; + +-- +-- RHNSNAPSHOTCONFIGCHANNEL +-- +ALTER TABLE RHNSNAPSHOTCONFIGCHANNEL DROP CONSTRAINT RHN_SNAPSHOTCC_CREAT_= NN; +ALTER TABLE RHNSNAPSHOTCONFIGCHANNEL MODIFY CREATED NOT NULL; + +-- +-- RHNSNAPSHOTCONFIGCHANNEL +-- +ALTER TABLE RHNSNAPSHOTCONFIGCHANNEL DROP CONSTRAINT RHN_SNAPSHOTCC_MOD_NN; +ALTER TABLE RHNSNAPSHOTCONFIGCHANNEL MODIFY MODIFIED NOT NULL; + +-- +-- RHNSNAPSHOTCONFIGCHANNEL +-- +ALTER TABLE RHNSNAPSHOTCONFIGCHANNEL DROP CONSTRAINT RHN_SNAPSHOTCC_SID_NN; +ALTER TABLE RHNSNAPSHOTCONFIGCHANNEL MODIFY SNAPSHOT_ID NOT NULL; + +-- +-- RHNSNAPSHOTCONFIGREVISION +-- +ALTER TABLE RHNSNAPSHOTCONFIGREVISION DROP CONSTRAINT RHN_SNAPSHOTCR_CREAT= _NN; +ALTER TABLE RHNSNAPSHOTCONFIGREVISION MODIFY CREATED NOT NULL; + +-- +-- RHNSNAPSHOTCONFIGREVISION +-- +ALTER TABLE RHNSNAPSHOTCONFIGREVISION DROP CONSTRAINT RHN_SNAPSHOTCR_CRID_= NN; +ALTER TABLE RHNSNAPSHOTCONFIGREVISION MODIFY CONFIG_REVISION_ID NOT NULL; + +-- +-- RHNSNAPSHOTCONFIGREVISION +-- +ALTER TABLE RHNSNAPSHOTCONFIGREVISION DROP CONSTRAINT RHN_SNAPSHOTCR_MOD_N= N; +ALTER TABLE RHNSNAPSHOTCONFIGREVISION MODIFY MODIFIED NOT NULL; + +-- +-- RHNSNAPSHOTCONFIGREVISION +-- +ALTER TABLE RHNSNAPSHOTCONFIGREVISION DROP CONSTRAINT RHN_SNAPSHOTCR_SID_N= N; +ALTER TABLE RHNSNAPSHOTCONFIGREVISION MODIFY SNAPSHOT_ID NOT NULL; + +-- +-- RHNSNAPSHOTPACKAGE +-- +ALTER TABLE RHNSNAPSHOTPACKAGE DROP CONSTRAINT RHN_SNAPSHOTPKG_NID_NN; +ALTER TABLE RHNSNAPSHOTPACKAGE MODIFY NEVRA_ID NOT NULL; + +-- +-- RHNSNAPSHOTPACKAGE +-- +ALTER TABLE RHNSNAPSHOTPACKAGE DROP CONSTRAINT RHN_SNAPSHOTPKG_SID_NN; +ALTER TABLE RHNSNAPSHOTPACKAGE MODIFY SNAPSHOT_ID NOT NULL; + +-- +-- RHNSNAPSHOTSERVERGROUP +-- +ALTER TABLE RHNSNAPSHOTSERVERGROUP DROP CONSTRAINT RHN_SNAPSHOTSG_SGID_NN; +ALTER TABLE RHNSNAPSHOTSERVERGROUP MODIFY SERVER_GROUP_ID NOT NULL; + +-- +-- RHNSNAPSHOTSERVERGROUP +-- +ALTER TABLE RHNSNAPSHOTSERVERGROUP DROP CONSTRAINT RHN_SNAPSHOTSG_SID_NN; +ALTER TABLE RHNSNAPSHOTSERVERGROUP MODIFY SNAPSHOT_ID NOT NULL; + +-- +-- RHNSNAPSHOT +-- +ALTER TABLE RHNSNAPSHOT DROP CONSTRAINT RHN_SNAPSHOT_CREATED_NN; +ALTER TABLE RHNSNAPSHOT MODIFY CREATED NOT NULL; + +-- +-- RHNSNAPSHOT +-- +ALTER TABLE RHNSNAPSHOT DROP CONSTRAINT RHN_SNAPSHOT_ID_NN; +ALTER TABLE RHNSNAPSHOT MODIFY ID NOT NULL; + +-- +-- RHNSNAPSHOT +-- +ALTER TABLE RHNSNAPSHOT DROP CONSTRAINT RHN_SNAPSHOT_MODIFIED_NN; +ALTER TABLE RHNSNAPSHOT MODIFY MODIFIED NOT NULL; + +-- +-- RHNSNAPSHOT +-- +ALTER TABLE RHNSNAPSHOT DROP CONSTRAINT RHN_SNAPSHOT_OID_NN; +ALTER TABLE RHNSNAPSHOT MODIFY ORG_ID NOT NULL; + +-- +-- RHNSNAPSHOT +-- +ALTER TABLE RHNSNAPSHOT DROP CONSTRAINT RHN_SNAPSHOT_REASON_NN; +ALTER TABLE RHNSNAPSHOT MODIFY REASON NOT NULL; + +-- +-- RHNSNAPSHOT +-- +ALTER TABLE RHNSNAPSHOT DROP CONSTRAINT RHN_SNAPSHOT_SID_NN; +ALTER TABLE RHNSNAPSHOT MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSERVERNEEDEDCACHE +-- +ALTER TABLE RHNSERVERNEEDEDCACHE DROP CONSTRAINT RHN_SNCP_PID_NN; +ALTER TABLE RHNSERVERNEEDEDCACHE MODIFY PACKAGE_ID NOT NULL; + +-- +-- RHNSERVERNEEDEDCACHE +-- +ALTER TABLE RHNSERVERNEEDEDCACHE DROP CONSTRAINT RHN_SNCP_SID_NN; +ALTER TABLE RHNSERVERNEEDEDCACHE MODIFY SERVER_ID NOT NULL; + +-- +-- RHN_SAT_NODE_PROBE +-- +ALTER TABLE RHN_SAT_NODE_PROBE DROP CONSTRAINT RHN_SNDPB_PROBE_ID_NN; +ALTER TABLE RHN_SAT_NODE_PROBE MODIFY PROBE_ID NOT NULL; + +-- +-- RHN_SAT_NODE_PROBE +-- +ALTER TABLE RHN_SAT_NODE_PROBE DROP CONSTRAINT RHN_SNDPB_PROBE_TYPE_NN; +ALTER TABLE RHN_SAT_NODE_PROBE MODIFY PROBE_TYPE NOT NULL; + +-- +-- RHN_SAT_NODE_PROBE +-- +ALTER TABLE RHN_SAT_NODE_PROBE DROP CONSTRAINT RHN_SNDPB_SAT_NODE_ID_NN; +ALTER TABLE RHN_SAT_NODE_PROBE MODIFY SAT_NODE_ID NOT NULL; + +-- +-- RHN_SNMP_ALERT +-- +ALTER TABLE RHN_SNMP_ALERT DROP CONSTRAINT RHN_SNMPA_DEST_IP_NN; +ALTER TABLE RHN_SNMP_ALERT MODIFY DEST_IP NOT NULL; + +-- +-- RHN_SNMP_ALERT +-- +ALTER TABLE RHN_SNMP_ALERT DROP CONSTRAINT RHN_SNMPA_DEST_PORT_NN; +ALTER TABLE RHN_SNMP_ALERT MODIFY DEST_PORT NOT NULL; + +-- +-- RHN_SNMP_ALERT +-- +ALTER TABLE RHN_SNMP_ALERT DROP CONSTRAINT RHN_SNMPA_RECID_NN; +ALTER TABLE RHN_SNMP_ALERT MODIFY RECID NOT NULL; + +-- +-- RHN_SNMP_ALERT +-- +ALTER TABLE RHN_SNMP_ALERT DROP CONSTRAINT RHN_SNMPA_SEND_CLUST_ID_NN; +ALTER TABLE RHN_SNMP_ALERT MODIFY SENDER_CLUSTER_ID NOT NULL; + +-- +-- RHNSNPERRATAQUEUE +-- +ALTER TABLE RHNSNPERRATAQUEUE DROP CONSTRAINT RHN_SNPERRQUEUE_EID_NN; +ALTER TABLE RHNSNPERRATAQUEUE MODIFY ERRATA_ID NOT NULL; + +-- +-- RHNSNPERRATAQUEUE +-- +ALTER TABLE RHNSNPERRATAQUEUE DROP CONSTRAINT RHN_SNPERRQUEUE_PROCESSED_NN; +ALTER TABLE RHNSNPERRATAQUEUE MODIFY PROCESSED NOT NULL; + +-- +-- RHNSOLARISPATCHEDPACKAGE +-- +ALTER TABLE RHNSOLARISPATCHEDPACKAGE DROP CONSTRAINT RHN_SOLARIS_PATCHEDP_= PID_NN; +ALTER TABLE RHNSOLARISPATCHEDPACKAGE MODIFY PATCH_ID NOT NULL; + +-- +-- RHNSOLARISPATCHEDPACKAGE +-- +ALTER TABLE RHNSOLARISPATCHEDPACKAGE DROP CONSTRAINT RHN_SOLARIS_PATCHEDP_= PNID_NN; +ALTER TABLE RHNSOLARISPATCHEDPACKAGE MODIFY PACKAGE_NEVRA_ID NOT NULL; + +-- +-- RHNSOLARISPATCHEDPACKAGE +-- +ALTER TABLE RHNSOLARISPATCHEDPACKAGE DROP CONSTRAINT RHN_SOLARIS_PATCHEDP_= SID_NN; +ALTER TABLE RHNSOLARISPATCHEDPACKAGE MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSOLARISPACKAGE +-- +ALTER TABLE RHNSOLARISPACKAGE DROP CONSTRAINT RHN_SOLARIS_PKG_CAT_NN; +ALTER TABLE RHNSOLARISPACKAGE MODIFY CATEGORY NOT NULL; + +-- +-- RHNSOLARISPATCHPACKAGES +-- +ALTER TABLE RHNSOLARISPATCHPACKAGES DROP CONSTRAINT RHN_SOLARIS_PNID_NN; +ALTER TABLE RHNSOLARISPATCHPACKAGES MODIFY PACKAGE_NEVRA_ID NOT NULL; + +-- +-- RHNSOLARISPATCHPACKAGES +-- +ALTER TABLE RHNSOLARISPATCHPACKAGES DROP CONSTRAINT RHN_SOLARIS_PP_NN; +ALTER TABLE RHNSOLARISPATCHPACKAGES MODIFY PATCH_ID NOT NULL; + +-- +-- RHNSOLARISPATCHSETMEMBERS +-- +ALTER TABLE RHNSOLARISPATCHSETMEMBERS DROP CONSTRAINT RHN_SOLARIS_PSM_CREA= TED_NN; +ALTER TABLE RHNSOLARISPATCHSETMEMBERS MODIFY CREATED NOT NULL; + +-- +-- RHNSOLARISPATCHSETMEMBERS +-- +ALTER TABLE RHNSOLARISPATCHSETMEMBERS DROP CONSTRAINT RHN_SOLARIS_PSM_MODI= FIED_NN; +ALTER TABLE RHNSOLARISPATCHSETMEMBERS MODIFY MODIFIED NOT NULL; + +-- +-- RHNSOLARISPATCHSETMEMBERS +-- +ALTER TABLE RHNSOLARISPATCHSETMEMBERS DROP CONSTRAINT RHN_SOLARIS_PSM_PID_= NN; +ALTER TABLE RHNSOLARISPATCHSETMEMBERS MODIFY PATCH_ID NOT NULL; + +-- +-- RHNSOLARISPATCHSETMEMBERS +-- +ALTER TABLE RHNSOLARISPATCHSETMEMBERS DROP CONSTRAINT RHN_SOLARIS_PSM_PSID= _NN; +ALTER TABLE RHNSOLARISPATCHSETMEMBERS MODIFY PATCH_SET_ID NOT NULL; + +-- +-- RHNSOLARISPATCHSET +-- +ALTER TABLE RHNSOLARISPATCHSET DROP CONSTRAINT RHN_SOLARIS_PS_CREATED_NN; +ALTER TABLE RHNSOLARISPATCHSET MODIFY CREATED NOT NULL; + +-- +-- RHNSOLARISPATCHSET +-- +ALTER TABLE RHNSOLARISPATCHSET DROP CONSTRAINT RHN_SOLARIS_PS_MODIFIED_NN; +ALTER TABLE RHNSOLARISPATCHSET MODIFY MODIFIED NOT NULL; + +-- +-- RHNSOLARISPATCHSET +-- +ALTER TABLE RHNSOLARISPATCHSET DROP CONSTRAINT RHN_SOLARIS_PS_SD_NN; +ALTER TABLE RHNSOLARISPATCHSET MODIFY SET_DATE NOT NULL; + +-- +-- RHNSOLARISPATCHTYPE +-- +ALTER TABLE RHNSOLARISPATCHTYPE DROP CONSTRAINT RHN_SOLARIS_PT_LABEL_NN; +ALTER TABLE RHNSOLARISPATCHTYPE MODIFY LABEL NOT NULL; + +-- +-- RHNSOLARISPATCHTYPE +-- +ALTER TABLE RHNSOLARISPATCHTYPE DROP CONSTRAINT RHN_SOLARIS_PT_NAME_NN; +ALTER TABLE RHNSOLARISPATCHTYPE MODIFY NAME NOT NULL; + +-- +-- RHNSOLARISPATCH +-- +ALTER TABLE RHNSOLARISPATCH DROP CONSTRAINT RHN_SOLARIS_P_CREATED_NN; +ALTER TABLE RHNSOLARISPATCH MODIFY CREATED NOT NULL; + +-- +-- RHNSOLARISPATCH +-- +ALTER TABLE RHNSOLARISPATCH DROP CONSTRAINT RHN_SOLARIS_P_MODIFIED_NN; +ALTER TABLE RHNSOLARISPATCH MODIFY MODIFIED NOT NULL; + +-- +-- RHNSOLARISPATCH +-- +ALTER TABLE RHNSOLARISPATCH DROP CONSTRAINT RHN_SOLARIS_P_PT_NN; +ALTER TABLE RHNSOLARISPATCH MODIFY PATCH_TYPE NOT NULL; + +-- +-- RHNSOLARISPATCH +-- +ALTER TABLE RHNSOLARISPATCH DROP CONSTRAINT RHN_SOLARIS_P_RDME_NN; +ALTER TABLE RHNSOLARISPATCH MODIFY README NOT NULL; + +-- +-- RHNSOURCERPM +-- +ALTER TABLE RHNSOURCERPM DROP CONSTRAINT RHN_SOURCERPM_ID_NN; +ALTER TABLE RHNSOURCERPM MODIFY ID NOT NULL; + +-- +-- RHNSOURCERPM +-- +ALTER TABLE RHNSOURCERPM DROP CONSTRAINT RHN_SOURCERPM_NAME_NN; +ALTER TABLE RHNSOURCERPM MODIFY NAME NOT NULL; + +-- +-- RHNSERVERPROFILEPACKAGE +-- +ALTER TABLE RHNSERVERPROFILEPACKAGE DROP CONSTRAINT RHN_SPROFILE_EVRID_NN; +ALTER TABLE RHNSERVERPROFILEPACKAGE MODIFY EVR_ID NOT NULL; + +-- +-- RHNSERVERPROFILEPACKAGE +-- +ALTER TABLE RHNSERVERPROFILEPACKAGE DROP CONSTRAINT RHN_SPROFILE_NID_NN; +ALTER TABLE RHNSERVERPROFILEPACKAGE MODIFY NAME_ID NOT NULL; + +-- +-- RHNSERVERPROFILEPACKAGE +-- +ALTER TABLE RHNSERVERPROFILEPACKAGE DROP CONSTRAINT RHN_SPROFILE_SPID_NN; +ALTER TABLE RHNSERVERPROFILEPACKAGE MODIFY SERVER_PROFILE_ID NOT NULL; + +-- +-- RHNSERVERPROFILETYPE +-- +ALTER TABLE RHNSERVERPROFILETYPE DROP CONSTRAINT RHN_SPROFTYPE_CREAT_NN; +ALTER TABLE RHNSERVERPROFILETYPE MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERPROFILETYPE +-- +ALTER TABLE RHNSERVERPROFILETYPE DROP CONSTRAINT RHN_SPROFTYPE_ID_NN; +ALTER TABLE RHNSERVERPROFILETYPE MODIFY ID NOT NULL; + +-- +-- RHNSERVERPROFILETYPE +-- +ALTER TABLE RHNSERVERPROFILETYPE DROP CONSTRAINT RHN_SPROFTYPE_LABEL_NN; +ALTER TABLE RHNSERVERPROFILETYPE MODIFY LABEL NOT NULL; + +-- +-- RHNSERVERPROFILETYPE +-- +ALTER TABLE RHNSERVERPROFILETYPE DROP CONSTRAINT RHN_SPROFTYPE_MOD_NN; +ALTER TABLE RHNSERVERPROFILETYPE MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERPROFILETYPE +-- +ALTER TABLE RHNSERVERPROFILETYPE DROP CONSTRAINT RHN_SPROFTYPE_NAME_NN; +ALTER TABLE RHNSERVERPROFILETYPE MODIFY NAME NOT NULL; + +-- +-- RHNSERVERPACKAGEARCHCOMPAT +-- +ALTER TABLE RHNSERVERPACKAGEARCHCOMPAT DROP CONSTRAINT RHN_SP_AC_CREATED_N= N; +ALTER TABLE RHNSERVERPACKAGEARCHCOMPAT MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERPACKAGEARCHCOMPAT +-- +ALTER TABLE RHNSERVERPACKAGEARCHCOMPAT DROP CONSTRAINT RHN_SP_AC_MODIFIED_= NN; +ALTER TABLE RHNSERVERPACKAGEARCHCOMPAT MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERPACKAGEARCHCOMPAT +-- +ALTER TABLE RHNSERVERPACKAGEARCHCOMPAT DROP CONSTRAINT RHN_SP_AC_PAID_NN; +ALTER TABLE RHNSERVERPACKAGEARCHCOMPAT MODIFY PACKAGE_ARCH_ID NOT NULL; + +-- +-- RHNSERVERPACKAGEARCHCOMPAT +-- +ALTER TABLE RHNSERVERPACKAGEARCHCOMPAT DROP CONSTRAINT RHN_SP_AC_PREF_NN; +ALTER TABLE RHNSERVERPACKAGEARCHCOMPAT MODIFY PREFERENCE NOT NULL; + +-- +-- RHNSERVERPACKAGEARCHCOMPAT +-- +ALTER TABLE RHNSERVERPACKAGEARCHCOMPAT DROP CONSTRAINT RHN_SP_AC_SAID_NN; +ALTER TABLE RHNSERVERPACKAGEARCHCOMPAT MODIFY SERVER_ARCH_ID NOT NULL; + +-- +-- RHN_SERVICE_PROBE_ORIGINS +-- +ALTER TABLE RHN_SERVICE_PROBE_ORIGINS DROP CONSTRAINT RHN_SRVPO_DECOUPLED_= NN; +ALTER TABLE RHN_SERVICE_PROBE_ORIGINS MODIFY DECOUPLED NOT NULL; + +-- +-- RHN_SERVICE_PROBE_ORIGINS +-- +ALTER TABLE RHN_SERVICE_PROBE_ORIGINS DROP CONSTRAINT RHN_SRVPO_SERV_P_ID_= NN; +ALTER TABLE RHN_SERVICE_PROBE_ORIGINS MODIFY SERVICE_PROBE_ID NOT NULL; + +-- +-- RHNSERVERNETINTERFACE +-- +ALTER TABLE RHNSERVERNETINTERFACE DROP CONSTRAINT RHN_SRV_NET_IFACE_CREATE= D_NN; +ALTER TABLE RHNSERVERNETINTERFACE MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERNETINTERFACE +-- +ALTER TABLE RHNSERVERNETINTERFACE DROP CONSTRAINT RHN_SRV_NET_IFACE_MODIFI= ED_NN; +ALTER TABLE RHNSERVERNETINTERFACE MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERNETINTERFACE +-- +ALTER TABLE RHNSERVERNETINTERFACE DROP CONSTRAINT RHN_SRV_NET_IFACE_NAME_N= N; +ALTER TABLE RHNSERVERNETINTERFACE MODIFY NAME NOT NULL; + +-- +-- RHNSERVERNETINTERFACE +-- +ALTER TABLE RHNSERVERNETINTERFACE DROP CONSTRAINT RHN_SRV_NET_IFACE_SID_NN; +ALTER TABLE RHNSERVERNETINTERFACE MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSERVERTOKENREGS +-- +ALTER TABLE RHNSERVERTOKENREGS DROP CONSTRAINT RHN_SRV_REG_TOK_SID_NN; +ALTER TABLE RHNSERVERTOKENREGS MODIFY SERVER_ID NOT NULL; + +-- +-- RHNSERVERTOKENREGS +-- +ALTER TABLE RHNSERVERTOKENREGS DROP CONSTRAINT RHN_SRV_REG_TOK_TID_NN; +ALTER TABLE RHNSERVERTOKENREGS MODIFY TOKEN_ID NOT NULL; + +-- +-- RHNSERVERSERVERGROUPARCHCOMPAT +-- +ALTER TABLE RHNSERVERSERVERGROUPARCHCOMPAT DROP CONSTRAINT RHN_SSG_AC_CREA= TED_NN; +ALTER TABLE RHNSERVERSERVERGROUPARCHCOMPAT MODIFY CREATED NOT NULL; + +-- +-- RHNSERVERSERVERGROUPARCHCOMPAT +-- +ALTER TABLE RHNSERVERSERVERGROUPARCHCOMPAT DROP CONSTRAINT RHN_SSG_AC_MODI= FIED_NN; +ALTER TABLE RHNSERVERSERVERGROUPARCHCOMPAT MODIFY MODIFIED NOT NULL; + +-- +-- RHNSERVERSERVERGROUPARCHCOMPAT +-- +ALTER TABLE RHNSERVERSERVERGROUPARCHCOMPAT DROP CONSTRAINT RHN_SSG_AC_SAID= _NN; +ALTER TABLE RHNSERVERSERVERGROUPARCHCOMPAT MODIFY SERVER_ARCH_ID NOT NULL; + +-- +-- RHNSERVERSERVERGROUPARCHCOMPAT +-- +ALTER TABLE RHNSERVERSERVERGROUPARCHCOMPAT DROP CONSTRAINT RHN_SSG_AC_SGT_= NN; +ALTER TABLE RHNSERVERSERVERGROUPARCHCOMPAT MODIFY SERVER_GROUP_TYPE NOT NU= LL; + +-- +-- RHNSNAPSHOTINVALIDREASON +-- +ALTER TABLE RHNSNAPSHOTINVALIDREASON DROP CONSTRAINT RHN_SSINVALID_CREATED= _NN; +ALTER TABLE RHNSNAPSHOTINVALIDREASON MODIFY CREATED NOT NULL; + +-- +-- RHNSNAPSHOTINVALIDREASON +-- +ALTER TABLE RHNSNAPSHOTINVALIDREASON DROP CONSTRAINT RHN_SSINVALID_ID_NN; +ALTER TABLE RHNSNAPSHOTINVALIDREASON MODIFY ID NOT NULL; + +-- +-- RHNSNAPSHOTINVALIDREASON +-- +ALTER TABLE RHNSNAPSHOTINVALIDREASON DROP CONSTRAINT RHN_SSINVALID_LABEL_N= N; +ALTER TABLE RHNSNAPSHOTINVALIDREASON MODIFY LABEL NOT NULL; + +-- +-- RHNSNAPSHOTINVALIDREASON +-- +ALTER TABLE RHNSNAPSHOTINVALIDREASON DROP CONSTRAINT RHN_SSINVALID_MODIFIE= D_NN; +ALTER TABLE RHNSNAPSHOTINVALIDREASON MODIFY MODIFIED NOT NULL; + +-- +-- RHNSNAPSHOTINVALIDREASON +-- +ALTER TABLE RHNSNAPSHOTINVALIDREASON DROP CONSTRAINT RHN_SSINVALID_NAME_NN; +ALTER TABLE RHNSNAPSHOTINVALIDREASON MODIFY NAME NOT NULL; + +-- +-- RHNSSMOPERATION +-- +ALTER TABLE RHNSSMOPERATION DROP CONSTRAINT RHN_SSMOP_DESC_NN; +ALTER TABLE RHNSSMOPERATION MODIFY DESCRIPTION NOT NULL; + +-- +-- RHNSSMOPERATION +-- +ALTER TABLE RHNSSMOPERATION DROP CONSTRAINT RHN_SSMOP_ID_NN; +ALTER TABLE RHNSSMOPERATION MODIFY ID NOT NULL; + +-- +-- RHNSSMOPERATION +-- +ALTER TABLE RHNSSMOPERATION DROP CONSTRAINT RHN_SSMOP_MOD_NN; +ALTER TABLE RHNSSMOPERATION MODIFY MODIFIED NOT NULL; + +-- +-- RHNSSMOPERATION +-- +ALTER TABLE RHNSSMOPERATION DROP CONSTRAINT RHN_SSMOP_STRT_NN; +ALTER TABLE RHNSSMOPERATION MODIFY STARTED NOT NULL; + +-- +-- RHNSSMOPERATION +-- +ALTER TABLE RHNSSMOPERATION DROP CONSTRAINT RHN_SSMOP_ST_NN; +ALTER TABLE RHNSSMOPERATION MODIFY STATUS NOT NULL; + +-- +-- RHNSSMOPERATION +-- +ALTER TABLE RHNSSMOPERATION DROP CONSTRAINT RHN_SSMOP_USER_NN; +ALTER TABLE RHNSSMOPERATION MODIFY USER_ID NOT NULL; + +-- +-- RHNSAVEDSEARCHTYPE +-- +ALTER TABLE RHNSAVEDSEARCHTYPE DROP CONSTRAINT RHN_SSTYPE_CREATED_NN; +ALTER TABLE RHNSAVEDSEARCHTYPE MODIFY CREATED NOT NULL; + +-- +-- RHNSAVEDSEARCHTYPE +-- +ALTER TABLE RHNSAVEDSEARCHTYPE DROP CONSTRAINT RHN_SSTYPE_ID_NN; +ALTER TABLE RHNSAVEDSEARCHTYPE MODIFY ID NOT NULL; + +-- +-- RHNSAVEDSEARCHTYPE +-- +ALTER TABLE RHNSAVEDSEARCHTYPE DROP CONSTRAINT RHN_SSTYPE_LABEL_NN; +ALTER TABLE RHNSAVEDSEARCHTYPE MODIFY LABEL NOT NULL; + +-- +-- RHNSAVEDSEARCHTYPE +-- +ALTER TABLE RHNSAVEDSEARCHTYPE DROP CONSTRAINT RHN_SSTYPE_MODIFIED_NN; +ALTER TABLE RHNSAVEDSEARCHTYPE MODIFY MODIFIED NOT NULL; + +-- +-- RHN_STRATEGIES +-- +ALTER TABLE RHN_STRATEGIES DROP CONSTRAINT RHN_STRAT_RECID_NN; +ALTER TABLE RHN_STRATEGIES MODIFY RECID NOT NULL; + +-- +-- RHNSNAPSHOTTAG +-- +ALTER TABLE RHNSNAPSHOTTAG DROP CONSTRAINT RHN_ST_CREATED_NN; +ALTER TABLE RHNSNAPSHOTTAG MODIFY CREATED NOT NULL; + +-- +-- RHNSNAPSHOTTAG +-- +ALTER TABLE RHNSNAPSHOTTAG DROP CONSTRAINT RHN_ST_MODIFIED_NN; +ALTER TABLE RHNSNAPSHOTTAG MODIFY MODIFIED NOT NULL; + +-- +-- RHNSNAPSHOTTAG +-- +ALTER TABLE RHNSNAPSHOTTAG DROP CONSTRAINT RHN_ST_SSID_NN; +ALTER TABLE RHNSNAPSHOTTAG MODIFY SNAPSHOT_ID NOT NULL; + +-- +-- RHNSNAPSHOTTAG +-- +ALTER TABLE RHNSNAPSHOTTAG DROP CONSTRAINT RHN_ST_TID_NN; +ALTER TABLE RHNSNAPSHOTTAG MODIFY TAG_ID NOT NULL; + +-- +-- RHNSYSTEMMIGRATIONS +-- +ALTER TABLE RHNSYSTEMMIGRATIONS DROP CONSTRAINT RHN_SYS_MIG_MIGRATED_NN; +ALTER TABLE RHNSYSTEMMIGRATIONS MODIFY MIGRATED NOT NULL; + +-- +-- RHNSYSTEMMIGRATIONS +-- +ALTER TABLE RHNSYSTEMMIGRATIONS DROP CONSTRAINT RHN_SYS_MIG_OIDFRM_NN; +ALTER TABLE RHNSYSTEMMIGRATIONS MODIFY ORG_ID_FROM NOT NULL; + +-- +-- RHNSYSTEMMIGRATIONS +-- +ALTER TABLE RHNSYSTEMMIGRATIONS DROP CONSTRAINT RHN_SYS_MIG_OIDTO_NN; +ALTER TABLE RHNSYSTEMMIGRATIONS MODIFY ORG_ID_TO NOT NULL; + +-- +-- RHNSYSTEMMIGRATIONS +-- +ALTER TABLE RHNSYSTEMMIGRATIONS DROP CONSTRAINT RHN_SYS_MIG_SID_NN; +ALTER TABLE RHNSYSTEMMIGRATIONS MODIFY SERVER_ID NOT NULL; + +-- +-- RHNTAG +-- +ALTER TABLE RHNTAG DROP CONSTRAINT RHN_TAG_CREATED_NN; +ALTER TABLE RHNTAG MODIFY CREATED NOT NULL; + +-- +-- RHNTAG +-- +ALTER TABLE RHNTAG DROP CONSTRAINT RHN_TAG_ID_NN; +ALTER TABLE RHNTAG MODIFY ID NOT NULL; + +-- +-- RHNTAG +-- +ALTER TABLE RHNTAG DROP CONSTRAINT RHN_TAG_MODIFIED_NN; +ALTER TABLE RHNTAG MODIFY MODIFIED NOT NULL; + +-- +-- RHNTAG +-- +ALTER TABLE RHNTAG DROP CONSTRAINT RHN_TAG_NID_NN; +ALTER TABLE RHNTAG MODIFY NAME_ID NOT NULL; + +-- +-- RHNTAG +-- +ALTER TABLE RHNTAG DROP CONSTRAINT RHN_TAG_OID_NN; +ALTER TABLE RHNTAG MODIFY ORG_ID NOT NULL; + +-- +-- RHNTASKQUEUE +-- +ALTER TABLE RHNTASKQUEUE DROP CONSTRAINT RHN_TASK_QUEUE_EARLIEST_NN; +ALTER TABLE RHNTASKQUEUE MODIFY EARLIEST NOT NULL; + +-- +-- RHNTASKQUEUE +-- +ALTER TABLE RHNTASKQUEUE DROP CONSTRAINT RHN_TASK_QUEUE_ORG_ID_NN; +ALTER TABLE RHNTASKQUEUE MODIFY ORG_ID NOT NULL; + +-- +-- RHNTASKQUEUE +-- +ALTER TABLE RHNTASKQUEUE DROP CONSTRAINT RHN_TASK_QUEUE_TASK_NAME_NN; +ALTER TABLE RHNTASKQUEUE MODIFY TASK_NAME NOT NULL; + +-- +-- RHNTEMPLATECATEGORY +-- +ALTER TABLE RHNTEMPLATECATEGORY DROP CONSTRAINT RHN_TEMPLATE_CAT_CREATED_N= N; +ALTER TABLE RHNTEMPLATECATEGORY MODIFY CREATED NOT NULL; + +-- +-- RHNTEMPLATECATEGORY +-- +ALTER TABLE RHNTEMPLATECATEGORY DROP CONSTRAINT RHN_TEMPLATE_CAT_DESC_NN; +ALTER TABLE RHNTEMPLATECATEGORY MODIFY DESCRIPTION NOT NULL; + +-- +-- RHNTEMPLATECATEGORY +-- +ALTER TABLE RHNTEMPLATECATEGORY DROP CONSTRAINT RHN_TEMPLATE_CAT_ID_NN; +ALTER TABLE RHNTEMPLATECATEGORY MODIFY ID NOT NULL; + +-- +-- RHNTEMPLATECATEGORY +-- +ALTER TABLE RHNTEMPLATECATEGORY DROP CONSTRAINT RHN_TEMPLATE_CAT_LABEL_NN; +ALTER TABLE RHNTEMPLATECATEGORY MODIFY LABEL NOT NULL; + +-- +-- RHNTEMPLATECATEGORY +-- +ALTER TABLE RHNTEMPLATECATEGORY DROP CONSTRAINT RHN_TEMPLATE_CAT_MODIFIED_= NN; +ALTER TABLE RHNTEMPLATECATEGORY MODIFY MODIFIED NOT NULL; + +-- +-- RHNTEMPLATESTRING +-- +ALTER TABLE RHNTEMPLATESTRING DROP CONSTRAINT RHN_TEMPLATE_STR_CID_NN; +ALTER TABLE RHNTEMPLATESTRING MODIFY CATEGORY_ID NOT NULL; + +-- +-- RHNTEMPLATESTRING +-- +ALTER TABLE RHNTEMPLATESTRING DROP CONSTRAINT RHN_TEMPLATE_STR_CREATED_NN; +ALTER TABLE RHNTEMPLATESTRING MODIFY CREATED NOT NULL; + +-- +-- RHNTEMPLATESTRING +-- +ALTER TABLE RHNTEMPLATESTRING DROP CONSTRAINT RHN_TEMPLATE_STR_DESC_NN; +ALTER TABLE RHNTEMPLATESTRING MODIFY DESCRIPTION NOT NULL; + +-- +-- RHNTEMPLATESTRING +-- +ALTER TABLE RHNTEMPLATESTRING DROP CONSTRAINT RHN_TEMPLATE_STR_ID_NN; +ALTER TABLE RHNTEMPLATESTRING MODIFY ID NOT NULL; + +-- +-- RHNTEMPLATESTRING +-- +ALTER TABLE RHNTEMPLATESTRING DROP CONSTRAINT RHN_TEMPLATE_STR_KEY_NN; +ALTER TABLE RHNTEMPLATESTRING MODIFY LABEL NOT NULL; + +-- +-- RHNTEMPLATESTRING +-- +ALTER TABLE RHNTEMPLATESTRING DROP CONSTRAINT RHN_TEMPLATE_STR_MODIFIED_NN; +ALTER TABLE RHNTEMPLATESTRING MODIFY MODIFIED NOT NULL; + +-- +-- RHNTIMEZONE +-- +ALTER TABLE RHNTIMEZONE DROP CONSTRAINT RHN_TIMEZONE_DISPLAY_NN; +ALTER TABLE RHNTIMEZONE MODIFY DISPLAY_NAME NOT NULL; + +-- +-- RHNTIMEZONE +-- +ALTER TABLE RHNTIMEZONE DROP CONSTRAINT RHN_TIMEZONE_ID_NN; +ALTER TABLE RHNTIMEZONE MODIFY ID NOT NULL; + +-- +-- RHNTIMEZONE +-- +ALTER TABLE RHNTIMEZONE DROP CONSTRAINT RHN_TIMEZONE_OLSON_NN; +ALTER TABLE RHNTIMEZONE MODIFY OLSON_NAME NOT NULL; + +-- +-- RHNTEXTMESSAGE +-- +ALTER TABLE RHNTEXTMESSAGE DROP CONSTRAINT RHN_TM_CREATED_NN; +ALTER TABLE RHNTEXTMESSAGE MODIFY CREATED NOT NULL; + +-- +-- RHNTEXTMESSAGE +-- +ALTER TABLE RHNTEXTMESSAGE DROP CONSTRAINT RHN_TM_MESSAGE_BODY_NN; +ALTER TABLE RHNTEXTMESSAGE MODIFY MESSAGE_BODY NOT NULL; + +-- +-- RHNTEXTMESSAGE +-- +ALTER TABLE RHNTEXTMESSAGE DROP CONSTRAINT RHN_TM_MESSAGE_ID_NN; +ALTER TABLE RHNTEXTMESSAGE MODIFY MESSAGE_ID NOT NULL; + +-- +-- RHNTEXTMESSAGE +-- +ALTER TABLE RHNTEXTMESSAGE DROP CONSTRAINT RHN_TM_MODIFIED_NN; +ALTER TABLE RHNTEXTMESSAGE MODIFY MODIFIED NOT NULL; + +-- +-- RHNTAGNAME +-- +ALTER TABLE RHNTAGNAME DROP CONSTRAINT RHN_TN_CREATED_NN; +ALTER TABLE RHNTAGNAME MODIFY CREATED NOT NULL; + +-- +-- RHNTAGNAME +-- +ALTER TABLE RHNTAGNAME DROP CONSTRAINT RHN_TN_ID_NN; +ALTER TABLE RHNTAGNAME MODIFY ID NOT NULL; + +-- +-- RHNTAGNAME +-- +ALTER TABLE RHNTAGNAME DROP CONSTRAINT RHN_TN_MODIFIED_NN; +ALTER TABLE RHNTAGNAME MODIFY MODIFIED NOT NULL; + +-- +-- RHNTAGNAME +-- +ALTER TABLE RHNTAGNAME DROP CONSTRAINT RHN_TN_NAME_NN; +ALTER TABLE RHNTAGNAME MODIFY NAME NOT NULL; + +-- +-- RHNTRANSACTIONELEMENT +-- +ALTER TABLE RHNTRANSACTIONELEMENT DROP CONSTRAINT RHN_TRANSELEM_TID_NN; +ALTER TABLE RHNTRANSACTIONELEMENT MODIFY TRANSACTION_ID NOT NULL; + +-- +-- RHNTRANSACTIONELEMENT +-- +ALTER TABLE RHNTRANSACTIONELEMENT DROP CONSTRAINT RHN_TRANSELEM_TPID_NN; +ALTER TABLE RHNTRANSACTIONELEMENT MODIFY TRANSACTION_PACKAGE_ID NOT NULL; + +-- +-- RHNTRANSACTIONOPERATION +-- +ALTER TABLE RHNTRANSACTIONOPERATION DROP CONSTRAINT RHN_TRANSOP_CREATED_NN; +ALTER TABLE RHNTRANSACTIONOPERATION MODIFY CREATED NOT NULL; + +-- +-- RHNTRANSACTIONOPERATION +-- +ALTER TABLE RHNTRANSACTIONOPERATION DROP CONSTRAINT RHN_TRANSOP_ID_NN; +ALTER TABLE RHNTRANSACTIONOPERATION MODIFY ID NOT NULL; + +-- +-- RHNTRANSACTIONOPERATION +-- +ALTER TABLE RHNTRANSACTIONOPERATION DROP CONSTRAINT RHN_TRANSOP_LABEL_NN; +ALTER TABLE RHNTRANSACTIONOPERATION MODIFY LABEL NOT NULL; + +-- +-- RHNTRANSACTIONOPERATION +-- +ALTER TABLE RHNTRANSACTIONOPERATION DROP CONSTRAINT RHN_TRANSOP_MODIFIED_N= N; +ALTER TABLE RHNTRANSACTIONOPERATION MODIFY MODIFIED NOT NULL; + +-- +-- RHNTRANSACTIONPACKAGE +-- +ALTER TABLE RHNTRANSACTIONPACKAGE DROP CONSTRAINT RHN_TRANSPACK_EID_NN; +ALTER TABLE RHNTRANSACTIONPACKAGE MODIFY EVR_ID NOT NULL; + +-- +-- RHNTRANSACTIONPACKAGE +-- +ALTER TABLE RHNTRANSACTIONPACKAGE DROP CONSTRAINT RHN_TRANSPACK_ID_NN; +ALTER TABLE RHNTRANSACTIONPACKAGE MODIFY ID NOT NULL; + +-- +-- RHNTRANSACTIONPACKAGE +-- +ALTER TABLE RHNTRANSACTIONPACKAGE DROP CONSTRAINT RHN_TRANSPACK_NID_NN; +ALTER TABLE RHNTRANSACTIONPACKAGE MODIFY NAME_ID NOT NULL; + +-- +-- RHNTRANSACTIONPACKAGE +-- +ALTER TABLE RHNTRANSACTIONPACKAGE DROP CONSTRAINT RHN_TRANSPACK_OP_NN; +ALTER TABLE RHNTRANSACTIONPACKAGE MODIFY OPERATION NOT NULL; + +-- +-- RHNTRANSACTION +-- +ALTER TABLE RHNTRANSACTION DROP CONSTRAINT RHN_TRANS_CREATED_NN; +ALTER TABLE RHNTRANSACTION MODIFY CREATED NOT NULL; + +-- +-- RHNTRANSACTION +-- +ALTER TABLE RHNTRANSACTION DROP CONSTRAINT RHN_TRANS_ID_NN; +ALTER TABLE RHNTRANSACTION MODIFY ID NOT NULL; + +-- +-- RHNTRANSACTION +-- +ALTER TABLE RHNTRANSACTION DROP CONSTRAINT RHN_TRANS_MODIFIED_NN; +ALTER TABLE RHNTRANSACTION MODIFY MODIFIED NOT NULL; + +-- +-- RHNTRANSACTION +-- +ALTER TABLE RHNTRANSACTION DROP CONSTRAINT RHN_TRANS_RTI_NN; +ALTER TABLE RHNTRANSACTION MODIFY RPM_TRANS_ID NOT NULL; + +-- +-- RHNTRANSACTION +-- +ALTER TABLE RHNTRANSACTION DROP CONSTRAINT RHN_TRANS_SID_NN; +ALTER TABLE RHNTRANSACTION MODIFY SERVER_ID NOT NULL; + +-- +-- RHNTRANSACTION +-- +ALTER TABLE RHNTRANSACTION DROP CONSTRAINT RHN_TRANS_TS_NN; +ALTER TABLE RHNTRANSACTION MODIFY TIMESTAMP NOT NULL; + +-- +-- RHN_THRESHOLD_TYPE +-- +ALTER TABLE RHN_THRESHOLD_TYPE DROP CONSTRAINT RHN_TRTYP_DESC_NN; +ALTER TABLE RHN_THRESHOLD_TYPE MODIFY DESCRIPTION NOT NULL; + +-- +-- RHN_THRESHOLD_TYPE +-- +ALTER TABLE RHN_THRESHOLD_TYPE DROP CONSTRAINT RHN_TRTYP_NAME_NN; +ALTER TABLE RHN_THRESHOLD_TYPE MODIFY NAME NOT NULL; + +-- +-- RHN_THRESHOLD_TYPE +-- +ALTER TABLE RHN_THRESHOLD_TYPE DROP CONSTRAINT RHN_TRTYP_ORD_NN; +ALTER TABLE RHN_THRESHOLD_TYPE MODIFY ORDINAL NOT NULL; + +-- +-- RHNTRUSTEDORGS +-- +ALTER TABLE RHNTRUSTEDORGS DROP CONSTRAINT RHN_TRUSTED_ORGS_CREATED_NN; +ALTER TABLE RHNTRUSTEDORGS MODIFY CREATED NOT NULL; + +-- +-- RHNTRUSTEDORGS +-- +ALTER TABLE RHNTRUSTEDORGS DROP CONSTRAINT RHN_TRUSTED_ORGS_MODIFIED_NN; +ALTER TABLE RHNTRUSTEDORGS MODIFY MODIFIED NOT NULL; + +-- +-- RHNTRUSTEDORGS +-- +ALTER TABLE RHNTRUSTEDORGS DROP CONSTRAINT RHN_TRUSTED_ORGS_OID_NN; +ALTER TABLE RHNTRUSTEDORGS MODIFY ORG_ID NOT NULL; + +-- +-- RHNTRUSTEDORGS +-- +ALTER TABLE RHNTRUSTEDORGS DROP CONSTRAINT RHN_TRUSTED_ORGS_OTID_NN; +ALTER TABLE RHNTRUSTEDORGS MODIFY ORG_TRUST_ID NOT NULL; + +-- +-- RHNTINYURL +-- +ALTER TABLE RHNTINYURL DROP CONSTRAINT RHN_TU_CREATED_NN; +ALTER TABLE RHNTINYURL MODIFY CREATED NOT NULL; + +-- +-- RHNTINYURL +-- +ALTER TABLE RHNTINYURL DROP CONSTRAINT RHN_TU_ENABLED_NN; +ALTER TABLE RHNTINYURL MODIFY ENABLED NOT NULL; + +-- +-- RHNTINYURL +-- +ALTER TABLE RHNTINYURL DROP CONSTRAINT RHN_TU_EXPIRES_NN; +ALTER TABLE RHNTINYURL MODIFY EXPIRES NOT NULL; + +-- +-- RHNTINYURL +-- +ALTER TABLE RHNTINYURL DROP CONSTRAINT RHN_TU_TOKEN_NN; +ALTER TABLE RHNTINYURL MODIFY TOKEN NOT NULL; + +-- +-- RHNTINYURL +-- +ALTER TABLE RHNTINYURL DROP CONSTRAINT RHN_TU_URL_NN; +ALTER TABLE RHNTINYURL MODIFY URL NOT NULL; + +-- +-- RHN_TIME_ZONE_NAMES +-- +ALTER TABLE RHN_TIME_ZONE_NAMES DROP CONSTRAINT RHN_TZNMS_DISPLAY_NAME_NN; +ALTER TABLE RHN_TIME_ZONE_NAMES MODIFY DISPLAY_NAME NOT NULL; + +-- +-- RHN_TIME_ZONE_NAMES +-- +ALTER TABLE RHN_TIME_ZONE_NAMES DROP CONSTRAINT RHN_TZNMS_GMT_OFFSET_NN; +ALTER TABLE RHN_TIME_ZONE_NAMES MODIFY GMT_OFFSET_MINUTES NOT NULL; + +-- +-- RHN_TIME_ZONE_NAMES +-- +ALTER TABLE RHN_TIME_ZONE_NAMES DROP CONSTRAINT RHN_TZNMS_JAVA_ID_NN; +ALTER TABLE RHN_TIME_ZONE_NAMES MODIFY JAVA_ID NOT NULL; + +-- +-- RHN_TIME_ZONE_NAMES +-- +ALTER TABLE RHN_TIME_ZONE_NAMES DROP CONSTRAINT RHN_TZNMS_RECID_NN; +ALTER TABLE RHN_TIME_ZONE_NAMES MODIFY RECID NOT NULL; + +-- +-- RHN_TIME_ZONE_NAMES +-- +ALTER TABLE RHN_TIME_ZONE_NAMES DROP CONSTRAINT RHN_TZNMS_USE_DST_NN; +ALTER TABLE RHN_TIME_ZONE_NAMES MODIFY USE_DAYLIGHT_TIME NOT NULL; + +-- +-- RHNUSERDEFAULTSYSTEMGROUPS +-- +ALTER TABLE RHNUSERDEFAULTSYSTEMGROUPS DROP CONSTRAINT RHN_UDSG_CID_NN; +ALTER TABLE RHNUSERDEFAULTSYSTEMGROUPS MODIFY SYSTEM_GROUP_ID NOT NULL; + +-- +-- RHNUSERDEFAULTSYSTEMGROUPS +-- +ALTER TABLE RHNUSERDEFAULTSYSTEMGROUPS DROP CONSTRAINT RHN_UDSG_UID_NN; +ALTER TABLE RHNUSERDEFAULTSYSTEMGROUPS MODIFY USER_ID NOT NULL; + +-- +-- RHNUSERGROUPMEMBERS +-- +ALTER TABLE RHNUSERGROUPMEMBERS DROP CONSTRAINT RHN_UGMEMBERS_CREATED_NN; +ALTER TABLE RHNUSERGROUPMEMBERS MODIFY CREATED NOT NULL; + +-- +-- RHNUSERGROUPMEMBERS +-- +ALTER TABLE RHNUSERGROUPMEMBERS DROP CONSTRAINT RHN_UGMEMBERS_MODIFIED_NN; +ALTER TABLE RHNUSERGROUPMEMBERS MODIFY MODIFIED NOT NULL; + +-- +-- RHNUSERGROUPMEMBERS +-- +ALTER TABLE RHNUSERGROUPMEMBERS DROP CONSTRAINT RHN_UGMEMBERS_UGID_NN; +ALTER TABLE RHNUSERGROUPMEMBERS MODIFY USER_GROUP_ID NOT NULL; + +-- +-- RHNUSERGROUPMEMBERS +-- +ALTER TABLE RHNUSERGROUPMEMBERS DROP CONSTRAINT RHN_UGMEMBERS_UID_NN; +ALTER TABLE RHNUSERGROUPMEMBERS MODIFY USER_ID NOT NULL; + +-- +-- RHNUSERMESSAGE +-- +ALTER TABLE RHNUSERMESSAGE DROP CONSTRAINT RHN_UM_MESSAGE_ID_NN; +ALTER TABLE RHNUSERMESSAGE MODIFY MESSAGE_ID NOT NULL; + +-- +-- RHNUSERMESSAGESTATUS +-- +ALTER TABLE RHNUSERMESSAGESTATUS DROP CONSTRAINT RHN_UM_STATUS_ID_NN; +ALTER TABLE RHNUSERMESSAGESTATUS MODIFY ID NOT NULL; + +-- +-- RHNUSERMESSAGESTATUS +-- +ALTER TABLE RHNUSERMESSAGESTATUS DROP CONSTRAINT RHN_UM_STATUS_LABEL_NN; +ALTER TABLE RHNUSERMESSAGESTATUS MODIFY LABEL NOT NULL; + +-- +-- RHNUSERMESSAGE +-- +ALTER TABLE RHNUSERMESSAGE DROP CONSTRAINT RHN_UM_STATUS_NN; +ALTER TABLE RHNUSERMESSAGE MODIFY STATUS NOT NULL; + +-- +-- RHNUSERMESSAGETYPE +-- +ALTER TABLE RHNUSERMESSAGETYPE DROP CONSTRAINT RHN_UM_TYPE_ID_NN; +ALTER TABLE RHNUSERMESSAGETYPE MODIFY ID NOT NULL; + +-- +-- RHNUSERMESSAGETYPE +-- +ALTER TABLE RHNUSERMESSAGETYPE DROP CONSTRAINT RHN_UM_TYPE_LABEL_NN; +ALTER TABLE RHNUSERMESSAGETYPE MODIFY LABEL NOT NULL; + +-- +-- RHNUSERMESSAGETYPE +-- +ALTER TABLE RHNUSERMESSAGETYPE DROP CONSTRAINT RHN_UM_TYPE_NAME_NN; +ALTER TABLE RHNUSERMESSAGETYPE MODIFY NAME NOT NULL; + +-- +-- RHNUSERMESSAGE +-- +ALTER TABLE RHNUSERMESSAGE DROP CONSTRAINT RHN_UM_USER_ID_NN; +ALTER TABLE RHNUSERMESSAGE MODIFY USER_ID NOT NULL; + +-- +-- RHN_UNITS +-- +ALTER TABLE RHN_UNITS DROP CONSTRAINT RHN_UNITS_QUANTUM_ID_NN; +ALTER TABLE RHN_UNITS MODIFY QUANTUM_ID NOT NULL; + +-- +-- RHN_UNITS +-- +ALTER TABLE RHN_UNITS DROP CONSTRAINT RHN_UNITS_UNIT_ID_NN; +ALTER TABLE RHN_UNITS MODIFY UNIT_ID NOT NULL; + +-- +-- RHN_URL_PROBE +-- +ALTER TABLE RHN_URL_PROBE DROP CONSTRAINT RHN_URLPB_COOKIE_EN_NN; +ALTER TABLE RHN_URL_PROBE MODIFY COOKIE_ENABLED NOT NULL; + +-- +-- RHN_URL_PROBE +-- +ALTER TABLE RHN_URL_PROBE DROP CONSTRAINT RHN_URLPB_MULTI_STEP_NN; +ALTER TABLE RHN_URL_PROBE MODIFY MULTI_STEP NOT NULL; + +-- +-- RHN_URL_PROBE +-- +ALTER TABLE RHN_URL_PROBE DROP CONSTRAINT RHN_URLPB_PROBE_ID_NN; +ALTER TABLE RHN_URL_PROBE MODIFY PROBE_ID NOT NULL; + +-- +-- RHN_URL_PROBE +-- +ALTER TABLE RHN_URL_PROBE DROP CONSTRAINT RHN_URLPB_PROBE_TYPE_NN; +ALTER TABLE RHN_URL_PROBE MODIFY PROBE_TYPE NOT NULL; + +-- +-- RHN_URL_PROBE +-- +ALTER TABLE RHN_URL_PROBE DROP CONSTRAINT RHN_URLPB_RUN_ON_SCOUTS_NN; +ALTER TABLE RHN_URL_PROBE MODIFY RUN_ON_SCOUTS NOT NULL; + +-- +-- RHN_URL_PROBE_STEP +-- +ALTER TABLE RHN_URL_PROBE_STEP DROP CONSTRAINT RHN_URLPS_CONN_CRIT_NN; +ALTER TABLE RHN_URL_PROBE_STEP MODIFY CONNECT_CRIT NOT NULL; + +-- +-- RHN_URL_PROBE_STEP +-- +ALTER TABLE RHN_URL_PROBE_STEP DROP CONSTRAINT RHN_URLPS_CONN_WARN_NN; +ALTER TABLE RHN_URL_PROBE_STEP MODIFY CONNECT_WARN NOT NULL; + +-- +-- RHN_URL_PROBE_STEP +-- +ALTER TABLE RHN_URL_PROBE_STEP DROP CONSTRAINT RHN_URLPS_COOKIE_SEC_NN; +ALTER TABLE RHN_URL_PROBE_STEP MODIFY COOKIE_SECURE NOT NULL; + +-- +-- RHN_URL_PROBE_STEP +-- +ALTER TABLE RHN_URL_PROBE_STEP DROP CONSTRAINT RHN_URLPS_DNS_CRIT_NN; +ALTER TABLE RHN_URL_PROBE_STEP MODIFY DNS_CRIT NOT NULL; + +-- +-- RHN_URL_PROBE_STEP +-- +ALTER TABLE RHN_URL_PROBE_STEP DROP CONSTRAINT RHN_URLPS_DNS_WARN_NN; +ALTER TABLE RHN_URL_PROBE_STEP MODIFY DNS_WARN NOT NULL; + +-- +-- RHN_URL_PROBE_STEP +-- +ALTER TABLE RHN_URL_PROBE_STEP DROP CONSTRAINT RHN_URLPS_LATE_CRIT_NN; +ALTER TABLE RHN_URL_PROBE_STEP MODIFY LATENCY_CRIT NOT NULL; + +-- +-- RHN_URL_PROBE_STEP +-- +ALTER TABLE RHN_URL_PROBE_STEP DROP CONSTRAINT RHN_URLPS_LATE_WARN_NN; +ALTER TABLE RHN_URL_PROBE_STEP MODIFY LATENCY_WARN NOT NULL; + +-- +-- RHN_URL_PROBE_STEP +-- +ALTER TABLE RHN_URL_PROBE_STEP DROP CONSTRAINT RHN_URLPS_LOAD_SUB_NN; +ALTER TABLE RHN_URL_PROBE_STEP MODIFY LOAD_SUBSIDIARY NOT NULL; + +-- +-- RHN_URL_PROBE_STEP +-- +ALTER TABLE RHN_URL_PROBE_STEP DROP CONSTRAINT RHN_URLPS_PROTOCOL_NN; +ALTER TABLE RHN_URL_PROBE_STEP MODIFY PROTOCOL_METHOD NOT NULL; + +-- +-- RHN_URL_PROBE_STEP +-- +ALTER TABLE RHN_URL_PROBE_STEP DROP CONSTRAINT RHN_URLPS_RECID_NN; +ALTER TABLE RHN_URL_PROBE_STEP MODIFY RECID NOT NULL; + +-- +-- RHN_URL_PROBE_STEP +-- +ALTER TABLE RHN_URL_PROBE_STEP DROP CONSTRAINT RHN_URLPS_THRU_CRIT_NN; +ALTER TABLE RHN_URL_PROBE_STEP MODIFY THROUGH_CRIT NOT NULL; + +-- +-- RHN_URL_PROBE_STEP +-- +ALTER TABLE RHN_URL_PROBE_STEP DROP CONSTRAINT RHN_URLPS_THRU_WARN_NN; +ALTER TABLE RHN_URL_PROBE_STEP MODIFY THROUGH_WARN NOT NULL; + +-- +-- RHN_URL_PROBE_STEP +-- +ALTER TABLE RHN_URL_PROBE_STEP DROP CONSTRAINT RHN_URLPS_TOTAL_CRIT_NN; +ALTER TABLE RHN_URL_PROBE_STEP MODIFY TOTAL_CRIT NOT NULL; + +-- +-- RHN_URL_PROBE_STEP +-- +ALTER TABLE RHN_URL_PROBE_STEP DROP CONSTRAINT RHN_URLPS_TOTAL_WARN_NN; +ALTER TABLE RHN_URL_PROBE_STEP MODIFY TOTAL_WARN NOT NULL; + +-- +-- RHN_URL_PROBE_STEP +-- +ALTER TABLE RHN_URL_PROBE_STEP DROP CONSTRAINT RHN_URLPS_TRANS_CRIT_NN; +ALTER TABLE RHN_URL_PROBE_STEP MODIFY TRANS_CRIT NOT NULL; + +-- +-- RHN_URL_PROBE_STEP +-- +ALTER TABLE RHN_URL_PROBE_STEP DROP CONSTRAINT RHN_URLPS_TRANS_WARN_NN; +ALTER TABLE RHN_URL_PROBE_STEP MODIFY TRANS_WARN NOT NULL; + +-- +-- RHN_URL_PROBE_STEP +-- +ALTER TABLE RHN_URL_PROBE_STEP DROP CONSTRAINT RHN_URLPS_URL_NN; +ALTER TABLE RHN_URL_PROBE_STEP MODIFY URL NOT NULL; + +-- +-- RHN_URL_PROBE_STEP +-- +ALTER TABLE RHN_URL_PROBE_STEP DROP CONSTRAINT RHN_URLPS_URL_PROB_ID_NN; +ALTER TABLE RHN_URL_PROBE_STEP MODIFY URL_PROBE_ID NOT NULL; + +-- +-- RHN_URL_PROBE_STEP +-- +ALTER TABLE RHN_URL_PROBE_STEP DROP CONSTRAINT RHN_URLPS_URL_STEP_NO_NN; +ALTER TABLE RHN_URL_PROBE_STEP MODIFY STEP_NUMBER NOT NULL; + +-- +-- RHN_URL_PROBE_STEP +-- +ALTER TABLE RHN_URL_PROBE_STEP DROP CONSTRAINT RHN_URLPS_VER_LINKS_NN; +ALTER TABLE RHN_URL_PROBE_STEP MODIFY VERIFY_LINKS NOT NULL; + +-- +-- RHNUSERGROUPTYPE +-- +ALTER TABLE RHNUSERGROUPTYPE DROP CONSTRAINT RHN_USERGROUPTYPE_CREATED_NN; +ALTER TABLE RHNUSERGROUPTYPE MODIFY CREATED NOT NULL; + +-- +-- RHNUSERGROUPTYPE +-- +ALTER TABLE RHNUSERGROUPTYPE DROP CONSTRAINT RHN_USERGROUPTYPE_ID_NN; +ALTER TABLE RHNUSERGROUPTYPE MODIFY ID NOT NULL; + +-- +-- RHNUSERGROUPTYPE +-- +ALTER TABLE RHNUSERGROUPTYPE DROP CONSTRAINT RHN_USERGROUPTYPE_LABEL_NN; +ALTER TABLE RHNUSERGROUPTYPE MODIFY LABEL NOT NULL; + +-- +-- RHNUSERGROUPTYPE +-- +ALTER TABLE RHNUSERGROUPTYPE DROP CONSTRAINT RHN_USERGROUPTYPE_MODIFIED_NN; +ALTER TABLE RHNUSERGROUPTYPE MODIFY MODIFIED NOT NULL; + +-- +-- RHNUSERGROUPTYPE +-- +ALTER TABLE RHNUSERGROUPTYPE DROP CONSTRAINT RHN_USERGROUPTYPE_NAME_NN; +ALTER TABLE RHNUSERGROUPTYPE MODIFY NAME NOT NULL; + +-- +-- RHNUSERGROUP +-- +ALTER TABLE RHNUSERGROUP DROP CONSTRAINT RHN_USERGROUP_TYPE_CREATED_NN; +ALTER TABLE RHNUSERGROUP MODIFY CREATED NOT NULL; + +-- +-- RHNUSERGROUP +-- +ALTER TABLE RHNUSERGROUP DROP CONSTRAINT RHN_USERGROUP_TYPE_MODIFIED_NN; +ALTER TABLE RHNUSERGROUP MODIFY MODIFIED NOT NULL; + +-- +-- RHNUSERGROUP +-- +ALTER TABLE RHNUSERGROUP DROP CONSTRAINT RHN_USERGROUP_TYPE_NN; +ALTER TABLE RHNUSERGROUP MODIFY GROUP_TYPE NOT NULL; + +-- +-- RHNUSERSERVERPREFS +-- +ALTER TABLE RHNUSERSERVERPREFS DROP CONSTRAINT RHN_USERSERVERPREFS_CREATED= _NN; +ALTER TABLE RHNUSERSERVERPREFS MODIFY CREATED NOT NULL; + +-- +-- RHNUSERSERVERPREFS +-- +ALTER TABLE RHNUSERSERVERPREFS DROP CONSTRAINT RHN_USERSERVERPREFS_MOD_NN; +ALTER TABLE RHNUSERSERVERPREFS MODIFY MODIFIED NOT NULL; + +-- +-- RHNUSERSERVERPREFS +-- +ALTER TABLE RHNUSERSERVERPREFS DROP CONSTRAINT RHN_USERSERVERPREFS_NAME_NN; +ALTER TABLE RHNUSERSERVERPREFS MODIFY NAME NOT NULL; + +-- +-- RHNUSERSERVERPREFS +-- +ALTER TABLE RHNUSERSERVERPREFS DROP CONSTRAINT RHN_USERSERVERPREFS_SID_NN; +ALTER TABLE RHNUSERSERVERPREFS MODIFY SERVER_ID NOT NULL; + +-- +-- RHNUSERSERVERPREFS +-- +ALTER TABLE RHNUSERSERVERPREFS DROP CONSTRAINT RHN_USERSERVERPREFS_UID_NN; +ALTER TABLE RHNUSERSERVERPREFS MODIFY USER_ID NOT NULL; + +-- +-- RHNUSERSERVERPREFS +-- +ALTER TABLE RHNUSERSERVERPREFS DROP CONSTRAINT RHN_USERSERVERPREFS_VALUE_N= N; +ALTER TABLE RHNUSERSERVERPREFS MODIFY VALUE NOT NULL; + +-- +-- RHNUSERGROUP +-- +ALTER TABLE RHNUSERGROUP DROP CONSTRAINT RHN_USER_GROUP_CM_NN; +ALTER TABLE RHNUSERGROUP MODIFY CURRENT_MEMBERS NOT NULL; + +-- +-- RHNUSERGROUP +-- +ALTER TABLE RHNUSERGROUP DROP CONSTRAINT RHN_USER_GROUP_DESC_NN; +ALTER TABLE RHNUSERGROUP MODIFY DESCRIPTION NOT NULL; + +-- +-- RHNUSERGROUP +-- +ALTER TABLE RHNUSERGROUP DROP CONSTRAINT RHN_USER_GROUP_ID_NN; +ALTER TABLE RHNUSERGROUP MODIFY ID NOT NULL; + +-- +-- RHNUSERGROUP +-- +ALTER TABLE RHNUSERGROUP DROP CONSTRAINT RHN_USER_GROUP_NAME_NN; +ALTER TABLE RHNUSERGROUP MODIFY NAME NOT NULL; + +-- +-- RHNUSERGROUP +-- +ALTER TABLE RHNUSERGROUP DROP CONSTRAINT RHN_USER_GROUP_ORG_ID_NN; +ALTER TABLE RHNUSERGROUP MODIFY ORG_ID NOT NULL; + +-- +-- RHNUSERINFO +-- +ALTER TABLE RHNUSERINFO DROP CONSTRAINT RHN_USER_INFO_AGREED_NN; +ALTER TABLE RHNUSERINFO MODIFY AGREED_TO_TERMS NOT NULL; + +-- +-- RHNUSERINFO +-- +ALTER TABLE RHNUSERINFO DROP CONSTRAINT RHN_USER_INFO_BADEMAIL_NN; +ALTER TABLE RHNUSERINFO MODIFY BAD_EMAIL NOT NULL; + +-- +-- RHNUSERINFO +-- +ALTER TABLE RHNUSERINFO DROP CONSTRAINT RHN_USER_INFO_CLEARSETS_NN; +ALTER TABLE RHNUSERINFO MODIFY NO_CLEAR_SETS NOT NULL; + +-- +-- RHNUSERINFO +-- +ALTER TABLE RHNUSERINFO DROP CONSTRAINT RHN_USER_INFO_CREATED_NN; +ALTER TABLE RHNUSERINFO MODIFY CREATED NOT NULL; + +-- +-- RHNUSERINFO +-- +ALTER TABLE RHNUSERINFO DROP CONSTRAINT RHN_USER_INFO_MODIFIED_NN; +ALTER TABLE RHNUSERINFO MODIFY MODIFIED NOT NULL; + +-- +-- RHNUSERINFO +-- +ALTER TABLE RHNUSERINFO DROP CONSTRAINT RHN_USER_INFO_NOTIFY_NN; +ALTER TABLE RHNUSERINFO MODIFY EMAIL_NOTIFY NOT NULL; + +-- +-- RHNUSERINFO +-- +ALTER TABLE RHNUSERINFO DROP CONSTRAINT RHN_USER_INFO_PAGESIZE_NN; +ALTER TABLE RHNUSERINFO MODIFY PAGE_SIZE NOT NULL; + +-- +-- RHNUSERINFO +-- +ALTER TABLE RHNUSERINFO DROP CONSTRAINT RHN_USER_INFO_PAM_NN; +ALTER TABLE RHNUSERINFO MODIFY USE_PAM_AUTHENTICATION NOT NULL; + +-- +-- RHNUSERINFO +-- +ALTER TABLE RHNUSERINFO DROP CONSTRAINT RHN_USER_INFO_SEA_NN; +ALTER TABLE RHNUSERINFO MODIFY SHOW_APPLIED_ERRATA NOT NULL; + +-- +-- RHNUSERINFO +-- +ALTER TABLE RHNUSERINFO DROP CONSTRAINT RHN_USER_INFO_SSGL_NN; +ALTER TABLE RHNUSERINFO MODIFY SHOW_SYSTEM_GROUP_LIST NOT NULL; + +-- +-- RHNUSERINFO +-- +ALTER TABLE RHNUSERINFO DROP CONSTRAINT RHN_USER_INFO_TZOFFSET_NN; +ALTER TABLE RHNUSERINFO MODIFY TZ_OFFSET NOT NULL; + +-- +-- RHNUSERINFO +-- +ALTER TABLE RHNUSERINFO DROP CONSTRAINT RHN_USER_INFO_USER_NN; +ALTER TABLE RHNUSERINFO MODIFY USER_ID NOT NULL; + +-- +-- RHNUSERRESERVED +-- +ALTER TABLE RHNUSERRESERVED DROP CONSTRAINT RHN_USER_RES_CREATED_NN; +ALTER TABLE RHNUSERRESERVED MODIFY CREATED NOT NULL; + +-- +-- RHNUSERRESERVED +-- +ALTER TABLE RHNUSERRESERVED DROP CONSTRAINT RHN_USER_RES_LOGIN_NN; +ALTER TABLE RHNUSERRESERVED MODIFY LOGIN NOT NULL; + +-- +-- RHNUSERRESERVED +-- +ALTER TABLE RHNUSERRESERVED DROP CONSTRAINT RHN_USER_RES_LOGIN_UC_NN; +ALTER TABLE RHNUSERRESERVED MODIFY LOGIN_UC NOT NULL; + +-- +-- RHNUSERRESERVED +-- +ALTER TABLE RHNUSERRESERVED DROP CONSTRAINT RHN_USER_RES_MODIFIED_NN; +ALTER TABLE RHNUSERRESERVED MODIFY MODIFIED NOT NULL; + +-- +-- RHNUSERRESERVED +-- +ALTER TABLE RHNUSERRESERVED DROP CONSTRAINT RHN_USER_RES_PWD_NN; +ALTER TABLE RHNUSERRESERVED MODIFY PASSWORD NOT NULL; + +-- +-- RHNUSERSERVERGROUPPERMS +-- +ALTER TABLE RHNUSERSERVERGROUPPERMS DROP CONSTRAINT RHN_USGP_CREATED_NN; +ALTER TABLE RHNUSERSERVERGROUPPERMS MODIFY CREATED NOT NULL; + +-- +-- RHNUSERSERVERGROUPPERMS +-- +ALTER TABLE RHNUSERSERVERGROUPPERMS DROP CONSTRAINT RHN_USGP_MODIFIED_NN; +ALTER TABLE RHNUSERSERVERGROUPPERMS MODIFY MODIFIED NOT NULL; + +-- +-- RHNUSERSERVERGROUPPERMS +-- +ALTER TABLE RHNUSERSERVERGROUPPERMS DROP CONSTRAINT RHN_USGP_SERVER_NN; +ALTER TABLE RHNUSERSERVERGROUPPERMS MODIFY SERVER_GROUP_ID NOT NULL; + +-- +-- RHNUSERSERVERGROUPPERMS +-- +ALTER TABLE RHNUSERSERVERGROUPPERMS DROP CONSTRAINT RHN_USGP_USER_NN; +ALTER TABLE RHNUSERSERVERGROUPPERMS MODIFY USER_ID NOT NULL; + +-- +-- RHNUSERSERVERPERMS +-- +ALTER TABLE RHNUSERSERVERPERMS DROP CONSTRAINT RHN_USPERMS_SID_NN; +ALTER TABLE RHNUSERSERVERPERMS MODIFY SERVER_ID NOT NULL; + +-- +-- RHNUSERSERVERPERMS +-- +ALTER TABLE RHNUSERSERVERPERMS DROP CONSTRAINT RHN_USPERMS_UID_NN; +ALTER TABLE RHNUSERSERVERPERMS MODIFY USER_ID NOT NULL; + +-- +-- RHNUSERINFOPANE +-- +ALTER TABLE RHNUSERINFOPANE DROP CONSTRAINT RHN_USR_INFO_PANE_PID_NN; +ALTER TABLE RHNUSERINFOPANE MODIFY PANE_ID NOT NULL; + +-- +-- RHNUSERINFOPANE +-- +ALTER TABLE RHNUSERINFOPANE DROP CONSTRAINT RHN_USR_INFO_PANE_UID_NN; +ALTER TABLE RHNUSERINFOPANE MODIFY USER_ID NOT NULL; + +-- +-- RHNVERSIONINFO +-- +ALTER TABLE RHNVERSIONINFO DROP CONSTRAINT RHN_VERSIONINFO_CREATED_NN; +ALTER TABLE RHNVERSIONINFO MODIFY CREATED NOT NULL; + +-- +-- RHNVERSIONINFO +-- +ALTER TABLE RHNVERSIONINFO DROP CONSTRAINT RHN_VERSIONINFO_EID_NN; +ALTER TABLE RHNVERSIONINFO MODIFY EVR_ID NOT NULL; + +-- +-- RHNVERSIONINFO +-- +ALTER TABLE RHNVERSIONINFO DROP CONSTRAINT RHN_VERSIONINFO_LABEL_NN; +ALTER TABLE RHNVERSIONINFO MODIFY LABEL NOT NULL; + +-- +-- RHNVERSIONINFO +-- +ALTER TABLE RHNVERSIONINFO DROP CONSTRAINT RHN_VERSIONINFO_MODIFIED_NN; +ALTER TABLE RHNVERSIONINFO MODIFY MODIFIED NOT NULL; + +-- +-- RHNVERSIONINFO +-- +ALTER TABLE RHNVERSIONINFO DROP CONSTRAINT RHN_VERSIONINFO_NID_NN; +ALTER TABLE RHNVERSIONINFO MODIFY NAME_ID NOT NULL; + +-- +-- RHNVIRTUALINSTANCEEVENTLOG +-- +ALTER TABLE RHNVIRTUALINSTANCEEVENTLOG DROP CONSTRAINT RHN_VIEL_CREATED_NN; +ALTER TABLE RHNVIRTUALINSTANCEEVENTLOG MODIFY CREATED NOT NULL; + +-- +-- RHNVIRTUALINSTANCEEVENTLOG +-- +ALTER TABLE RHNVIRTUALINSTANCEEVENTLOG DROP CONSTRAINT RHN_VIEL_ET_NN; +ALTER TABLE RHNVIRTUALINSTANCEEVENTLOG MODIFY EVENT_TYPE NOT NULL; + +-- +-- RHNVIRTUALINSTANCEEVENTLOG +-- +ALTER TABLE RHNVIRTUALINSTANCEEVENTLOG DROP CONSTRAINT RHN_VIEL_ID_NN; +ALTER TABLE RHNVIRTUALINSTANCEEVENTLOG MODIFY ID NOT NULL; + +-- +-- RHNVIRTUALINSTANCEEVENTLOG +-- +ALTER TABLE RHNVIRTUALINSTANCEEVENTLOG DROP CONSTRAINT RHN_VIEL_LT_NN; +ALTER TABLE RHNVIRTUALINSTANCEEVENTLOG MODIFY LOCAL_TIMESTAMP NOT NULL; + +-- +-- RHNVIRTUALINSTANCEEVENTLOG +-- +ALTER TABLE RHNVIRTUALINSTANCEEVENTLOG DROP CONSTRAINT RHN_VIEL_MODIFIED_N= N; +ALTER TABLE RHNVIRTUALINSTANCEEVENTLOG MODIFY MODIFIED NOT NULL; + +-- +-- RHNVIRTUALINSTANCEEVENTLOG +-- +ALTER TABLE RHNVIRTUALINSTANCEEVENTLOG DROP CONSTRAINT RHN_VIEL_NEW_STATE_= NN; +ALTER TABLE RHNVIRTUALINSTANCEEVENTLOG MODIFY NEW_STATE NOT NULL; + +-- +-- RHNVIRTUALINSTANCEEVENTLOG +-- +ALTER TABLE RHNVIRTUALINSTANCEEVENTLOG DROP CONSTRAINT RHN_VIEL_OLD_STATE_= NN; +ALTER TABLE RHNVIRTUALINSTANCEEVENTLOG MODIFY OLD_STATE NOT NULL; + +-- +-- RHNVIRTUALINSTANCEEVENTTYPE +-- +ALTER TABLE RHNVIRTUALINSTANCEEVENTTYPE DROP CONSTRAINT RHN_VIET_CREATED_N= N; +ALTER TABLE RHNVIRTUALINSTANCEEVENTTYPE MODIFY CREATED NOT NULL; + +-- +-- RHNVIRTUALINSTANCEEVENTTYPE +-- +ALTER TABLE RHNVIRTUALINSTANCEEVENTTYPE DROP CONSTRAINT RHN_VIET_ID_NN; +ALTER TABLE RHNVIRTUALINSTANCEEVENTTYPE MODIFY ID NOT NULL; + +-- +-- RHNVIRTUALINSTANCEEVENTTYPE +-- +ALTER TABLE RHNVIRTUALINSTANCEEVENTTYPE DROP CONSTRAINT RHN_VIET_LABEL_NN; +ALTER TABLE RHNVIRTUALINSTANCEEVENTTYPE MODIFY LABEL NOT NULL; + +-- +-- RHNVIRTUALINSTANCEEVENTTYPE +-- +ALTER TABLE RHNVIRTUALINSTANCEEVENTTYPE DROP CONSTRAINT RHN_VIET_MODIFIED_= NN; +ALTER TABLE RHNVIRTUALINSTANCEEVENTTYPE MODIFY MODIFIED NOT NULL; + +-- +-- RHNVIRTUALINSTANCEEVENTTYPE +-- +ALTER TABLE RHNVIRTUALINSTANCEEVENTTYPE DROP CONSTRAINT RHN_VIET_NAME_NN; +ALTER TABLE RHNVIRTUALINSTANCEEVENTTYPE MODIFY NAME NOT NULL; + +-- +-- RHNVIRTUALINSTANCEINSTALLLOG +-- +ALTER TABLE RHNVIRTUALINSTANCEINSTALLLOG DROP CONSTRAINT RHN_VIIL_CREATED_= NN; +ALTER TABLE RHNVIRTUALINSTANCEINSTALLLOG MODIFY CREATED NOT NULL; + +-- +-- RHNVIRTUALINSTANCEINSTALLLOG +-- +ALTER TABLE RHNVIRTUALINSTANCEINSTALLLOG DROP CONSTRAINT RHN_VIIL_ID_NN; +ALTER TABLE RHNVIRTUALINSTANCEINSTALLLOG MODIFY ID NOT NULL; + +-- +-- RHNVIRTUALINSTANCEINSTALLLOG +-- +ALTER TABLE RHNVIRTUALINSTANCEINSTALLLOG DROP CONSTRAINT RHN_VIIL_LM_NN; +ALTER TABLE RHNVIRTUALINSTANCEINSTALLLOG MODIFY LOG_MESSAGE NOT NULL; + +-- +-- RHNVIRTUALINSTANCEINSTALLLOG +-- +ALTER TABLE RHNVIRTUALINSTANCEINSTALLLOG DROP CONSTRAINT RHN_VIIL_MODIFIED= _NN; +ALTER TABLE RHNVIRTUALINSTANCEINSTALLLOG MODIFY MODIFIED NOT NULL; + +-- +-- RHNVIRTUALINSTANCEINFO +-- +ALTER TABLE RHNVIRTUALINSTANCEINFO DROP CONSTRAINT RHN_VII_CREATED_NN; +ALTER TABLE RHNVIRTUALINSTANCEINFO MODIFY CREATED NOT NULL; + +-- +-- RHNVIRTUALINSTANCEINFO +-- +ALTER TABLE RHNVIRTUALINSTANCEINFO DROP CONSTRAINT RHN_VII_IT_NN; +ALTER TABLE RHNVIRTUALINSTANCEINFO MODIFY INSTANCE_TYPE NOT NULL; + +-- +-- RHNVIRTUALINSTANCEINFO +-- +ALTER TABLE RHNVIRTUALINSTANCEINFO DROP CONSTRAINT RHN_VII_MODIFIED_NN; +ALTER TABLE RHNVIRTUALINSTANCEINFO MODIFY MODIFIED NOT NULL; + +-- +-- RHNVIRTUALINSTANCEINFO +-- +ALTER TABLE RHNVIRTUALINSTANCEINFO DROP CONSTRAINT RHN_VII_STATE_NN; +ALTER TABLE RHNVIRTUALINSTANCEINFO MODIFY STATE NOT NULL; + +-- +-- RHNVIRTUALINSTANCEINFO +-- +ALTER TABLE RHNVIRTUALINSTANCEINFO DROP CONSTRAINT RHN_VII_VIID_NN; +ALTER TABLE RHNVIRTUALINSTANCEINFO MODIFY INSTANCE_ID NOT NULL; + +-- +-- RHNVIRTUALINSTANCESTATE +-- +ALTER TABLE RHNVIRTUALINSTANCESTATE DROP CONSTRAINT RHN_VIS_CREATED_NN; +ALTER TABLE RHNVIRTUALINSTANCESTATE MODIFY CREATED NOT NULL; + +-- +-- RHNVIRTUALINSTANCESTATE +-- +ALTER TABLE RHNVIRTUALINSTANCESTATE DROP CONSTRAINT RHN_VIS_ID_NN; +ALTER TABLE RHNVIRTUALINSTANCESTATE MODIFY ID NOT NULL; + +-- +-- RHNVIRTUALINSTANCESTATE +-- +ALTER TABLE RHNVIRTUALINSTANCESTATE DROP CONSTRAINT RHN_VIS_LABEL_NN; +ALTER TABLE RHNVIRTUALINSTANCESTATE MODIFY LABEL NOT NULL; + +-- +-- RHNVIRTUALINSTANCESTATE +-- +ALTER TABLE RHNVIRTUALINSTANCESTATE DROP CONSTRAINT RHN_VIS_MODIFIED_NN; +ALTER TABLE RHNVIRTUALINSTANCESTATE MODIFY MODIFIED NOT NULL; + +-- +-- RHNVIRTUALINSTANCESTATE +-- +ALTER TABLE RHNVIRTUALINSTANCESTATE DROP CONSTRAINT RHN_VIS_NAME_NN; +ALTER TABLE RHNVIRTUALINSTANCESTATE MODIFY NAME NOT NULL; + +-- +-- RHNVIRTUALINSTANCETYPE +-- +ALTER TABLE RHNVIRTUALINSTANCETYPE DROP CONSTRAINT RHN_VIT_CREATED_NN; +ALTER TABLE RHNVIRTUALINSTANCETYPE MODIFY CREATED NOT NULL; + +-- +-- RHNVIRTUALINSTANCETYPE +-- +ALTER TABLE RHNVIRTUALINSTANCETYPE DROP CONSTRAINT RHN_VIT_ID_NN; +ALTER TABLE RHNVIRTUALINSTANCETYPE MODIFY ID NOT NULL; + +-- +-- RHNVIRTUALINSTANCETYPE +-- +ALTER TABLE RHNVIRTUALINSTANCETYPE DROP CONSTRAINT RHN_VIT_LABEL_NN; +ALTER TABLE RHNVIRTUALINSTANCETYPE MODIFY LABEL NOT NULL; + +-- +-- RHNVIRTUALINSTANCETYPE +-- +ALTER TABLE RHNVIRTUALINSTANCETYPE DROP CONSTRAINT RHN_VIT_MODIFIED_NN; +ALTER TABLE RHNVIRTUALINSTANCETYPE MODIFY MODIFIED NOT NULL; + +-- +-- RHNVIRTUALINSTANCETYPE +-- +ALTER TABLE RHNVIRTUALINSTANCETYPE DROP CONSTRAINT RHN_VIT_NAME_NN; +ALTER TABLE RHNVIRTUALINSTANCETYPE MODIFY NAME NOT NULL; + +-- +-- RHNVIRTUALINSTANCE +-- +ALTER TABLE RHNVIRTUALINSTANCE DROP CONSTRAINT RHN_VI_CREATED_NN; +ALTER TABLE RHNVIRTUALINSTANCE MODIFY CREATED NOT NULL; + +-- +-- RHNVIRTUALINSTANCE +-- +ALTER TABLE RHNVIRTUALINSTANCE DROP CONSTRAINT RHN_VI_C_NN; +ALTER TABLE RHNVIRTUALINSTANCE MODIFY CONFIRMED NOT NULL; + +-- +-- RHNVIRTUALINSTANCE +-- +ALTER TABLE RHNVIRTUALINSTANCE DROP CONSTRAINT RHN_VI_ID_NN; +ALTER TABLE RHNVIRTUALINSTANCE MODIFY ID NOT NULL; + +-- +-- RHNVIRTUALINSTANCE +-- +ALTER TABLE RHNVIRTUALINSTANCE DROP CONSTRAINT RHN_VI_MODIFIED_NN; +ALTER TABLE RHNVIRTUALINSTANCE MODIFY MODIFIED NOT NULL; + +-- +-- RHNVIRTSUBLEVEL +-- +ALTER TABLE RHNVIRTSUBLEVEL DROP CONSTRAINT RHN_VSL_CREATED_NN; +ALTER TABLE RHNVIRTSUBLEVEL MODIFY CREATED NOT NULL; + +-- +-- RHNVIRTSUBLEVEL +-- +ALTER TABLE RHNVIRTSUBLEVEL DROP CONSTRAINT RHN_VSL_LABEL_NN; +ALTER TABLE RHNVIRTSUBLEVEL MODIFY LABEL NOT NULL; + +-- +-- RHNVIRTSUBLEVEL +-- +ALTER TABLE RHNVIRTSUBLEVEL DROP CONSTRAINT RHN_VSL_MODIFIED_NN; +ALTER TABLE RHNVIRTSUBLEVEL MODIFY MODIFIED NOT NULL; + +-- +-- RHNVIRTSUBLEVEL +-- +ALTER TABLE RHNVIRTSUBLEVEL DROP CONSTRAINT RHN_VSL_NAME_NN; +ALTER TABLE RHNVIRTSUBLEVEL MODIFY NAME NOT NULL; + +-- +-- RHNWEBCONTACTCHANGELOG +-- +ALTER TABLE RHNWEBCONTACTCHANGELOG DROP CONSTRAINT RHN_WCON_CL_CHANGE_SID_= NN; +ALTER TABLE RHNWEBCONTACTCHANGELOG MODIFY CHANGE_STATE_ID NOT NULL; + +-- +-- RHNWEBCONTACTCHANGELOG +-- +ALTER TABLE RHNWEBCONTACTCHANGELOG DROP CONSTRAINT RHN_WCON_CL_MODIFIED_NN; +ALTER TABLE RHNWEBCONTACTCHANGELOG MODIFY DATE_COMPLETED NOT NULL; + +-- +-- RHNWEBCONTACTCHANGELOG +-- +ALTER TABLE RHNWEBCONTACTCHANGELOG DROP CONSTRAINT RHN_WCON_CL_WCON_ID_NN; +ALTER TABLE RHNWEBCONTACTCHANGELOG MODIFY WEB_CONTACT_ID NOT NULL; + +-- +-- RHN_WIDGET +-- +ALTER TABLE RHN_WIDGET DROP CONSTRAINT RHN_WDGET_DESC_NN; +ALTER TABLE RHN_WIDGET MODIFY DESCRIPTION NOT NULL; + +-- +-- RHN_WIDGET +-- +ALTER TABLE RHN_WIDGET DROP CONSTRAINT RHN_WDGET_NAME_NN; +ALTER TABLE RHN_WIDGET MODIFY NAME NOT NULL; + +-- +-- STATE_CHANGE +-- +ALTER TABLE STATE_CHANGE DROP CONSTRAINT STATE_CHANGE_ETIME_NN; +ALTER TABLE STATE_CHANGE MODIFY ENTRY_TIME NOT NULL; + +-- +-- STATE_CHANGE +-- +ALTER TABLE STATE_CHANGE DROP CONSTRAINT STATE_CHANGE_O_ID_NN; +ALTER TABLE STATE_CHANGE MODIFY O_ID NOT NULL; + +-- +-- RHNINDEXERWORK +-- +ALTER TABLE RHNINDEXERWORK DROP CONSTRAINT SYS_C00204152; +ALTER TABLE RHNINDEXERWORK MODIFY OBJECT_TYPE NOT NULL; + +-- +-- RHNINDEXERWORK +-- +ALTER TABLE RHNINDEXERWORK DROP CONSTRAINT SYS_C00204153; +ALTER TABLE RHNINDEXERWORK MODIFY LAST_ID NOT NULL; + +-- +-- RHNINDEXERWORK +-- +ALTER TABLE RHNINDEXERWORK DROP CONSTRAINT SYS_C00204154; +ALTER TABLE RHNINDEXERWORK MODIFY LAST_MODIFIED NOT NULL; + +-- +-- RHNKICKSTARTPACKAGE +-- +ALTER TABLE RHNKICKSTARTPACKAGE DROP CONSTRAINT SYS_C00204210; +ALTER TABLE RHNKICKSTARTPACKAGE MODIFY POSITION NOT NULL; + +-- +-- RHNVISIBLEOBJECTS +-- +ALTER TABLE RHNVISIBLEOBJECTS DROP CONSTRAINT SYS_C00205054; +ALTER TABLE RHNVISIBLEOBJECTS MODIFY PXT_SESSION_ID NOT NULL; + +-- +-- RHNVISIBLEOBJECTS +-- +ALTER TABLE RHNVISIBLEOBJECTS DROP CONSTRAINT SYS_C00205055; +ALTER TABLE RHNVISIBLEOBJECTS MODIFY OBJECT_ID NOT NULL; + +-- +-- RHNVISIBLEOBJECTS +-- +ALTER TABLE RHNVISIBLEOBJECTS DROP CONSTRAINT SYS_C00205056; +ALTER TABLE RHNVISIBLEOBJECTS MODIFY OBJECT_TYPE NOT NULL; + +-- +-- VALID_COUNTRIES +-- +ALTER TABLE VALID_COUNTRIES DROP CONSTRAINT SYS_C00205071; +ALTER TABLE VALID_COUNTRIES MODIFY CODE NOT NULL; + +-- +-- VALID_COUNTRIES +-- +ALTER TABLE VALID_COUNTRIES DROP CONSTRAINT SYS_C00205072; +ALTER TABLE VALID_COUNTRIES MODIFY SHORT_NAME NOT NULL; + +-- +-- VALID_COUNTRIES_TL +-- +ALTER TABLE VALID_COUNTRIES_TL DROP CONSTRAINT SYS_C00205074; +ALTER TABLE VALID_COUNTRIES_TL MODIFY LANG NOT NULL; + +-- +-- VALID_COUNTRIES_TL +-- +ALTER TABLE VALID_COUNTRIES_TL DROP CONSTRAINT SYS_C00205075; +ALTER TABLE VALID_COUNTRIES_TL MODIFY CODE NOT NULL; + +-- +-- VALID_COUNTRIES_TL +-- +ALTER TABLE VALID_COUNTRIES_TL DROP CONSTRAINT SYS_C00205076; +ALTER TABLE VALID_COUNTRIES_TL MODIFY SHORT_NAME_TL NOT NULL; + +-- +-- TIME_SERIES +-- +ALTER TABLE TIME_SERIES DROP CONSTRAINT TIME_SERIES_ETIME_NN; +ALTER TABLE TIME_SERIES MODIFY ENTRY_TIME NOT NULL; + +-- +-- TIME_SERIES +-- +ALTER TABLE TIME_SERIES DROP CONSTRAINT TIME_SERIES_O_ID_NN; +ALTER TABLE TIME_SERIES MODIFY O_ID NOT NULL; + +-- +-- WEB_CONTACT +-- +ALTER TABLE WEB_CONTACT DROP CONSTRAINT WEB_CONTACT_CREATED_NN; +ALTER TABLE WEB_CONTACT MODIFY CREATED NOT NULL; + +-- +-- WEB_CONTACT +-- +ALTER TABLE WEB_CONTACT DROP CONSTRAINT WEB_CONTACT_IGNORE_NN; +ALTER TABLE WEB_CONTACT MODIFY IGNORE_FLAG NOT NULL; + +-- +-- WEB_CONTACT +-- +ALTER TABLE WEB_CONTACT DROP CONSTRAINT WEB_CONTACT_LOGIN_NN; +ALTER TABLE WEB_CONTACT MODIFY LOGIN NOT NULL; + +-- +-- WEB_CONTACT +-- +ALTER TABLE WEB_CONTACT DROP CONSTRAINT WEB_CONTACT_LOGIN_UC_NN; +ALTER TABLE WEB_CONTACT MODIFY LOGIN_UC NOT NULL; + +-- +-- WEB_CONTACT +-- +ALTER TABLE WEB_CONTACT DROP CONSTRAINT WEB_CONTACT_MODIFIED_NN; +ALTER TABLE WEB_CONTACT MODIFY MODIFIED NOT NULL; + +-- +-- WEB_CONTACT +-- +ALTER TABLE WEB_CONTACT DROP CONSTRAINT WEB_CONTACT_ORG_NN; +ALTER TABLE WEB_CONTACT MODIFY ORG_ID NOT NULL; + +-- +-- WEB_CONTACT +-- +ALTER TABLE WEB_CONTACT DROP CONSTRAINT WEB_CONTACT_PASSWORD_NN; +ALTER TABLE WEB_CONTACT MODIFY PASSWORD NOT NULL; + +-- +-- WEB_CUSTOMER +-- +ALTER TABLE WEB_CUSTOMER DROP CONSTRAINT WEB_CUSTOMER_CREATED_NN; +ALTER TABLE WEB_CUSTOMER MODIFY CREATED NOT NULL; + +-- +-- WEB_CUSTOMER +-- +ALTER TABLE WEB_CUSTOMER DROP CONSTRAINT WEB_CUSTOMER_ID_NN; +ALTER TABLE WEB_CUSTOMER MODIFY ID NOT NULL; + +-- +-- WEB_CUSTOMER +-- +ALTER TABLE WEB_CUSTOMER DROP CONSTRAINT WEB_CUSTOMER_MODIFIED_NN; +ALTER TABLE WEB_CUSTOMER MODIFY MODIFIED NOT NULL; + +-- +-- WEB_CUSTOMER +-- +ALTER TABLE WEB_CUSTOMER DROP CONSTRAINT WEB_CUSTOMER_NAME_NN; +ALTER TABLE WEB_CUSTOMER MODIFY NAME NOT NULL; + +-- +-- WEB_CUSTOMER +-- +ALTER TABLE WEB_CUSTOMER DROP CONSTRAINT WEB_CUSTOMER_TYPE_NN; +ALTER TABLE WEB_CUSTOMER MODIFY CUSTOMER_TYPE NOT NULL; + +-- +-- WEB_CUSTOMER_NOTIFICATION +-- +ALTER TABLE WEB_CUSTOMER_NOTIFICATION DROP CONSTRAINT WEB_CUST_NOT_CREAT_N= N; +ALTER TABLE WEB_CUSTOMER_NOTIFICATION MODIFY CREATION_DATE NOT NULL; + +-- +-- WEB_CUSTOMER_NOTIFICATION +-- +ALTER TABLE WEB_CUSTOMER_NOTIFICATION DROP CONSTRAINT WEB_CUST_NOT_EA_NN; +ALTER TABLE WEB_CUSTOMER_NOTIFICATION MODIFY CONTACT_EMAIL_ADDRESS NOT NUL= L; + +-- +-- WEB_CUSTOMER_NOTIFICATION +-- +ALTER TABLE WEB_CUSTOMER_NOTIFICATION DROP CONSTRAINT WEB_CUST_NOT_ID_NN; +ALTER TABLE WEB_CUSTOMER_NOTIFICATION MODIFY ID NOT NULL; + +-- +-- WEB_CUSTOMER_NOTIFICATION +-- +ALTER TABLE WEB_CUSTOMER_NOTIFICATION DROP CONSTRAINT WEB_CUST_NOT_OID_NN; +ALTER TABLE WEB_CUSTOMER_NOTIFICATION MODIFY ORG_ID NOT NULL; + +-- +-- WEB_USER_CONTACT_PERMISSION +-- +ALTER TABLE WEB_USER_CONTACT_PERMISSION DROP CONSTRAINT WUCP_CREATED_NN; +ALTER TABLE WEB_USER_CONTACT_PERMISSION MODIFY CREATED NOT NULL; + +-- +-- WEB_USER_CONTACT_PERMISSION +-- +ALTER TABLE WEB_USER_CONTACT_PERMISSION DROP CONSTRAINT WUCP_MODIFIED_NN; +ALTER TABLE WEB_USER_CONTACT_PERMISSION MODIFY MODIFIED NOT NULL; + +-- +-- WEB_USER_CONTACT_PERMISSION +-- +ALTER TABLE WEB_USER_CONTACT_PERMISSION DROP CONSTRAINT WUCP_WUID_NN; +ALTER TABLE WEB_USER_CONTACT_PERMISSION MODIFY WEB_USER_ID NOT NULL; + +-- +-- WEB_USER_PERSONAL_INFO +-- +ALTER TABLE WEB_USER_PERSONAL_INFO DROP CONSTRAINT WUPI_CREATED_NN; +ALTER TABLE WEB_USER_PERSONAL_INFO MODIFY CREATED NOT NULL; + +-- +-- WEB_USER_PERSONAL_INFO +-- +ALTER TABLE WEB_USER_PERSONAL_INFO DROP CONSTRAINT WUPI_FN_NN; +ALTER TABLE WEB_USER_PERSONAL_INFO MODIFY FIRST_NAMES NOT NULL; + +-- +-- WEB_USER_PERSONAL_INFO +-- +ALTER TABLE WEB_USER_PERSONAL_INFO DROP CONSTRAINT WUPI_LN_NN; +ALTER TABLE WEB_USER_PERSONAL_INFO MODIFY LAST_NAME NOT NULL; + +-- +-- WEB_USER_PERSONAL_INFO +-- +ALTER TABLE WEB_USER_PERSONAL_INFO DROP CONSTRAINT WUPI_MODIFIED_NN; +ALTER TABLE WEB_USER_PERSONAL_INFO MODIFY MODIFIED NOT NULL; + +-- +-- WEB_USER_PERSONAL_INFO +-- +ALTER TABLE WEB_USER_PERSONAL_INFO DROP CONSTRAINT WUPI_PREFIX_NN; +ALTER TABLE WEB_USER_PERSONAL_INFO MODIFY PREFIX NOT NULL; + +-- +-- WEB_USER_PERSONAL_INFO +-- +ALTER TABLE WEB_USER_PERSONAL_INFO DROP CONSTRAINT WUPI_WUID_NN; +ALTER TABLE WEB_USER_PERSONAL_INFO MODIFY WEB_USER_ID NOT NULL; + +-- +-- WEB_USER_PREFIX +-- +ALTER TABLE WEB_USER_PREFIX DROP CONSTRAINT WUP_TEXT_NN; +ALTER TABLE WEB_USER_PREFIX MODIFY TEXT NOT NULL; + +-- +-- WEB_USER_SITE_INFO +-- +ALTER TABLE WEB_USER_SITE_INFO DROP CONSTRAINT WUSI_ADDR1_NN; +ALTER TABLE WEB_USER_SITE_INFO MODIFY ADDRESS1 NOT NULL; + +-- +-- WEB_USER_SITE_INFO +-- +ALTER TABLE WEB_USER_SITE_INFO DROP CONSTRAINT WUSI_CITY_NN; +ALTER TABLE WEB_USER_SITE_INFO MODIFY CITY NOT NULL; + +-- +-- WEB_USER_SITE_INFO +-- +ALTER TABLE WEB_USER_SITE_INFO DROP CONSTRAINT WUSI_COUNTRY_NN; +ALTER TABLE WEB_USER_SITE_INFO MODIFY COUNTRY NOT NULL; + +-- +-- WEB_USER_SITE_INFO +-- +ALTER TABLE WEB_USER_SITE_INFO DROP CONSTRAINT WUSI_ID_NN; +ALTER TABLE WEB_USER_SITE_INFO MODIFY ID NOT NULL; + +-- +-- WEB_USER_SITE_TYPE +-- +ALTER TABLE WEB_USER_SITE_TYPE DROP CONSTRAINT WUST_DESC_NN; +ALTER TABLE WEB_USER_SITE_TYPE MODIFY DESCRIPTION NOT NULL; + +-- +-- WEB_USER_SITE_TYPE +-- +ALTER TABLE WEB_USER_SITE_TYPE DROP CONSTRAINT WUST_TYPE_NN; +ALTER TABLE WEB_USER_SITE_TYPE MODIFY TYPE NOT NULL; --===============0853878741276746063==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:28 2015 Content-Type: multipart/mixed; boundary="===============5967343279834205357==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: branding/css Date: Wed, 10 Jun 2009 20:44:51 +0000 Message-ID: <20090610204451.B08A11201F2@lists.fedorahosted.org> --===============5967343279834205357== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable branding/css/rhn-basic.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a0ad7a981c502d909fa9bab6dfa7970c8519e8d0 Author: Brad Buckingham Date: Wed Jun 10 16:44:26 2009 -0400 505101 - update css so that links are underlined when hovering = There was a recent change to the css because the documentation used ... but not as links; however, when the mouse would hover over them, they would be underlined as if they were links. Unfortunately, the fix for that caused the behavior of hovering over real links (e.g. ...) to behave inconsistently. The behavior = being that sometimes hovering would underline the links and other times, it w= ould not. (This was mostly observed with the navigation links). This update should address that. diff --git a/branding/css/rhn-basic.css b/branding/css/rhn-basic.css index 77ff914..02b42b1 100644 --- a/branding/css/rhn-basic.css +++ b/branding/css/rhn-basic.css @@ -116,7 +116,7 @@ a:link, a:visited { color: #06c; } = -a:link:hover { +a:link:hover, a:visited:hover, a:active:hover { text-decoration: underline !important; } = --===============5967343279834205357==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:28 2015 Content-Type: multipart/mixed; boundary="===============3063457122580261156==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - branding/css Date: Wed, 10 Jun 2009 20:48:21 +0000 Message-ID: <20090610204821.E28C31201F2@lists.fedorahosted.org> --===============3063457122580261156== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable branding/css/rhn-basic.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 011a3b817d9d9895c0718c510137b42a8b8a024c Author: Brad Buckingham Date: Wed Jun 10 16:44:26 2009 -0400 505101 - update css so that links are underlined when hovering = There was a recent change to the css because the documentation used ... but not as links; however, when the mouse would hover over them, they would be underlined as if they were links. Unfortunately, the fix for that caused the behavior of hovering over real links (e.g. ...) to behave inconsistently. The behavior = being that sometimes hovering would underline the links and other times, it w= ould not. (This was mostly observed with the navigation links). This update should address that. diff --git a/branding/css/rhn-basic.css b/branding/css/rhn-basic.css index 77ff914..02b42b1 100644 --- a/branding/css/rhn-basic.css +++ b/branding/css/rhn-basic.css @@ -116,7 +116,7 @@ a:link, a:visited { color: #06c; } = -a:link:hover { +a:link:hover, a:visited:hover, a:active:hover { text-decoration: underline !important; } = --===============3063457122580261156==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:28 2015 Content-Type: multipart/mixed; boundary="===============2841983991861189701==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Wed, 10 Jun 2009 22:24:09 +0000 Message-ID: <20090610222409.0A6181201F2@lists.fedorahosted.org> --===============2841983991861189701== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java = | 5 - java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java = | 5 - java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelper.java = | 6 - java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreate= Command.java | 31 +++++++--- 4 files changed, 31 insertions(+), 16 deletions(-) New commits: commit bb2892d504ea206c091033a0f321e808b695a50c Author: Justin Sherrill Date: Wed Jun 10 18:23:20 2009 -0400 505188 - fixing issues causing rhel2.1 provisioning to not work diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory= .java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java index 2bce908..f0fe369 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java @@ -20,6 +20,7 @@ import com.redhat.rhn.domain.kickstart.crypto.CryptoKey; import com.redhat.rhn.domain.kickstart.crypto.CryptoKeyType; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.manager.kickstart.KickstartFormatter; +import com.redhat.rhn.manager.kickstart.KickstartUrlHelper; import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper; = import org.apache.commons.lang.StringUtils; @@ -355,8 +356,8 @@ public class KickstartFactory extends HibernateFactory { } else { log.debug("saveKickstartData wizard. use object"); - KickstartFormatter formatter =3D new KickstartFormatter("@@htt= p_server@@", = - ksdataIn, ksession); + KickstartFormatter formatter =3D new KickstartFormatter( + KickstartUrlHelper.COBBLER_SERVER_VARIABLE, ksdataIn, = ksession); fileData =3D formatter.getFileData(); } // Escape the dollar signs diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDa= taTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartD= ataTest.java index cc92ff7..a75cbc3 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 @@ -175,7 +175,7 @@ public class KickstartDataTest extends BaseTestCaseWith= User { KickstartData k =3D createKickstartWithOptions(user.getOrg()); KickstartWizardHelper wcmd =3D new KickstartWizardHelper(user); wcmd.createCommand("url", = - "--url http://@@http_server@@/$" + = + "--url http://" + KickstartUrlHelper.COBBLER_SERVER_VARIAB= LE + "/$" + KickstartUrlHelper.COBBLER_MEDIA_VARIABLE, k); = KickstartFactory.saveKickstartData(k); @@ -553,7 +553,8 @@ public class KickstartDataTest extends BaseTestCaseWith= User { KickstartCommand option =3D new KickstartCommand(); = option.setCommandName(optionName); option.setArguments - ("--url http://@@http_server@@/kickstart/dist/ks-rhel-i386-as-3/"); + ("--url http://" + KickstartUrlHelper.COBBLER_SERVER_VARIABLE + + "/kickstart/dist/ks-rhel-i386-as-3/"); option.setKickstartData(k); option.setCreated(created); option.setModified(modified); diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHel= per.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelpe= r.java index fb9d92b..6f07f91 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelper.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelper.java @@ -44,7 +44,7 @@ public class KickstartUrlHelper { public static final String COBBLER_URL_BASE_PATH =3D "/cblr/svc/op/ks/= profile/"; = public static final String KS_DIST =3D "/ks/dist"; public static final String KS_CFG =3D "/ks/cfg"; - public static final String COBBLER_SERVER_VARIABLE =3D "@@http_server@= @"; + public static final String COBBLER_SERVER_VARIABLE =3D "$http_server"; public static final String COBBLER_MEDIA_VARIABLE =3D "media_path"; private KickstartData ksData; private String host; @@ -225,11 +225,11 @@ public class KickstartUrlHelper { /** * Get the cobbler style --url: * = - * http://@@http_server@@/$media_url + * http://$http_server/$media_url * = * To be filled out by cobbler. not spacewalk. * = - * @return String url , cobbler style: http://@@http_server@@/$media_u= rl = + * @return String url , cobbler style: http://$http_server/$media_url */ public String getCobblerMediaUrl() { StringBuilder url =3D new StringBuilder(); diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= SystemCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/c= obbler/CobblerSystemCreateCommand.java index c87cdc2..72aefb0 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemC= reateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemC= reateCommand.java @@ -124,15 +124,30 @@ public class CobblerSystemCreateCommand extends Cobbl= erCommand { } = = protected String lookupExisting() { - Map sysmap =3D getSystemMapByMac(); - if (sysmap !=3D null) { - log.debug("getSystemHandleByMAC.found match."); - String sysname =3D (String) sysmap.get("name"); + String sysname =3D null; + if (server.getCobblerId() !=3D null) { + SystemRecord rec; + rec =3D SystemRecord.lookupById(CobblerXMLRPCHelper.getConnect= ion(user), + server.getCobblerId()); + if (rec !=3D null) { + sysname =3D rec.getName(); + } + } + //lookup by ID failed, so lets try by mac + if (sysname =3D=3D null) { + Map sysmap =3D getSystemMapByMac(); + if (sysmap !=3D null) { + log.debug("getSystemHandleByMAC.found match."); + sysname =3D (String) sysmap.get("name"); + } + } + if (sysname !=3D null) { String handle =3D (String) invokeXMLRPC("get_system_handle", sysname, xmlRpcToken); log.debug("getSystemHandleByMAC.returning handle: " + handle); return handle; } + return null; } = @@ -211,13 +226,11 @@ public class CobblerSystemCreateCommand extends Cobbl= erCommand { xmlRpcToken); } = - if (this.server.getNetworkInterfaces() =3D=3D null || - this.server.getNetworkInterfaces().isEmpty()) { - return new ValidatorError("kickstart.no.network.error"); + if (this.server.getNetworkInterfaces() !=3D null && + !this.server.getNetworkInterfaces().isEmpty()) { + processNetworkInterfaces(handle, xmlRpcToken, server); } = - processNetworkInterfaces(handle, xmlRpcToken, server); - = Object[] args =3D new String[]{handle, "profile", = profileName, xmlRpcToken}; invokeXMLRPC("modify_system", Arrays.asList(args)); --===============2841983991861189701==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:28 2015 Content-Type: multipart/mixed; boundary="===============8050552967278264010==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Wed, 10 Jun 2009 22:24:27 +0000 Message-ID: <20090610222427.19A4E1201F2@lists.fedorahosted.org> --===============8050552967278264010== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java = | 5 - java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java = | 5 - java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelper.java = | 6 - java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreate= Command.java | 31 +++++++--- 4 files changed, 31 insertions(+), 16 deletions(-) New commits: commit d47ae3fc687a1d77bbfe42abbe249c8c1355650a Author: Justin Sherrill Date: Wed Jun 10 18:23:20 2009 -0400 505188 - fixing issues causing rhel2.1 provisioning to not work diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory= .java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java index 2bce908..f0fe369 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java @@ -20,6 +20,7 @@ import com.redhat.rhn.domain.kickstart.crypto.CryptoKey; import com.redhat.rhn.domain.kickstart.crypto.CryptoKeyType; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.manager.kickstart.KickstartFormatter; +import com.redhat.rhn.manager.kickstart.KickstartUrlHelper; import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper; = import org.apache.commons.lang.StringUtils; @@ -355,8 +356,8 @@ public class KickstartFactory extends HibernateFactory { } else { log.debug("saveKickstartData wizard. use object"); - KickstartFormatter formatter =3D new KickstartFormatter("@@htt= p_server@@", = - ksdataIn, ksession); + KickstartFormatter formatter =3D new KickstartFormatter( + KickstartUrlHelper.COBBLER_SERVER_VARIABLE, ksdataIn, = ksession); fileData =3D formatter.getFileData(); } // Escape the dollar signs diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDa= taTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartD= ataTest.java index cc92ff7..a75cbc3 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 @@ -175,7 +175,7 @@ public class KickstartDataTest extends BaseTestCaseWith= User { KickstartData k =3D createKickstartWithOptions(user.getOrg()); KickstartWizardHelper wcmd =3D new KickstartWizardHelper(user); wcmd.createCommand("url", = - "--url http://@@http_server@@/$" + = + "--url http://" + KickstartUrlHelper.COBBLER_SERVER_VARIAB= LE + "/$" + KickstartUrlHelper.COBBLER_MEDIA_VARIABLE, k); = KickstartFactory.saveKickstartData(k); @@ -553,7 +553,8 @@ public class KickstartDataTest extends BaseTestCaseWith= User { KickstartCommand option =3D new KickstartCommand(); = option.setCommandName(optionName); option.setArguments - ("--url http://@@http_server@@/kickstart/dist/ks-rhel-i386-as-3/"); + ("--url http://" + KickstartUrlHelper.COBBLER_SERVER_VARIABLE + + "/kickstart/dist/ks-rhel-i386-as-3/"); option.setKickstartData(k); option.setCreated(created); option.setModified(modified); diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHel= per.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelpe= r.java index fb9d92b..6f07f91 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelper.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelper.java @@ -44,7 +44,7 @@ public class KickstartUrlHelper { public static final String COBBLER_URL_BASE_PATH =3D "/cblr/svc/op/ks/= profile/"; = public static final String KS_DIST =3D "/ks/dist"; public static final String KS_CFG =3D "/ks/cfg"; - public static final String COBBLER_SERVER_VARIABLE =3D "@@http_server@= @"; + public static final String COBBLER_SERVER_VARIABLE =3D "$http_server"; public static final String COBBLER_MEDIA_VARIABLE =3D "media_path"; private KickstartData ksData; private String host; @@ -225,11 +225,11 @@ public class KickstartUrlHelper { /** * Get the cobbler style --url: * = - * http://@@http_server@@/$media_url + * http://$http_server/$media_url * = * To be filled out by cobbler. not spacewalk. * = - * @return String url , cobbler style: http://@@http_server@@/$media_u= rl = + * @return String url , cobbler style: http://$http_server/$media_url */ public String getCobblerMediaUrl() { StringBuilder url =3D new StringBuilder(); diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= SystemCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/c= obbler/CobblerSystemCreateCommand.java index c87cdc2..72aefb0 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemC= reateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemC= reateCommand.java @@ -124,15 +124,30 @@ public class CobblerSystemCreateCommand extends Cobbl= erCommand { } = = protected String lookupExisting() { - Map sysmap =3D getSystemMapByMac(); - if (sysmap !=3D null) { - log.debug("getSystemHandleByMAC.found match."); - String sysname =3D (String) sysmap.get("name"); + String sysname =3D null; + if (server.getCobblerId() !=3D null) { + SystemRecord rec; + rec =3D SystemRecord.lookupById(CobblerXMLRPCHelper.getConnect= ion(user), + server.getCobblerId()); + if (rec !=3D null) { + sysname =3D rec.getName(); + } + } + //lookup by ID failed, so lets try by mac + if (sysname =3D=3D null) { + Map sysmap =3D getSystemMapByMac(); + if (sysmap !=3D null) { + log.debug("getSystemHandleByMAC.found match."); + sysname =3D (String) sysmap.get("name"); + } + } + if (sysname !=3D null) { String handle =3D (String) invokeXMLRPC("get_system_handle", sysname, xmlRpcToken); log.debug("getSystemHandleByMAC.returning handle: " + handle); return handle; } + return null; } = @@ -211,13 +226,11 @@ public class CobblerSystemCreateCommand extends Cobbl= erCommand { xmlRpcToken); } = - if (this.server.getNetworkInterfaces() =3D=3D null || - this.server.getNetworkInterfaces().isEmpty()) { - return new ValidatorError("kickstart.no.network.error"); + if (this.server.getNetworkInterfaces() !=3D null && + !this.server.getNetworkInterfaces().isEmpty()) { + processNetworkInterfaces(handle, xmlRpcToken, server); } = - processNetworkInterfaces(handle, xmlRpcToken, server); - = Object[] args =3D new String[]{handle, "profile", = profileName, xmlRpcToken}; invokeXMLRPC("modify_system", Arrays.asList(args)); --===============8050552967278264010==-- From partha at fedoraproject.org Thu Aug 20 11:57:28 2015 Content-Type: multipart/mixed; boundary="===============5181402677275090370==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: spacewalk/setup Date: Thu, 11 Jun 2009 01:20:14 +0000 Message-ID: <20090611012014.D5C86120289@lists.fedorahosted.org> --===============5181402677275090370== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/setup/bin/cobbler-setup | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) New commits: commit 56e9328dc66c103f5322e1474cdaab157b26791b Author: Partha Aji Date: Wed Jun 10 21:22:04 2009 -0400 499889 - Modified cobbler-setup to turn on tftp and xinetd diff --git a/spacewalk/setup/bin/cobbler-setup b/spacewalk/setup/bin/cobble= r-setup index 9933f0b..8dd084e 100755 --- a/spacewalk/setup/bin/cobbler-setup +++ b/spacewalk/setup/bin/cobbler-setup @@ -34,6 +34,18 @@ def copy(src, dest): shutil.copy(join(dest,basename(src)), join(dest,basename(src))= + ".old") shutil.copy(src, dest) = +def ask_yes_no(question, default_val =3D None): + if default_val and default_val.lower() =3D=3D 'y': + default_val =3D 'y' + else: + default_val =3D 'n' + + ans =3D raw_input(question + " (y/n, default =3D '%s')?" % default_val) + if not ans: + return default_val =3D=3D 'y' + + return ans.lower() =3D=3D 'y' + def gen_template(template, answers, output): t =3D Template(file=3Dtemplate, searchList=3Danswers) open(output,"w").write(t.respond()) @@ -55,7 +67,12 @@ def main(): if not m.search(conf_lines): system ("echo 'cobbler.host =3D %s' >> %s " % (answers['server'], common.rhnConfig._CONFIG_FILE)) + q =3D "Cobbler requires tftp and xinetd services be turned on for PXE = provisioning functionality. Enable these services" = + if ask_yes_no(q, 'y'): + system("chkconfig tftp on") + system('chkconfig xinetd on') system("cobbler sync") + = if __name__=3D=3D"__main__": main() --===============5181402677275090370==-- From partha at fedoraproject.org Thu Aug 20 11:57:28 2015 Content-Type: multipart/mixed; boundary="===============0210760656313540526==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - spacewalk/setup Date: Thu, 11 Jun 2009 01:21:03 +0000 Message-ID: <20090611012103.E1EC1120289@lists.fedorahosted.org> --===============0210760656313540526== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/setup/bin/cobbler-setup | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) New commits: commit 0a70a8bc634fd6e772d5152495f000ab1b197575 Author: Partha Aji Date: Wed Jun 10 21:22:04 2009 -0400 499889 - Modified cobbler-setup to turn on tftp and xinetd diff --git a/spacewalk/setup/bin/cobbler-setup b/spacewalk/setup/bin/cobble= r-setup index 9933f0b..8dd084e 100755 --- a/spacewalk/setup/bin/cobbler-setup +++ b/spacewalk/setup/bin/cobbler-setup @@ -34,6 +34,18 @@ def copy(src, dest): shutil.copy(join(dest,basename(src)), join(dest,basename(src))= + ".old") shutil.copy(src, dest) = +def ask_yes_no(question, default_val =3D None): + if default_val and default_val.lower() =3D=3D 'y': + default_val =3D 'y' + else: + default_val =3D 'n' + + ans =3D raw_input(question + " (y/n, default =3D '%s')?" % default_val) + if not ans: + return default_val =3D=3D 'y' + + return ans.lower() =3D=3D 'y' + def gen_template(template, answers, output): t =3D Template(file=3Dtemplate, searchList=3Danswers) open(output,"w").write(t.respond()) @@ -55,7 +67,12 @@ def main(): if not m.search(conf_lines): system ("echo 'cobbler.host =3D %s' >> %s " % (answers['server'], common.rhnConfig._CONFIG_FILE)) + q =3D "Cobbler requires tftp and xinetd services be turned on for PXE = provisioning functionality. Enable these services" = + if ask_yes_no(q, 'y'): + system("chkconfig tftp on") + system('chkconfig xinetd on') system("cobbler sync") + = if __name__=3D=3D"__main__": main() --===============0210760656313540526==-- From partha at fedoraproject.org Thu Aug 20 11:57:28 2015 Content-Type: multipart/mixed; boundary="===============1554388652502115235==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Thu, 11 Jun 2009 01:51:52 +0000 Message-ID: <20090611015152.6601B120289@lists.fedorahosted.org> --===============1554388652502115235== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java | = 2 - java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelper.java | = 16 +++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) New commits: commit 36e3f54d789506996df0a91b1ab8c363f90ca722 Author: Partha Aji Date: Wed Jun 10 21:54:09 2009 -0400 492206 - Fixed cobbler error url to point to KS file download page whic= h has better info on cheetah stacktrace diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManage= r.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.ja= va index 31f34be..042b697 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java @@ -79,7 +79,7 @@ public class KickstartManager extends BaseManager { } catch (DownloadException de) { ValidatorException.raiseException("kickstart.jsp.error.templat= e_generation", - KickstartUrlHelper.getCobblerProfi= leUrl(ksdata)); + KickstartUrlHelper.getFileDowloadP= ageUrl(ksdata)); } } = } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHel= per.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelpe= r.java index 6f07f91..653584e 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelper.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelper.java @@ -46,6 +46,10 @@ public class KickstartUrlHelper { public static final String KS_CFG =3D "/ks/cfg"; public static final String COBBLER_SERVER_VARIABLE =3D "$http_server"; public static final String COBBLER_MEDIA_VARIABLE =3D "media_path"; + private static final String KS_RAW_PAGE_URL =3D + "/rhn/kickstart/KickstartFileDownloadAdvanced.do?k= sid=3D%s"; = + private static final String KS_WIZARD_PAGE_URL =3D + "/rhn/kickstart/KickstartFileDownload.do?ksid=3D%s"; = private KickstartData ksData; private String host; private String protocol; @@ -329,5 +333,15 @@ public class KickstartUrlHelper { prof.getName(); } = - = + /** + * Returns the file download page URL + * @param data the kickstart data + * @return the url + */ + public static String getFileDowloadPageUrl(KickstartData data) { + if (data.isRawData()) { + return String.format(KS_RAW_PAGE_URL, data.getId().toString()); + } + return String.format(KS_WIZARD_PAGE_URL, data.getId().toString()); + } } --===============1554388652502115235==-- From partha at fedoraproject.org Thu Aug 20 11:57:28 2015 Content-Type: multipart/mixed; boundary="===============8755990297010989386==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Thu, 11 Jun 2009 01:52:21 +0000 Message-ID: <20090611015221.5D43D120289@lists.fedorahosted.org> --===============8755990297010989386== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java | = 2 - java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelper.java | = 16 +++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) New commits: commit 17242d7cdcd1f33a963dcd3b2931a0590e3ec66b Author: Partha Aji Date: Wed Jun 10 21:54:09 2009 -0400 492206 - Fixed cobbler error url to point to KS file download page whic= h has better info on cheetah stacktrace diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManage= r.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.ja= va index 31f34be..042b697 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java @@ -79,7 +79,7 @@ public class KickstartManager extends BaseManager { } catch (DownloadException de) { ValidatorException.raiseException("kickstart.jsp.error.templat= e_generation", - KickstartUrlHelper.getCobblerProfi= leUrl(ksdata)); + KickstartUrlHelper.getFileDowloadP= ageUrl(ksdata)); } } = } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHel= per.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelpe= r.java index 6f07f91..653584e 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelper.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelper.java @@ -46,6 +46,10 @@ public class KickstartUrlHelper { public static final String KS_CFG =3D "/ks/cfg"; public static final String COBBLER_SERVER_VARIABLE =3D "$http_server"; public static final String COBBLER_MEDIA_VARIABLE =3D "media_path"; + private static final String KS_RAW_PAGE_URL =3D + "/rhn/kickstart/KickstartFileDownloadAdvanced.do?k= sid=3D%s"; = + private static final String KS_WIZARD_PAGE_URL =3D + "/rhn/kickstart/KickstartFileDownload.do?ksid=3D%s"; = private KickstartData ksData; private String host; private String protocol; @@ -329,5 +333,15 @@ public class KickstartUrlHelper { prof.getName(); } = - = + /** + * Returns the file download page URL + * @param data the kickstart data + * @return the url + */ + public static String getFileDowloadPageUrl(KickstartData data) { + if (data.isRawData()) { + return String.format(KS_RAW_PAGE_URL, data.getId().toString()); + } + return String.format(KS_WIZARD_PAGE_URL, data.getId().toString()); + } } --===============8755990297010989386==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:28 2015 Content-Type: multipart/mixed; boundary="===============7793737276457522579==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - rel-eng/packages selinux/oracle-instantclient-selinux selinux/oracle-rhnsat-selinux selinux/oracle-xe-selinux Date: Thu, 11 Jun 2009 09:38:27 +0000 Message-ID: <20090611093827.65F44120360@lists.fedorahosted.org> --===============7793737276457522579== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/oracle-instantclient-selinux | = 2 +- selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec | = 7 +++++-- selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | = 4 ++-- selinux/oracle-xe-selinux/oracle-xe-selinux.spec | = 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) New commits: commit 5f5f4df92dca1ab8c98f5582a7bd106fed5afd1c Author: Miroslav Such=C3=BD Date: Thu Jun 11 11:38:12 2009 +0200 Automatic commit of package [oracle-instantclient-selinux] minor releas= e [10.2-14]. diff --git a/rel-eng/packages/oracle-instantclient-selinux b/rel-eng/packag= es/oracle-instantclient-selinux index 1167587..626307f 100644 --- a/rel-eng/packages/oracle-instantclient-selinux +++ b/rel-eng/packages/oracle-instantclient-selinux @@ -1 +1 @@ -10.3-1 selinux/oracle-instantclient-selinux/ +10.2-14 selinux/oracle-instantclient-selinux/ diff --git a/selinux/oracle-instantclient-selinux/oracle-instantclient-seli= nux.spec b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinu= x.spec index 98b9235..78cc022 100644 --- a/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec +++ b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec @@ -1,7 +1,7 @@ = Name: oracle-instantclient-selinux Version: 10.2 -Release: 13%{?dist} +Release: 14%{?dist} Summary: SELinux support for Oracle Instant Client Group: System Environment/Base License: GPLv2+ @@ -102,6 +102,9 @@ fi %attr(0755,root,root) %{_sbindir}/oracle-instantclient-sqlplus-selinux-ena= ble = %changelog +* Thu Jun 11 2009 Miroslav Suchy 10.2-14 +- return version down to 10.2 + * Wed Jun 10 2009 Miroslav Suchy 10.3-1 - 498611 - run restorecon in %posttrans = commit 90e6702e199609bcd2c3c786c4a44fbd10cf9c95 Author: Miroslav Such=C3=BD Date: Thu Jun 11 11:27:37 2009 +0200 oracle packages should stay on version 10.2, reverting version bump diff --git a/selinux/oracle-instantclient-selinux/oracle-instantclient-seli= nux.spec b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinu= x.spec index 74c9a63..98b9235 100644 --- a/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec +++ b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec @@ -1,7 +1,7 @@ = Name: oracle-instantclient-selinux -Version: 10.3 -Release: 1%{?dist} +Version: 10.2 +Release: 13%{?dist} Summary: SELinux support for Oracle Instant Client Group: System Environment/Base License: GPLv2+ diff --git a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec b/sel= inux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec index 9d701e4..53277af 100644 --- a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec +++ b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec @@ -5,8 +5,8 @@ %define modulename oracle-rhnsat = Name: oracle-rhnsat-selinux -Version: 10.3 -Release: 1%{?dist} +Version: 10.2 +Release: 11%{?dist} Summary: SELinux policy module supporting Oracle Group: System Environment/Base License: GPLv2+ diff --git a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec b/selinux/ora= cle-xe-selinux/oracle-xe-selinux.spec index ecddeae..256fbde 100644 --- a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec +++ b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec @@ -5,8 +5,8 @@ %define modulename oracle-xe = Name: oracle-xe-selinux -Version: 10.3 -Release: 1%{?dist} +Version: 10.2 +Release: 10%{?dist} Summary: SELinux policy module supporting Oracle XE Group: System Environment/Base License: GPLv2+ --===============7793737276457522579==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:28 2015 Content-Type: multipart/mixed; boundary="===============5521232490711883906==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - rel-eng/packages selinux/oracle-rhnsat-selinux selinux/oracle-xe-selinux Date: Thu, 11 Jun 2009 09:40:19 +0000 Message-ID: <20090611094019.F215E120360@lists.fedorahosted.org> --===============5521232490711883906== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/oracle-rhnsat-selinux | 2 +- rel-eng/packages/oracle-xe-selinux | 2 +- selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | 5 ++++- selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 5 ++++- 4 files changed, 10 insertions(+), 4 deletions(-) New commits: commit b66d8fe3c842099d2c139e8f775859e438c812e1 Author: Miroslav Such=C3=BD Date: Thu Jun 11 11:40:11 2009 +0200 Automatic commit of package [oracle-xe-selinux] minor release [10.2-11]. diff --git a/rel-eng/packages/oracle-xe-selinux b/rel-eng/packages/oracle-x= e-selinux index 4477615..8603bd6 100644 --- a/rel-eng/packages/oracle-xe-selinux +++ b/rel-eng/packages/oracle-xe-selinux @@ -1 +1 @@ -10.3-1 selinux/oracle-xe-selinux/ +10.2-11 selinux/oracle-xe-selinux/ diff --git a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec b/selinux/ora= cle-xe-selinux/oracle-xe-selinux.spec index 256fbde..656b91a 100644 --- a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec +++ b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec @@ -6,7 +6,7 @@ = Name: oracle-xe-selinux Version: 10.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: SELinux policy module supporting Oracle XE Group: System Environment/Base License: GPLv2+ @@ -128,6 +128,9 @@ fi %attr(0755,root,root) %{_sbindir}/%{name}-enable = %changelog +* Thu Jun 11 2009 Miroslav Suchy 10.2-11 +- return version down to 10.2 + * Wed Jun 10 2009 Miroslav Suchy 10.3-1 - 498611 - run restorecon in %posttrans = commit ef99054ddbc1623b281315c130eeae85c3a5e6ff Author: Miroslav Such=C3=BD Date: Thu Jun 11 11:39:20 2009 +0200 Automatic commit of package [oracle-rhnsat-selinux] minor release [10.2= -12]. diff --git a/rel-eng/packages/oracle-rhnsat-selinux b/rel-eng/packages/orac= le-rhnsat-selinux index 2b38899..0aab211 100644 --- a/rel-eng/packages/oracle-rhnsat-selinux +++ b/rel-eng/packages/oracle-rhnsat-selinux @@ -1 +1 @@ -10.3-1 selinux/oracle-rhnsat-selinux/ +10.2-12 selinux/oracle-rhnsat-selinux/ diff --git a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec b/sel= inux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec index 53277af..516fe75 100644 --- a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec +++ b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec @@ -6,7 +6,7 @@ = Name: oracle-rhnsat-selinux Version: 10.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: SELinux policy module supporting Oracle Group: System Environment/Base License: GPLv2+ @@ -103,6 +103,9 @@ fi %attr(0755,root,root) %{_sbindir}/%{name}-enable = %changelog +* Thu Jun 11 2009 Miroslav Suchy 10.2-12 +- return version down to 10.2 + * Wed Jun 10 2009 Miroslav Suchy 10.3-1 - 498611 - run restorecon in %posttrans = --===============5521232490711883906==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:28 2015 Content-Type: multipart/mixed; boundary="===============6959903591735138043==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/oracle-xe-selinux-10.2-11' Date: Thu, 11 Jun 2009 09:40:28 +0000 Message-ID: <20090611094028.49041120377@lists.fedorahosted.org> --===============6959903591735138043== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'oracle-xe-selinux-10.2-11' created by Miroslav Such=C3=BD at 2009-06-11 09:40 +0000 Tagging package [oracle-xe-selinux] version [10.2-11] in directory [selinux= /oracle-xe-selinux/]. Changes since oracle-rhnsat-selinux-10.2-12: Miroslav Such=C3=BD (1): Automatic commit of package [oracle-xe-selinux] minor release [10.2-1= 1]. --- rel-eng/packages/oracle-xe-selinux | 2 +- selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) --- --===============6959903591735138043==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:28 2015 Content-Type: multipart/mixed; boundary="===============6868524619743244315==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/oracle-rhnsat-selinux-10.2-12' Date: Thu, 11 Jun 2009 09:40:27 +0000 Message-ID: <20090611094027.E0CEE120376@lists.fedorahosted.org> --===============6868524619743244315== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'oracle-rhnsat-selinux-10.2-12' created by Miroslav Such=C3=BD at 2009-06-11 09:39 +0000 Tagging package [oracle-rhnsat-selinux] version [10.2-12] in directory [sel= inux/oracle-rhnsat-selinux/]. Changes since oracle-instantclient-selinux-10.2-14: Miroslav Such=C3=BD (1): Automatic commit of package [oracle-rhnsat-selinux] minor release [10= .2-12]. --- rel-eng/packages/oracle-rhnsat-selinux | 2 +- selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) --- --===============6868524619743244315==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:29 2015 Content-Type: multipart/mixed; boundary="===============8221920257843237463==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/oracle-instantclient-selinux-10.2-14' Date: Thu, 11 Jun 2009 09:40:27 +0000 Message-ID: <20090611094027.5A96C120375@lists.fedorahosted.org> --===============8221920257843237463== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'oracle-instantclient-selinux-10.2-14' created by Miroslav Such=C3=BD <= msuchy(a)redhat.com> at 2009-06-11 09:38 +0000 Tagging package [oracle-instantclient-selinux] version [10.2-14] in directo= ry [selinux/oracle-instantclient-selinux/]. Changes since spacewalk-java-0.6.26-1-9: --- 0 files changed --- --===============8221920257843237463==-- From tlestach at fedoraproject.org Thu Aug 20 11:57:29 2015 Content-Type: multipart/mixed; boundary="===============8975049996382527759==" MIME-Version: 1.0 From: Tomas Lestach To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Thu, 11 Jun 2009 10:00:20 +0000 Message-ID: <20090611100021.04EA5120360@lists.fedorahosted.org> --===============8975049996382527759== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChangeData.java = | 13 ++++++++ java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java = | 15 +++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) New commits: commit ddb349526220dd58132b0108792eb0afbd8e853f Author: Tomas Lestach Date: Thu Jun 11 11:52:17 2009 +0200 498650 - html escape of monitoring data before displaying on the WEBUI = only a copy of monitoring data will be escaped we do not want to modify the real data, because they're used later on (f.e. for CSV generation) diff --git a/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChan= geData.java b/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateCha= ngeData.java index 9d78f8b..a5bddc0 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChangeData.= java +++ b/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChangeData.= java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.dto.monitoring; = import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.frontend.dto.BaseDto; = import java.sql.Timestamp; @@ -28,7 +29,17 @@ public class StateChangeData extends BaseDto { private String oId; = private String data; private Long entryTime; - = + + /** copies StateChangeData object and html escapes its data + * @param scd StateChangeData object to be copied + */ + public void createHtmlEscapedCopy(StateChangeData scd) { + oId =3D scd.oId; + entryTime =3D scd.entryTime; + data =3D StringUtil.htmlifyText(scd.data); + setSelected(scd.isSelected()); + } + /** * @return Returns the oId. */ diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.j= ava b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java index 5a6d03e..ff3a2a3 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java @@ -44,6 +44,7 @@ import com.redhat.rhn.common.util.ServletExportHandler; import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.frontend.dto.UserOverview; +import com.redhat.rhn.frontend.dto.monitoring.StateChangeData; import com.redhat.rhn.frontend.html.HtmlTag; import com.redhat.rhn.frontend.listview.AlphaBar; import com.redhat.rhn.frontend.listview.PaginationUtil; @@ -1268,7 +1269,19 @@ public class ListDisplayTag extends BodyTagSupport { columnCount =3D 0; Object next =3D iterator.next(); out.println(getTrElement(next)); - pageContext.setAttribute("current", next); + + /* escape monitoring data (can include html) + * just before displaying */ + if (next.getClass() =3D=3D StateChangeData.class) { + StateChangeData scd =3D new StateChangeData(); + /* we do not want to have real data escaped + * (further used f.e. for CSV generation) + * that's why we escape copy of data only */ + scd.createHtmlEscapedCopy((StateChangeData)next); + pageContext.setAttribute("current", scd); + } else { + pageContext.setAttribute("current", next); + } return EVAL_BODY_AGAIN; } = --===============8975049996382527759==-- From tlestach at fedoraproject.org Thu Aug 20 11:57:29 2015 Content-Type: multipart/mixed; boundary="===============8842686662228591530==" MIME-Version: 1.0 From: Tomas Lestach To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Thu, 11 Jun 2009 10:03:10 +0000 Message-ID: <20090611100310.AB0F2120360@lists.fedorahosted.org> --===============8842686662228591530== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChangeData.java = | 13 ++++++++ java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java = | 15 +++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) New commits: commit b32a0317ff48e34429dcd7fcef7e884fc535c393 Author: Tomas Lestach Date: Thu Jun 11 11:52:17 2009 +0200 498650 - html escape of monitoring data before displaying on the WEBUI = only a copy of monitoring data will be escaped we do not want to modify the real data, because they're used later on (f.e. for CSV generation) diff --git a/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChan= geData.java b/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateCha= ngeData.java index 9d78f8b..a5bddc0 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChangeData.= java +++ b/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChangeData.= java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.dto.monitoring; = import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.frontend.dto.BaseDto; = import java.sql.Timestamp; @@ -28,7 +29,17 @@ public class StateChangeData extends BaseDto { private String oId; = private String data; private Long entryTime; - = + + /** copies StateChangeData object and html escapes its data + * @param scd StateChangeData object to be copied + */ + public void createHtmlEscapedCopy(StateChangeData scd) { + oId =3D scd.oId; + entryTime =3D scd.entryTime; + data =3D StringUtil.htmlifyText(scd.data); + setSelected(scd.isSelected()); + } + /** * @return Returns the oId. */ diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.j= ava b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java index 5a6d03e..ff3a2a3 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java @@ -44,6 +44,7 @@ import com.redhat.rhn.common.util.ServletExportHandler; import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.frontend.dto.UserOverview; +import com.redhat.rhn.frontend.dto.monitoring.StateChangeData; import com.redhat.rhn.frontend.html.HtmlTag; import com.redhat.rhn.frontend.listview.AlphaBar; import com.redhat.rhn.frontend.listview.PaginationUtil; @@ -1268,7 +1269,19 @@ public class ListDisplayTag extends BodyTagSupport { columnCount =3D 0; Object next =3D iterator.next(); out.println(getTrElement(next)); - pageContext.setAttribute("current", next); + + /* escape monitoring data (can include html) + * just before displaying */ + if (next.getClass() =3D=3D StateChangeData.class) { + StateChangeData scd =3D new StateChangeData(); + /* we do not want to have real data escaped + * (further used f.e. for CSV generation) + * that's why we escape copy of data only */ + scd.createHtmlEscapedCopy((StateChangeData)next); + pageContext.setAttribute("current", scd); + } else { + pageContext.setAttribute("current", next); + } return EVAL_BODY_AGAIN; } = --===============8842686662228591530==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:29 2015 Content-Type: multipart/mixed; boundary="===============7814089316507142227==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - java/code Date: Thu, 11 Jun 2009 16:51:19 +0000 Message-ID: <20090611165119.BCFC61201D7@lists.fedorahosted.org> --===============7814089316507142227== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChangeData.java = | 26 +++++----- java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java = | 15 ----- java/code/webapp/WEB-INF/pages/systems/probes/details.jsp = | 2 = 3 files changed, 17 insertions(+), 26 deletions(-) New commits: commit f81e4ddeed27cf63b485974da3f586b76e840b77 Author: Devan Goodwin Date: Thu Jun 11 13:40:05 2009 -0300 498650 - HTML escape monitoring data before displaying. = Second attempt at fix originally went in ddb349526. = Committing on behalf of Tomas Lestach who wrote and tested this fix. diff --git a/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChan= geData.java b/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateCha= ngeData.java index 9d78f8b..c9637b6 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChangeData.= java +++ b/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChangeData.= java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.dto.monitoring; = import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.frontend.dto.BaseDto; = import java.sql.Timestamp; @@ -27,6 +28,7 @@ import java.util.StringTokenizer; public class StateChangeData extends BaseDto { private String oId; = private String data; + private String htmlifiedData; private Long entryTime; = /** @@ -53,6 +55,7 @@ public class StateChangeData extends BaseDto { */ public void setData(String dataIn) { this.data =3D dataIn; + this.htmlifiedData =3D StringUtil.htmlifyText(dataIn); } = /** @@ -93,6 +96,18 @@ public class StateChangeData extends BaseDto { String message =3D data.substring(data.indexOf(" ") + 1); return message; } + = + /** + * The htmlifiedMessage is the latter half of the "htmlified DATA" fie= ld: + * @return Returns the htmlified message. + */ + public String getHtmlifiedMessage() { + if (htmlifiedData =3D=3D null) { + return null; + } + String message =3D htmlifiedData.substring(htmlifiedData.index= Of(" ") + 1); + return message; + } = /** * The Message is the latter half of the "DATA" field: diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp b/ja= va/code/webapp/WEB-INF/pages/systems/probes/details.jsp index f5842d9..90e9572 100644 --- a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp @@ -122,7 +122,7 @@ ${current.state} - ${current.message} + ${current.htmlifiedMessage} commit b151261ea9ee8e3d34a3a5f78eb22b531ae6d122 Author: Devan Goodwin Date: Thu Jun 11 13:37:10 2009 -0300 Revert "498650 - html escape of monitoring data before displaying on th= e WEBUI" = This reverts commit ddb349526220dd58132b0108792eb0afbd8e853f. = Reverting this commit due to some monitoring dependencies creeping into an otherwise generic component. Cleaner solution to follow. diff --git a/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChan= geData.java b/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateCha= ngeData.java index a5bddc0..9d78f8b 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChangeData.= java +++ b/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChangeData.= java @@ -15,7 +15,6 @@ package com.redhat.rhn.frontend.dto.monitoring; = import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.frontend.dto.BaseDto; = import java.sql.Timestamp; @@ -29,17 +28,7 @@ public class StateChangeData extends BaseDto { private String oId; = private String data; private Long entryTime; - - /** copies StateChangeData object and html escapes its data - * @param scd StateChangeData object to be copied - */ - public void createHtmlEscapedCopy(StateChangeData scd) { - oId =3D scd.oId; - entryTime =3D scd.entryTime; - data =3D StringUtil.htmlifyText(scd.data); - setSelected(scd.isSelected()); - } - + = /** * @return Returns the oId. */ diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.j= ava b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java index ff3a2a3..5a6d03e 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java @@ -44,7 +44,6 @@ import com.redhat.rhn.common.util.ServletExportHandler; import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.frontend.dto.UserOverview; -import com.redhat.rhn.frontend.dto.monitoring.StateChangeData; import com.redhat.rhn.frontend.html.HtmlTag; import com.redhat.rhn.frontend.listview.AlphaBar; import com.redhat.rhn.frontend.listview.PaginationUtil; @@ -1269,19 +1268,7 @@ public class ListDisplayTag extends BodyTagSupport { columnCount =3D 0; Object next =3D iterator.next(); out.println(getTrElement(next)); - - /* escape monitoring data (can include html) - * just before displaying */ - if (next.getClass() =3D=3D StateChangeData.class) { - StateChangeData scd =3D new StateChangeData(); - /* we do not want to have real data escaped - * (further used f.e. for CSV generation) - * that's why we escape copy of data only */ - scd.createHtmlEscapedCopy((StateChangeData)next); - pageContext.setAttribute("current", scd); - } else { - pageContext.setAttribute("current", next); - } + pageContext.setAttribute("current", next); return EVAL_BODY_AGAIN; } = --===============7814089316507142227==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:29 2015 Content-Type: multipart/mixed; boundary="===============5713113881847462325==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 2 commits - java/code Date: Thu, 11 Jun 2009 16:53:02 +0000 Message-ID: <20090611165302.4C7FC1201D7@lists.fedorahosted.org> --===============5713113881847462325== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChangeData.java = | 26 +++++----- java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java = | 15 ----- java/code/webapp/WEB-INF/pages/systems/probes/details.jsp = | 2 = 3 files changed, 17 insertions(+), 26 deletions(-) New commits: commit d4834249ffb7e67568ec92cb6a96427cc2810d5c Author: Devan Goodwin Date: Thu Jun 11 13:40:05 2009 -0300 498650 - HTML escape monitoring data before displaying. = Second attempt at fix originally went in ddb349526. = Committing on behalf of Tomas Lestach who wrote and tested this fix. diff --git a/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChan= geData.java b/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateCha= ngeData.java index 9d78f8b..c9637b6 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChangeData.= java +++ b/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChangeData.= java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.dto.monitoring; = import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.frontend.dto.BaseDto; = import java.sql.Timestamp; @@ -27,6 +28,7 @@ import java.util.StringTokenizer; public class StateChangeData extends BaseDto { private String oId; = private String data; + private String htmlifiedData; private Long entryTime; = /** @@ -53,6 +55,7 @@ public class StateChangeData extends BaseDto { */ public void setData(String dataIn) { this.data =3D dataIn; + this.htmlifiedData =3D StringUtil.htmlifyText(dataIn); } = /** @@ -93,6 +96,18 @@ public class StateChangeData extends BaseDto { String message =3D data.substring(data.indexOf(" ") + 1); return message; } + = + /** + * The htmlifiedMessage is the latter half of the "htmlified DATA" fie= ld: + * @return Returns the htmlified message. + */ + public String getHtmlifiedMessage() { + if (htmlifiedData =3D=3D null) { + return null; + } + String message =3D htmlifiedData.substring(htmlifiedData.index= Of(" ") + 1); + return message; + } = /** * The Message is the latter half of the "DATA" field: diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp b/ja= va/code/webapp/WEB-INF/pages/systems/probes/details.jsp index f5842d9..90e9572 100644 --- a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp @@ -122,7 +122,7 @@ ${current.state} - ${current.message} + ${current.htmlifiedMessage} commit 62153950374bc06270c7b27daa1e03ca41cbfd16 Author: Devan Goodwin Date: Thu Jun 11 13:37:10 2009 -0300 Revert "498650 - html escape of monitoring data before displaying on th= e WEBUI" = This reverts commit ddb349526220dd58132b0108792eb0afbd8e853f. = Reverting this commit due to some monitoring dependencies creeping into an otherwise generic component. Cleaner solution to follow. diff --git a/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChan= geData.java b/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateCha= ngeData.java index a5bddc0..9d78f8b 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChangeData.= java +++ b/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChangeData.= java @@ -15,7 +15,6 @@ package com.redhat.rhn.frontend.dto.monitoring; = import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.frontend.dto.BaseDto; = import java.sql.Timestamp; @@ -29,17 +28,7 @@ public class StateChangeData extends BaseDto { private String oId; = private String data; private Long entryTime; - - /** copies StateChangeData object and html escapes its data - * @param scd StateChangeData object to be copied - */ - public void createHtmlEscapedCopy(StateChangeData scd) { - oId =3D scd.oId; - entryTime =3D scd.entryTime; - data =3D StringUtil.htmlifyText(scd.data); - setSelected(scd.isSelected()); - } - + = /** * @return Returns the oId. */ diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.j= ava b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java index ff3a2a3..5a6d03e 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java @@ -44,7 +44,6 @@ import com.redhat.rhn.common.util.ServletExportHandler; import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.frontend.dto.UserOverview; -import com.redhat.rhn.frontend.dto.monitoring.StateChangeData; import com.redhat.rhn.frontend.html.HtmlTag; import com.redhat.rhn.frontend.listview.AlphaBar; import com.redhat.rhn.frontend.listview.PaginationUtil; @@ -1269,19 +1268,7 @@ public class ListDisplayTag extends BodyTagSupport { columnCount =3D 0; Object next =3D iterator.next(); out.println(getTrElement(next)); - - /* escape monitoring data (can include html) - * just before displaying */ - if (next.getClass() =3D=3D StateChangeData.class) { - StateChangeData scd =3D new StateChangeData(); - /* we do not want to have real data escaped - * (further used f.e. for CSV generation) - * that's why we escape copy of data only */ - scd.createHtmlEscapedCopy((StateChangeData)next); - pageContext.setAttribute("current", scd); - } else { - pageContext.setAttribute("current", next); - } + pageContext.setAttribute("current", next); return EVAL_BODY_AGAIN; } = --===============5713113881847462325==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:29 2015 Content-Type: multipart/mixed; boundary="===============6338602288079119073==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 2 commits - backend/satellite_tools Date: Thu, 11 Jun 2009 17:03:33 +0000 Message-ID: <20090611170333.7312D1201D7@lists.fedorahosted.org> --===============6338602288079119073== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/satellite_tools/disk_dumper/iss.py | 5 ++++- backend/satellite_tools/disk_dumper/rhn-satellite-exporter | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 1c50c111d0d7d1f6d522904147fceb81371f38d8 Merge: 39db9c3... d483424... Author: Pradeep Kilambi Date: Thu Jun 11 13:03:25 2009 -0400 Merge branch 'VADER' of ssh://pkilambi(a)git.fedorahosted.org/git/space= walk into vader commit 39db9c3180883db7650672644e4a923eb8f8f352 Author: Pradeep Kilambi Date: Thu Jun 11 13:03:04 2009 -0400 Catch the systemExit and preserve the error code. Also fixing the trace= back issue when db is not accessible diff --git a/backend/satellite_tools/disk_dumper/iss.py b/backend/satellite= _tools/disk_dumper/iss.py index bef014b..89e267f 100644 --- a/backend/satellite_tools/disk_dumper/iss.py +++ b/backend/satellite_tools/disk_dumper/iss.py @@ -908,7 +908,10 @@ class ExporterMain: #This was taken straight from satsync.py. try: rhnSQL.initDB(CFG.DEFAULT_DB) - except (SQLError, SQLSchemaError, SQLConnectError), e: + except SQLConnectError: + print 'SQLERROR: There was an error connecting to the Database= .' + sys.exit(-1) + except (SQLError, SQLSchemaError), e: # An SQL error is fatal... crash and burn tbOut =3D cStringIO.StringIO() Traceback(mail=3D0, ostream=3DtbOut, with_locals=3D1) diff --git a/backend/satellite_tools/disk_dumper/rhn-satellite-exporter b/b= ackend/satellite_tools/disk_dumper/rhn-satellite-exporter index 6e58c82..713a209 100755 --- a/backend/satellite_tools/disk_dumper/rhn-satellite-exporter +++ b/backend/satellite_tools/disk_dumper/rhn-satellite-exporter @@ -34,7 +34,8 @@ if __name__ =3D=3D "__main__": log2stderr(-1, isserror.msg) log2stderr(4, isserror.tb) sys.exit(-1) - + except SystemExit, se: + sys.exit(se.code) except Exception, e: log2stderr(-1, "Unhandled Error: %s" % (e.__class__.__name__,)) tbout =3D cStringIO.StringIO() --===============6338602288079119073==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:29 2015 Content-Type: multipart/mixed; boundary="===============7652255060147910708==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: backend/satellite_tools Date: Thu, 11 Jun 2009 17:05:06 +0000 Message-ID: <20090611170506.C66611201D7@lists.fedorahosted.org> --===============7652255060147910708== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/satellite_tools/disk_dumper/iss.py | 5 ++++- backend/satellite_tools/disk_dumper/rhn-satellite-exporter | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit be583cf03a6acd04b70a75e0630e4c3bb5f7c0c7 Author: Pradeep Kilambi Date: Thu Jun 11 13:03:04 2009 -0400 Catch the systemExit and preserve the error code. Also fixing the trace= back issue when db is not accessible diff --git a/backend/satellite_tools/disk_dumper/iss.py b/backend/satellite= _tools/disk_dumper/iss.py index bef014b..89e267f 100644 --- a/backend/satellite_tools/disk_dumper/iss.py +++ b/backend/satellite_tools/disk_dumper/iss.py @@ -908,7 +908,10 @@ class ExporterMain: #This was taken straight from satsync.py. try: rhnSQL.initDB(CFG.DEFAULT_DB) - except (SQLError, SQLSchemaError, SQLConnectError), e: + except SQLConnectError: + print 'SQLERROR: There was an error connecting to the Database= .' + sys.exit(-1) + except (SQLError, SQLSchemaError), e: # An SQL error is fatal... crash and burn tbOut =3D cStringIO.StringIO() Traceback(mail=3D0, ostream=3DtbOut, with_locals=3D1) diff --git a/backend/satellite_tools/disk_dumper/rhn-satellite-exporter b/b= ackend/satellite_tools/disk_dumper/rhn-satellite-exporter index 6e58c82..713a209 100755 --- a/backend/satellite_tools/disk_dumper/rhn-satellite-exporter +++ b/backend/satellite_tools/disk_dumper/rhn-satellite-exporter @@ -34,7 +34,8 @@ if __name__ =3D=3D "__main__": log2stderr(-1, isserror.msg) log2stderr(4, isserror.tb) sys.exit(-1) - + except SystemExit, se: + sys.exit(se.code) except Exception, e: log2stderr(-1, "Unhandled Error: %s" % (e.__class__.__name__,)) tbout =3D cStringIO.StringIO() --===============7652255060147910708==-- From pkilambi at redhat.com Thu Aug 20 11:57:29 2015 Content-Type: multipart/mixed; boundary="===============3118975931472555160==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Re: Branch 'VADER' - 2 commits - backend/satellite_tools Date: Thu, 11 Jun 2009 13:13:48 -0400 Message-ID: <4A313B4C.7000301@redhat.com> In-Reply-To: 20090611170333.7312D1201D7@lists.fedorahosted.org --===============3118975931472555160== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Pradeep Kilambi wrote: > backend/satellite_tools/disk_dumper/iss.py | 5 ++++- > backend/satellite_tools/disk_dumper/rhn-satellite-exporter | 3 ++- > 2 files changed, 6 insertions(+), 2 deletions(-) > > New commits: > commit 1c50c111d0d7d1f6d522904147fceb81371f38d8 > Merge: 39db9c3... d483424... > Author: Pradeep Kilambi > Date: Thu Jun 11 13:03:25 2009 -0400 > > Merge branch 'VADER' of ssh://pkilambi(a)git.fedorahosted.org/git/spa= cewalk into vader > > = Forgot to git pull before committing. Sorry. ~ Prad > > commit 39db9c3180883db7650672644e4a923eb8f8f352 > Author: Pradeep Kilambi > Date: Thu Jun 11 13:03:04 2009 -0400 > > Catch the systemExit and preserve the error code. Also fixing the tra= ceback issue when db is not accessible > > diff --git a/backend/satellite_tools/disk_dumper/iss.py b/backend/satelli= te_tools/disk_dumper/iss.py > index bef014b..89e267f 100644 > --- a/backend/satellite_tools/disk_dumper/iss.py > +++ b/backend/satellite_tools/disk_dumper/iss.py > @@ -908,7 +908,10 @@ class ExporterMain: > #This was taken straight from satsync.py. > try: > rhnSQL.initDB(CFG.DEFAULT_DB) > - except (SQLError, SQLSchemaError, SQLConnectError), e: > + except SQLConnectError: > + print 'SQLERROR: There was an error connecting to the Databa= se.' > + sys.exit(-1) > + except (SQLError, SQLSchemaError), e: > # An SQL error is fatal... crash and burn > tbOut =3D cStringIO.StringIO() > Traceback(mail=3D0, ostream=3DtbOut, with_locals=3D1) > diff --git a/backend/satellite_tools/disk_dumper/rhn-satellite-exporter b= /backend/satellite_tools/disk_dumper/rhn-satellite-exporter > index 6e58c82..713a209 100755 > --- a/backend/satellite_tools/disk_dumper/rhn-satellite-exporter > +++ b/backend/satellite_tools/disk_dumper/rhn-satellite-exporter > @@ -34,7 +34,8 @@ if __name__ =3D=3D "__main__": > log2stderr(-1, isserror.msg) > log2stderr(4, isserror.tb) > sys.exit(-1) > - > + except SystemExit, se: > + sys.exit(se.code) > except Exception, e: > log2stderr(-1, "Unhandled Error: %s" % (e.__class__.__name__,)) > tbout =3D cStringIO.StringIO() > > > _______________________________________________ > spacewalk-commits mailing list > spacewalk-commits(a)lists.fedorahosted.org > https://fedorahosted.org/mailman/listinfo/spacewalk-commits > = -- = -- Pradeep Kilambi RHN Satellite Engineering pkilambi(a)redhat.com Phone: +1 919 754 4285 RHCE # 805008680430554 --===============3118975931472555160==-- From shughes at fedoraproject.org Thu Aug 20 11:57:29 2015 Content-Type: multipart/mixed; boundary="===============0039408935130915542==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Thu, 11 Jun 2009 20:02:21 +0000 Message-ID: <20090611200221.5AD6B1201D7@lists.fedorahosted.org> --===============0039408935130915542== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | = 12 +++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) New commits: commit 34fc4fc475b348442b8775df18b4a3522f50e0ad Author: Shannon Hughes Date: Thu Jun 11 15:55:19 2009 -0400 505327 - fixing url parse for advanced kickstart options diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormat= ter.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatte= r.java index d93c3d5..f3c6647 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java @@ -306,9 +306,15 @@ public class KickstartFormatter { */ private String adjustUrlHost(KickstartCommand command) { String argVal =3D command.getArguments(); - String urlLocation =3D argVal.substring("--url ".length()); - // KickstartUrlHelper urlHelper =3D new KickstartUrlHelper(this.ks= data, - // this.ksHost); + + String urlLocation; + if (argVal.startsWith("--url")) { + urlLocation =3D argVal.substring("--url ".length()); + } + else { + urlLocation =3D argVal; + } + KickstartUrlHelper urlHelper =3D new KickstartUrlHelper(this.ksdat= a); = log.debug("Got URL : " + command.getArguments()); --===============0039408935130915542==-- From shughes at fedoraproject.org Thu Aug 20 11:57:29 2015 Content-Type: multipart/mixed; boundary="===============2357299658528860113==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Thu, 11 Jun 2009 20:03:03 +0000 Message-ID: <20090611200303.87FDB1201D7@lists.fedorahosted.org> --===============2357299658528860113== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | = 12 +++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) New commits: commit 7a37cc1177481417f4db4f0ec862f39c3a08396d Author: Shannon Hughes Date: Thu Jun 11 15:55:19 2009 -0400 505327 - fixing url parse for advanced kickstart options diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormat= ter.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatte= r.java index d63af24..f01dd1f 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java @@ -306,9 +306,15 @@ public class KickstartFormatter { */ private String adjustUrlHost(KickstartCommand command) { String argVal =3D command.getArguments(); - String urlLocation =3D argVal.substring("--url ".length()); - // KickstartUrlHelper urlHelper =3D new KickstartUrlHelper(this.ks= data, - // this.ksHost); + + String urlLocation; + if (argVal.startsWith("--url")) { + urlLocation =3D argVal.substring("--url ".length()); + } + else { + urlLocation =3D argVal; + } + KickstartUrlHelper urlHelper =3D new KickstartUrlHelper(this.ksdat= a); = log.debug("Got URL : " + command.getArguments()); --===============2357299658528860113==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:29 2015 Content-Type: multipart/mixed; boundary="===============5548373172607607296==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Thu, 11 Jun 2009 20:55:12 +0000 Message-ID: <20090611205512.12BD71201D7@lists.fedorahosted.org> --===============5548373172607607296== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 19 ++++= +----- 1 file changed, 10 insertions(+), 9 deletions(-) New commits: commit ddd73b37f4812c709f9061b29dab2cd55b116dc6 Author: Brad Buckingham Date: Thu Jun 11 16:54:46 2009 -0400 505170 - api - proxy.deactivateProxy - was generating internal exception = The deactivateProxy api was generating an internal exception after the proxy channel was moved from the server. Moving the removal of the channel to be the last step in deactivating the proxy. diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java= b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java index 4696473..8b1280d 100644 --- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java +++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java @@ -1296,15 +1296,6 @@ public class SystemManager extends BaseManager { public static Server deactivateProxy(Server server) { Long sid =3D server.getId(); = - Set channels =3D server.getChannels(); - for (Iterator itr =3D channels.iterator(); itr.hasNext();) { - Channel c =3D (Channel)itr.next(); - ChannelFamily cf =3D c.getChannelFamily(); - if (cf.getLabel().equals("rhn-proxy")) { - SystemManager.unsubscribeServerFromChannel(server, c); - } - } - = Map params =3D new HashMap(); params.put("server_id", sid); = @@ -1323,6 +1314,16 @@ public class SystemManager extends BaseManager { // for it to work.... HibernateFactory.getSession().refresh(server); ServerFactory.deproxify(server); + + Set channels =3D server.getChannels(); + for (Iterator itr =3D channels.iterator(); itr.hasNext();) { + Channel c =3D (Channel)itr.next(); + ChannelFamily cf =3D c.getChannelFamily(); + if (cf.getLabel().equals("rhn-proxy")) { + SystemManager.unsubscribeServerFromChannel(server, c); + } + } + return server; } = --===============5548373172607607296==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:29 2015 Content-Type: multipart/mixed; boundary="===============7371255770693202581==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Thu, 11 Jun 2009 20:56:26 +0000 Message-ID: <20090611205626.9ACA51201D7@lists.fedorahosted.org> --===============7371255770693202581== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 19 ++++= +----- 1 file changed, 10 insertions(+), 9 deletions(-) New commits: commit 6a92bc1a7217b1b07ae2772948a03d4340ef56e3 Author: Brad Buckingham Date: Thu Jun 11 16:54:46 2009 -0400 505170 - api - proxy.deactivateProxy - was generating internal exception = The deactivateProxy api was generating an internal exception after the proxy channel was moved from the server. Moving the removal of the channel to be the last step in deactivating the proxy. diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java= b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java index 4696473..8b1280d 100644 --- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java +++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java @@ -1296,15 +1296,6 @@ public class SystemManager extends BaseManager { public static Server deactivateProxy(Server server) { Long sid =3D server.getId(); = - Set channels =3D server.getChannels(); - for (Iterator itr =3D channels.iterator(); itr.hasNext();) { - Channel c =3D (Channel)itr.next(); - ChannelFamily cf =3D c.getChannelFamily(); - if (cf.getLabel().equals("rhn-proxy")) { - SystemManager.unsubscribeServerFromChannel(server, c); - } - } - = Map params =3D new HashMap(); params.put("server_id", sid); = @@ -1323,6 +1314,16 @@ public class SystemManager extends BaseManager { // for it to work.... HibernateFactory.getSession().refresh(server); ServerFactory.deproxify(server); + + Set channels =3D server.getChannels(); + for (Iterator itr =3D channels.iterator(); itr.hasNext();) { + Channel c =3D (Channel)itr.next(); + ChannelFamily cf =3D c.getChannelFamily(); + if (cf.getLabel().equals("rhn-proxy")) { + SystemManager.unsubscribeServerFromChannel(server, c); + } + } + return server; } = --===============7371255770693202581==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:29 2015 Content-Type: multipart/mixed; boundary="===============3640156788032188456==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: web/html Date: Thu, 11 Jun 2009 22:14:52 +0000 Message-ID: <20090611221452.4036F120266@lists.fedorahosted.org> --===============3640156788032188456== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable web/html/applications/rhn-proxy/5.3/httpd/rhn_proxy.conf | 2 +- web/html/applications/rhn-proxy/5.3/install-rhn-proxy.xml | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) New commits: commit 632c728105a97510059d2ab7f75c77dd4efc36d6 Author: Justin Sherrill Date: Thu Jun 11 18:14:35 2009 -0400 505315 - fixing issue where cobbler provisioning couldnt occur through = a 5.3 proxy if installed through the webui diff --git a/web/html/applications/rhn-proxy/5.3/httpd/rhn_proxy.conf b/web= /html/applications/rhn-proxy/5.3/httpd/rhn_proxy.conf index 98a68f0..25c8916 100644 --- a/web/html/applications/rhn-proxy/5.3/httpd/rhn_proxy.conf +++ b/web/html/applications/rhn-proxy/5.3/httpd/rhn_proxy.conf @@ -85,5 +85,5 @@ = #Disable SSL2, left only higher SSLProtocol all -SSLv2 - +SSLProxyEngine on = diff --git a/web/html/applications/rhn-proxy/5.3/install-rhn-proxy.xml b/we= b/html/applications/rhn-proxy/5.3/install-rhn-proxy.xml index b32a29c..fec3f80 100644 --- a/web/html/applications/rhn-proxy/5.3/install-rhn-proxy.xml +++ b/web/html/applications/rhn-proxy/5.3/install-rhn-proxy.xml @@ -555,6 +555,11 @@ Would you like to enable Monitoring Proxy functionalit= y on this system? template=3D"httpd/rhn_proxy.conf" mode=3D"640" username=3D"root" gr= oupname=3D"apache"/> = + + + + @@ -613,7 +618,8 @@ fi /etc/rhn/= cluster.ini /etc/squid/squid.conf /etc/httpd/conf.d/rhn_proxy.conf - /etc/httpd/conf.d/ssl.conf + /etc/httpd/conf.d/cobbler-proxy.conf + /etc/httpd/conf.d/ssl.conf /etc/httpd/conf/ssl.crt/server.crt /etc/httpd/conf/ssl.csr/server.csr /etc/httpd/conf/ssl.key/server.key --===============3640156788032188456==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:29 2015 Content-Type: multipart/mixed; boundary="===============1483273833659171588==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - web/html Date: Thu, 11 Jun 2009 22:16:22 +0000 Message-ID: <20090611221622.58016120266@lists.fedorahosted.org> --===============1483273833659171588== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable web/html/applications/rhn-proxy/5.3/httpd/rhn_proxy.conf | 2 +- web/html/applications/rhn-proxy/5.3/install-rhn-proxy.xml | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) New commits: commit 7ce14c7f30b4168d7c4f169460d6e3eb068d20f5 Author: Justin Sherrill Date: Thu Jun 11 18:14:35 2009 -0400 505315 - fixing issue where cobbler provisioning couldnt occur through = a 5.3 proxy if installed through the webui diff --git a/web/html/applications/rhn-proxy/5.3/httpd/rhn_proxy.conf b/web= /html/applications/rhn-proxy/5.3/httpd/rhn_proxy.conf index 98a68f0..25c8916 100644 --- a/web/html/applications/rhn-proxy/5.3/httpd/rhn_proxy.conf +++ b/web/html/applications/rhn-proxy/5.3/httpd/rhn_proxy.conf @@ -85,5 +85,5 @@ = #Disable SSL2, left only higher SSLProtocol all -SSLv2 - +SSLProxyEngine on = diff --git a/web/html/applications/rhn-proxy/5.3/install-rhn-proxy.xml b/we= b/html/applications/rhn-proxy/5.3/install-rhn-proxy.xml index b32a29c..fec3f80 100644 --- a/web/html/applications/rhn-proxy/5.3/install-rhn-proxy.xml +++ b/web/html/applications/rhn-proxy/5.3/install-rhn-proxy.xml @@ -555,6 +555,11 @@ Would you like to enable Monitoring Proxy functionalit= y on this system? template=3D"httpd/rhn_proxy.conf" mode=3D"640" username=3D"root" gr= oupname=3D"apache"/> = + + + + @@ -613,7 +618,8 @@ fi /etc/rhn/= cluster.ini /etc/squid/squid.conf /etc/httpd/conf.d/rhn_proxy.conf - /etc/httpd/conf.d/ssl.conf + /etc/httpd/conf.d/cobbler-proxy.conf + /etc/httpd/conf.d/ssl.conf /etc/httpd/conf/ssl.crt/server.crt /etc/httpd/conf/ssl.csr/server.csr /etc/httpd/conf/ssl.key/server.key --===============1483273833659171588==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:29 2015 Content-Type: multipart/mixed; boundary="===============0298727558778042636==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: web/html Date: Thu, 11 Jun 2009 22:25:57 +0000 Message-ID: <20090611222558.09184120266@lists.fedorahosted.org> --===============0298727558778042636== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable web/html/applications/rhn-proxy/5.3/httpd/cobbler-proxy.conf | 9 ++++++= +++ 1 file changed, 9 insertions(+) New commits: commit 69249706016b9a4b39978c8a1553d5b37749bc11 Author: Justin Sherrill Date: Thu Jun 11 18:25:53 2009 -0400 505315 - checking in missing file from previous commit diff --git a/web/html/applications/rhn-proxy/5.3/httpd/cobbler-proxy.conf b= /web/html/applications/rhn-proxy/5.3/httpd/cobbler-proxy.conf new file mode 100644 index 0000000..79fb06d --- /dev/null +++ b/web/html/applications/rhn-proxy/5.3/httpd/cobbler-proxy.conf @@ -0,0 +1,9 @@ +ProxyPass /cobbler_api https://${session.rhn_parent}/cobbler_api +ProxyPassReverse /cobbler_api https://${session.rhn_parent}/cobbler_api + +ProxyPass /cblr https://${session.rhn_parent}/cblr +ProxyPassReverse /cblr https://${session.rhn_parent}/cblr + +ProxyPass /cobbler https://${session.rhn_parent}/cobbler +ProxyPassReverse /cobbler https://${session.rhn_parent}/cobbler + --===============0298727558778042636==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:29 2015 Content-Type: multipart/mixed; boundary="===============4242585366345370495==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - web/html Date: Thu, 11 Jun 2009 22:26:56 +0000 Message-ID: <20090611222656.D5BE2120266@lists.fedorahosted.org> --===============4242585366345370495== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable web/html/applications/rhn-proxy/5.3/httpd/cobbler-proxy.conf | 9 ++++++= +++ 1 file changed, 9 insertions(+) New commits: commit b03cbe30e51c7b9a97db635589664b805ccd5df6 Author: Justin Sherrill Date: Thu Jun 11 18:25:53 2009 -0400 505315 - checking in missing file from previous commit diff --git a/web/html/applications/rhn-proxy/5.3/httpd/cobbler-proxy.conf b= /web/html/applications/rhn-proxy/5.3/httpd/cobbler-proxy.conf new file mode 100644 index 0000000..79fb06d --- /dev/null +++ b/web/html/applications/rhn-proxy/5.3/httpd/cobbler-proxy.conf @@ -0,0 +1,9 @@ +ProxyPass /cobbler_api https://${session.rhn_parent}/cobbler_api +ProxyPassReverse /cobbler_api https://${session.rhn_parent}/cobbler_api + +ProxyPass /cblr https://${session.rhn_parent}/cblr +ProxyPassReverse /cblr https://${session.rhn_parent}/cblr + +ProxyPass /cobbler https://${session.rhn_parent}/cobbler +ProxyPassReverse /cobbler https://${session.rhn_parent}/cobbler + --===============4242585366345370495==-- From mmccune at fedoraproject.org Thu Aug 20 11:57:29 2015 Content-Type: multipart/mixed; boundary="===============2335652261716345106==" MIME-Version: 1.0 From: Mike McCune To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code schema/spacewalk Date: Fri, 12 Jun 2009 00:13:40 +0000 Message-ID: <20090612001340.BFFAA12029C@lists.fedorahosted.org> --===============2335652261716345106== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.= xml | 8 = java/code/src/com/redhat/rhn/manager/errata/cache/UpdateErrataCacheCommand= .java | 4 = schema/spacewalk/rhnsat/views/rhnServerNeededView.sql = | 93 ++-------- schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/122-= rhnServerNeededView.sql | 57 ++++++ 4 files changed, 91 insertions(+), 71 deletions(-) New commits: commit 5238ed2208fc0d3a29f9488f177df7a5441083c6 Author: Mike McCune Date: Thu Jun 11 16:42:29 2009 -0700 431673 - reworking rhnServerNeededView for performance fixes. = Simplify the rhnServerNeededView and make it a bit more performant. = Also resolve some really nasty TX handling code in UpdateErrataCacheCommand.java that wasnt rolling back if there were errors. diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCa= che_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Err= ataCache_queries.xml index 6b696b7..c8efb65 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_que= ries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_que= ries.xml @@ -122,11 +122,9 @@ WHERE EC.server_id in INSERT INTO rhnServerNeededCache (server_id, package_id, errata_id) - (SELECT DISTINCT SNV.server_id, SNV.package_id, SNV.errata_id - FROM rhnServerNeededView SNV, - rhnServerChannel SC - WHERE SNV.server_id =3D SC.server_id - AND SC.channel_id =3D :channel_id) + (SELECT DISTINCT SNV.server_id, SNV.package_id, SNV.errata_id + FROM rhnServerNeededView SNV + WHERE SNV.channel_id =3D :channel_id) = diff --git a/java/code/src/com/redhat/rhn/manager/errata/cache/UpdateErrata= CacheCommand.java b/java/code/src/com/redhat/rhn/manager/errata/cache/Updat= eErrataCacheCommand.java index e5085d1..249ebbe 100644 --- a/java/code/src/com/redhat/rhn/manager/errata/cache/UpdateErrataCacheCo= mmand.java +++ b/java/code/src/com/redhat/rhn/manager/errata/cache/UpdateErrataCacheCo= mmand.java @@ -115,6 +115,8 @@ public class UpdateErrataCacheCommand { } catch (Exception e) { log.error("Problem updating cache for server", e); + HibernateFactory.rollbackTransaction(); + = } finally { if (commit) { @@ -152,6 +154,7 @@ public class UpdateErrataCacheCommand { } catch (Exception e) { log.error("Problem updating cache for servers in channel for e= rrata", e); + HibernateFactory.rollbackTransaction(); } finally { handleTransaction(); @@ -174,6 +177,7 @@ public class UpdateErrataCacheCommand { } catch (Exception e) { log.error("Problem updating cache for servers in channel", e); + HibernateFactory.rollbackTransaction(); } finally { handleTransaction(); diff --git a/schema/spacewalk/rhnsat/views/rhnServerNeededView.sql b/schema= /spacewalk/rhnsat/views/rhnServerNeededView.sql index 09a2131..84a213f 100644 --- a/schema/spacewalk/rhnsat/views/rhnServerNeededView.sql +++ b/schema/spacewalk/rhnsat/views/rhnServerNeededView.sql @@ -16,7 +16,6 @@ = -- A view that displays an uncached version of rhnServerNeededCache = - CREATE OR REPLACE VIEW rhnServerNeededView ( @@ -24,72 +23,34 @@ rhnServerNeededView server_id, errata_id, package_id, - package_name_id + package_name_id, + channel_id ) AS -SELECT distinct S.org_id, - S.id, - PE.errata_id, - P.id, - P.name_id -FROM - rhnPackage P, - rhnServerPackageArchCompat SPAC, - rhnPackageEVR P_EVR, - rhnPackageEVR SP_EVR, - rhnServerPackage SP, - rhnChannelPackage CP, - rhnServerChannel SC, - rhnServer S, - rhnErrataPackage PE, - rhnChannelErrata EC -WHERE - SC.server_id =3D S.id - AND SC.channel_id =3D CP.channel_id - AND CP.package_id =3D P.id - AND P.id =3D PE.package_id - AND PE.errata_id =3D EC.errata_id - AND EC.channel_id =3D SC.channel_id - AND p.package_arch_id =3D spac.package_arch_id - AND spac.server_arch_id =3D s.server_arch_id - AND SP_EVR.id =3D SP.evr_id - AND P_EVR.id =3D P.evr_id - AND SP.server_id =3D S.id - AND SP.name_id =3D P.name_id - AND SP.evr_id !=3D P.evr_id - AND SP_EVR.evr < P_EVR.evr - AND SP_EVR.evr =3D (SELECT MAX(PE.evr) FROM rhnServerPackage SP2, rhn= PackageEvr PE WHERE PE.id =3D SP2.evr_id AND SP2.server_id =3D SP.server_id= AND SP2.name_id =3D SP.name_id) - UNION -SELECT distinct S.org_id, - S.id, - NULL as errata_id, - P.id, - P.name_id +SELECT DISTINCT S.org_id, + S.id as server_id, + ep.errata_id as errata_id, + P.id as package_id, + P.name_id as package_name_id, + CP.channel_id as channel_id FROM - rhnPackage P, - rhnServerPackageArchCompat SPAC, - rhnPackageEVR P_EVR, - rhnPackageEVR SP_EVR, - rhnServerPackage SP, - rhnChannelPackage CP, - rhnServerChannel SC, - rhnServer S -WHERE - SC.server_id =3D S.id - AND SC.channel_id =3D CP.channel_id - AND CP.package_id =3D P.id - AND P.id not in - ( select EP.package_id - from rhnErrataPackage EP inner join - rhnChannelErrata EC on EP.errata_id =3D EC= .errata_id - where EC.channel_id =3D SC.channel_id) - AND p.package_arch_id =3D spac.package_arch_id - AND spac.server_arch_id =3D s.server_arch_id - AND SP_EVR.id =3D SP.evr_id - AND P_EVR.id =3D P.evr_id - AND SP.server_id =3D S.id - AND SP.name_id =3D P.name_id - AND SP.evr_id !=3D P.evr_id - AND SP_EVR.evr < P_EVR.evr - AND SP_EVR.evr =3D (SELECT MAX(PE.evr) FROM rhnServerPackage SP2, rhn= PackageEvr PE WHERE PE.id =3D SP2.evr_id AND SP2.server_id =3D SP.server_id= AND SP2.name_id =3D SP.name_id) + rhnPackage P + inner join rhnPackageEVR P_EVR on P_EVR.id =3D P.evr_id + inner join rhnPackageEVR SP_EVR on SP_EVR.evr < P_EVR.evr = + inner join rhnServerPackage SP on SP.name_id =3D P.name_id = + and SP.evr_id =3D SP_EVR.id + AND SP.evr_id !=3D P.evr_id + inner join rhnServer S on SP.server_id =3D S.id + inner join rhnServerPackageArchCompat SPAC on spac.server_arch_id =3D = s.server_arch_id = + AND p.package_arch_id =3D spac.package_arch_id + inner join rhnServerChannel SC on SC.server_id =3D S.id = + inner join rhnChannelPackage CP on CP.package_id =3D P.id = + and SC.channel_id =3D CP.channel_id + left outer join rhnErrataPackage EP on EP.package_id =3D P.id + AND EXISTS = + (SELECT 1 from rhnChannelErrata CE where ce.channel_id = =3D SC.channel_id + AND CE.errata_id =3D EP.errata_id) = + where SP_EVR.evr =3D (SELECT MAX(PE.evr) FROM rhnServerPackage SP2, rh= nPackageEvr PE = + WHERE PE.id =3D SP2.evr_id AND SP2.server_id =3D SP= .server_id AND = + SP2.name_id =3D SP.name_id) / diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-sch= ema-0.6/122-rhnServerNeededView.sql b/schema/spacewalk/upgrade/spacewalk-sc= hema-0.5-to-spacewalk-schema-0.6/122-rhnServerNeededView.sql new file mode 100644 index 0000000..ef70904 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6= /122-rhnServerNeededView.sql @@ -0,0 +1,57 @@ +-- +-- Copyright (c) 2008 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. = +-- + + +-- A view that displays an uncached version of rhnServerNeededCache + + +CREATE OR REPLACE VIEW +rhnServerNeededView +( + org_id, + server_id, + errata_id, + package_id, + package_name_id, + channel_id +) +AS +SELECT DISTINCT S.org_id, + S.id as server_id, + ep.errata_id as errata_id, + P.id as package_id, + P.name_id as package_name_id, + CP.channel_id as channel_id +FROM + rhnPackage P + inner join rhnPackageEVR P_EVR on P_EVR.id =3D P.evr_id + inner join rhnPackageEVR SP_EVR on SP_EVR.evr < P_EVR.evr = + inner join rhnServerPackage SP on SP.name_id =3D P.name_id = + and SP.evr_id =3D SP_EVR.id + AND SP.evr_id !=3D P.evr_id + inner join rhnServer S on SP.server_id =3D S.id + inner join rhnServerPackageArchCompat SPAC on spac.server_arch_id =3D = s.server_arch_id = + AND p.package_arch_id =3D spac.package_arch_id + inner join rhnServerChannel SC on SC.server_id =3D S.id = + inner join rhnChannelPackage CP on CP.package_id =3D P.id = + and SC.channel_id =3D CP.channel_id + left outer join rhnErrataPackage EP on EP.package_id =3D P.id + AND EXISTS = + (SELECT 1 from rhnChannelErrata CE where ce.channel_id = =3D SC.channel_id + AND CE.errata_id =3D EP.errata_id) = + where SP_EVR.evr =3D (SELECT MAX(PE.evr) FROM rhnServerPackage SP2, rh= nPackageEvr PE = + WHERE PE.id =3D SP2.evr_id AND SP2.server_id =3D SP= .server_id AND = + SP2.name_id =3D SP.name_id) +/ --===============2335652261716345106==-- From mmccune at fedoraproject.org Thu Aug 20 11:57:29 2015 Content-Type: multipart/mixed; boundary="===============4825645272767362427==" MIME-Version: 1.0 From: Mike McCune To: spacewalk-commits at lists.fedorahosted.org Subject: java/code schema/spacewalk Date: Fri, 12 Jun 2009 00:14:18 +0000 Message-ID: <20090612001418.44D6812029C@lists.fedorahosted.org> --===============4825645272767362427== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.= xml | 8 = java/code/src/com/redhat/rhn/manager/errata/cache/UpdateErrataCacheCommand= .java | 4 = schema/spacewalk/rhnsat/views/rhnServerNeededView.sql = | 93 ++-------- schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/122-= rhnServerNeededView.sql | 57 ++++++ 4 files changed, 91 insertions(+), 71 deletions(-) New commits: commit 64ec6ad62602a3116a1ea24b0877c38d675854e7 Author: Mike McCune Date: Thu Jun 11 16:42:29 2009 -0700 431673 - reworking rhnServerNeededView for performance fixes. = Simplify the rhnServerNeededView and make it a bit more performant. = Also resolve some really nasty TX handling code in UpdateErrataCacheCommand.java that wasnt rolling back if there were errors. diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCa= che_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Err= ataCache_queries.xml index 6b696b7..c8efb65 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_que= ries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_que= ries.xml @@ -122,11 +122,9 @@ WHERE EC.server_id in INSERT INTO rhnServerNeededCache (server_id, package_id, errata_id) - (SELECT DISTINCT SNV.server_id, SNV.package_id, SNV.errata_id - FROM rhnServerNeededView SNV, - rhnServerChannel SC - WHERE SNV.server_id =3D SC.server_id - AND SC.channel_id =3D :channel_id) + (SELECT DISTINCT SNV.server_id, SNV.package_id, SNV.errata_id + FROM rhnServerNeededView SNV + WHERE SNV.channel_id =3D :channel_id) = diff --git a/java/code/src/com/redhat/rhn/manager/errata/cache/UpdateErrata= CacheCommand.java b/java/code/src/com/redhat/rhn/manager/errata/cache/Updat= eErrataCacheCommand.java index e5085d1..249ebbe 100644 --- a/java/code/src/com/redhat/rhn/manager/errata/cache/UpdateErrataCacheCo= mmand.java +++ b/java/code/src/com/redhat/rhn/manager/errata/cache/UpdateErrataCacheCo= mmand.java @@ -115,6 +115,8 @@ public class UpdateErrataCacheCommand { } catch (Exception e) { log.error("Problem updating cache for server", e); + HibernateFactory.rollbackTransaction(); + = } finally { if (commit) { @@ -152,6 +154,7 @@ public class UpdateErrataCacheCommand { } catch (Exception e) { log.error("Problem updating cache for servers in channel for e= rrata", e); + HibernateFactory.rollbackTransaction(); } finally { handleTransaction(); @@ -174,6 +177,7 @@ public class UpdateErrataCacheCommand { } catch (Exception e) { log.error("Problem updating cache for servers in channel", e); + HibernateFactory.rollbackTransaction(); } finally { handleTransaction(); diff --git a/schema/spacewalk/rhnsat/views/rhnServerNeededView.sql b/schema= /spacewalk/rhnsat/views/rhnServerNeededView.sql index 09a2131..84a213f 100644 --- a/schema/spacewalk/rhnsat/views/rhnServerNeededView.sql +++ b/schema/spacewalk/rhnsat/views/rhnServerNeededView.sql @@ -16,7 +16,6 @@ = -- A view that displays an uncached version of rhnServerNeededCache = - CREATE OR REPLACE VIEW rhnServerNeededView ( @@ -24,72 +23,34 @@ rhnServerNeededView server_id, errata_id, package_id, - package_name_id + package_name_id, + channel_id ) AS -SELECT distinct S.org_id, - S.id, - PE.errata_id, - P.id, - P.name_id -FROM - rhnPackage P, - rhnServerPackageArchCompat SPAC, - rhnPackageEVR P_EVR, - rhnPackageEVR SP_EVR, - rhnServerPackage SP, - rhnChannelPackage CP, - rhnServerChannel SC, - rhnServer S, - rhnErrataPackage PE, - rhnChannelErrata EC -WHERE - SC.server_id =3D S.id - AND SC.channel_id =3D CP.channel_id - AND CP.package_id =3D P.id - AND P.id =3D PE.package_id - AND PE.errata_id =3D EC.errata_id - AND EC.channel_id =3D SC.channel_id - AND p.package_arch_id =3D spac.package_arch_id - AND spac.server_arch_id =3D s.server_arch_id - AND SP_EVR.id =3D SP.evr_id - AND P_EVR.id =3D P.evr_id - AND SP.server_id =3D S.id - AND SP.name_id =3D P.name_id - AND SP.evr_id !=3D P.evr_id - AND SP_EVR.evr < P_EVR.evr - AND SP_EVR.evr =3D (SELECT MAX(PE.evr) FROM rhnServerPackage SP2, rhn= PackageEvr PE WHERE PE.id =3D SP2.evr_id AND SP2.server_id =3D SP.server_id= AND SP2.name_id =3D SP.name_id) - UNION -SELECT distinct S.org_id, - S.id, - NULL as errata_id, - P.id, - P.name_id +SELECT DISTINCT S.org_id, + S.id as server_id, + ep.errata_id as errata_id, + P.id as package_id, + P.name_id as package_name_id, + CP.channel_id as channel_id FROM - rhnPackage P, - rhnServerPackageArchCompat SPAC, - rhnPackageEVR P_EVR, - rhnPackageEVR SP_EVR, - rhnServerPackage SP, - rhnChannelPackage CP, - rhnServerChannel SC, - rhnServer S -WHERE - SC.server_id =3D S.id - AND SC.channel_id =3D CP.channel_id - AND CP.package_id =3D P.id - AND P.id not in - ( select EP.package_id - from rhnErrataPackage EP inner join - rhnChannelErrata EC on EP.errata_id =3D EC= .errata_id - where EC.channel_id =3D SC.channel_id) - AND p.package_arch_id =3D spac.package_arch_id - AND spac.server_arch_id =3D s.server_arch_id - AND SP_EVR.id =3D SP.evr_id - AND P_EVR.id =3D P.evr_id - AND SP.server_id =3D S.id - AND SP.name_id =3D P.name_id - AND SP.evr_id !=3D P.evr_id - AND SP_EVR.evr < P_EVR.evr - AND SP_EVR.evr =3D (SELECT MAX(PE.evr) FROM rhnServerPackage SP2, rhn= PackageEvr PE WHERE PE.id =3D SP2.evr_id AND SP2.server_id =3D SP.server_id= AND SP2.name_id =3D SP.name_id) + rhnPackage P + inner join rhnPackageEVR P_EVR on P_EVR.id =3D P.evr_id + inner join rhnPackageEVR SP_EVR on SP_EVR.evr < P_EVR.evr = + inner join rhnServerPackage SP on SP.name_id =3D P.name_id = + and SP.evr_id =3D SP_EVR.id + AND SP.evr_id !=3D P.evr_id + inner join rhnServer S on SP.server_id =3D S.id + inner join rhnServerPackageArchCompat SPAC on spac.server_arch_id =3D = s.server_arch_id = + AND p.package_arch_id =3D spac.package_arch_id + inner join rhnServerChannel SC on SC.server_id =3D S.id = + inner join rhnChannelPackage CP on CP.package_id =3D P.id = + and SC.channel_id =3D CP.channel_id + left outer join rhnErrataPackage EP on EP.package_id =3D P.id + AND EXISTS = + (SELECT 1 from rhnChannelErrata CE where ce.channel_id = =3D SC.channel_id + AND CE.errata_id =3D EP.errata_id) = + where SP_EVR.evr =3D (SELECT MAX(PE.evr) FROM rhnServerPackage SP2, rh= nPackageEvr PE = + WHERE PE.id =3D SP2.evr_id AND SP2.server_id =3D SP= .server_id AND = + SP2.name_id =3D SP.name_id) / diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-sch= ema-0.6/122-rhnServerNeededView.sql b/schema/spacewalk/upgrade/spacewalk-sc= hema-0.5-to-spacewalk-schema-0.6/122-rhnServerNeededView.sql new file mode 100644 index 0000000..ef70904 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6= /122-rhnServerNeededView.sql @@ -0,0 +1,57 @@ +-- +-- Copyright (c) 2008 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. = +-- + + +-- A view that displays an uncached version of rhnServerNeededCache + + +CREATE OR REPLACE VIEW +rhnServerNeededView +( + org_id, + server_id, + errata_id, + package_id, + package_name_id, + channel_id +) +AS +SELECT DISTINCT S.org_id, + S.id as server_id, + ep.errata_id as errata_id, + P.id as package_id, + P.name_id as package_name_id, + CP.channel_id as channel_id +FROM + rhnPackage P + inner join rhnPackageEVR P_EVR on P_EVR.id =3D P.evr_id + inner join rhnPackageEVR SP_EVR on SP_EVR.evr < P_EVR.evr = + inner join rhnServerPackage SP on SP.name_id =3D P.name_id = + and SP.evr_id =3D SP_EVR.id + AND SP.evr_id !=3D P.evr_id + inner join rhnServer S on SP.server_id =3D S.id + inner join rhnServerPackageArchCompat SPAC on spac.server_arch_id =3D = s.server_arch_id = + AND p.package_arch_id =3D spac.package_arch_id + inner join rhnServerChannel SC on SC.server_id =3D S.id = + inner join rhnChannelPackage CP on CP.package_id =3D P.id = + and SC.channel_id =3D CP.channel_id + left outer join rhnErrataPackage EP on EP.package_id =3D P.id + AND EXISTS = + (SELECT 1 from rhnChannelErrata CE where ce.channel_id = =3D SC.channel_id + AND CE.errata_id =3D EP.errata_id) = + where SP_EVR.evr =3D (SELECT MAX(PE.evr) FROM rhnServerPackage SP2, rh= nPackageEvr PE = + WHERE PE.id =3D SP2.evr_id AND SP2.server_id =3D SP= .server_id AND = + SP2.name_id =3D SP.name_id) +/ --===============4825645272767362427==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:29 2015 Content-Type: multipart/mixed; boundary="===============4591409742555938150==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - backend/server Date: Fri, 12 Jun 2009 03:32:51 +0000 Message-ID: <20090612033251.3EDE812026A@lists.fedorahosted.org> --===============4591409742555938150== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/importlib/backend.py | 7 ++++++- backend/server/importlib/backendOracle.py | 2 +- backend/server/importlib/packageImport.py | 22 ++++++++++++++++------ 3 files changed, 23 insertions(+), 8 deletions(-) New commits: commit 58a6a39969a735eaa9443968a7224341dfd6c2e3 Author: Pradeep Kilambi Date: Thu Jun 11 23:01:17 2009 -0400 495790 - force uploading a package ends up with duplicate entries in rh= nPackage table. This is because we use md5sum along with name, evr, package= arch and org as a primary key while deciding whether to perform an insert = or an update. Since the solaris packages had same nvrea and org and differe= nt md5 sums it was doing an insert instead of update on the existing row. F= ixed the schema wrapper to only use md5sum as a primary key if nvrea featur= e is enabled. Also fixed the package uniquifies to use md5sum only for nvre= a. diff --git a/backend/server/importlib/backend.py b/backend/server/importlib= /backend.py index 7d2a7a3..4ae1093 100644 --- a/backend/server/importlib/backend.py +++ b/backend/server/importlib/backend.py @@ -22,7 +22,7 @@ import string import re import sys = -from common import rhnFault, rhn_rpm +from common import rhnFault, rhn_rpm, CFG from server import rhnSQL, rhnChannel, taskomatic from importLib import Diff, Package, IncompletePackage, Erratum, \ AlreadyUploadedError, InvalidPackageError, TransactionError, \ @@ -685,6 +685,11 @@ class Backend: forceVerify=3D0, transactional=3D0): # Insert/update the packages = + tbs =3D self.tables['rhnPackage'] + if CFG.ENABLE_NVREA: + # Add md5sum as a primarykey if nevra is enabled + tbs.pk.append('md5sum') + childTables =3D { 'rhnPackageProvides': 'package_id', = 'rhnPackageRequires': 'package_id', diff --git a/backend/server/importlib/backendOracle.py b/backend/server/imp= ortlib/backendOracle.py index 99b53e7..a967676 100644 --- a/backend/server/importlib/backendOracle.py +++ b/backend/server/importlib/backendOracle.py @@ -131,7 +131,7 @@ class OracleBackend(Backend): 'header_end' : DBint(), 'last_modified' : DBdateTime(), }, - pk =3D ['org_id', 'name_id', 'evr_id', 'package_arch_= id', 'md5sum'], + pk =3D ['org_id', 'name_id', 'evr_id', 'package_arch_= id'], nullable =3D ['org_id'], severityHash =3D { 'path' : 1, diff --git a/backend/server/importlib/packageImport.py b/backend/server/imp= ortlib/packageImport.py index 22a7d1e..90ba02e 100644 --- a/backend/server/importlib/packageImport.py +++ b/backend/server/importlib/packageImport.py @@ -22,6 +22,7 @@ from importLib import GenericPackageImport, IncompletePac= kage, Package, \ Import, InvalidArchError, InvalidChannelError, \ IncompatibleArchError from server import taskomatic +from common import CFG = class ChannelPackageSubscription(GenericPackageImport): def __init__(self, batch, backend, caller=3DNone, strict=3D0): @@ -69,12 +70,21 @@ class ChannelPackageSubscription(GenericPackageImport): if package.ignored: continue self._postprocessPackageNEVRA(package) - nevrao =3D ( - package['name_id'], - package['evr_id'], - package['package_arch_id'], - package['org_id'], - package['md5sum']) + if not CFG.ENABLE_NVREA: + # nvrea disabled, skip md5sum + nevrao =3D ( + package['name_id'], + package['evr_id'], + package['package_arch_id'], + package['org_id']) + else: + # As nvrea is enabled uniquify based on md5sum + nevrao =3D ( + package['name_id'], + package['evr_id'], + package['package_arch_id'], + package['org_id'], + package['md5sum']) = if not uniqdict.has_key(nevrao): # Uniquify the channel names --===============4591409742555938150==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:29 2015 Content-Type: multipart/mixed; boundary="===============3785020992963886641==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: backend/server Date: Fri, 12 Jun 2009 03:33:25 +0000 Message-ID: <20090612033325.CC00F12026A@lists.fedorahosted.org> --===============3785020992963886641== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/importlib/backend.py | 7 ++++++- backend/server/importlib/backendOracle.py | 2 +- backend/server/importlib/packageImport.py | 22 ++++++++++++++++------ 3 files changed, 23 insertions(+), 8 deletions(-) New commits: commit a3e57cfe6b148532bcff8115903cde5150c0d21f Author: Pradeep Kilambi Date: Thu Jun 11 23:01:17 2009 -0400 495790 - force uploading a package ends up with duplicate entries in rh= nPackage table. This is because we use md5sum along with name, evr, package= arch and org as a primary key while deciding whether to perform an insert = or an update. Since the solaris packages had same nvrea and org and differe= nt md5 sums it was doing an insert instead of update on the existing row. F= ixed the schema wrapper to only use md5sum as a primary key if nvrea featur= e is enabled. Also fixed the package uniquifies to use md5sum only for nvre= a. diff --git a/backend/server/importlib/backend.py b/backend/server/importlib= /backend.py index 7d2a7a3..4ae1093 100644 --- a/backend/server/importlib/backend.py +++ b/backend/server/importlib/backend.py @@ -22,7 +22,7 @@ import string import re import sys = -from common import rhnFault, rhn_rpm +from common import rhnFault, rhn_rpm, CFG from server import rhnSQL, rhnChannel, taskomatic from importLib import Diff, Package, IncompletePackage, Erratum, \ AlreadyUploadedError, InvalidPackageError, TransactionError, \ @@ -685,6 +685,11 @@ class Backend: forceVerify=3D0, transactional=3D0): # Insert/update the packages = + tbs =3D self.tables['rhnPackage'] + if CFG.ENABLE_NVREA: + # Add md5sum as a primarykey if nevra is enabled + tbs.pk.append('md5sum') + childTables =3D { 'rhnPackageProvides': 'package_id', = 'rhnPackageRequires': 'package_id', diff --git a/backend/server/importlib/backendOracle.py b/backend/server/imp= ortlib/backendOracle.py index 99b53e7..a967676 100644 --- a/backend/server/importlib/backendOracle.py +++ b/backend/server/importlib/backendOracle.py @@ -131,7 +131,7 @@ class OracleBackend(Backend): 'header_end' : DBint(), 'last_modified' : DBdateTime(), }, - pk =3D ['org_id', 'name_id', 'evr_id', 'package_arch_= id', 'md5sum'], + pk =3D ['org_id', 'name_id', 'evr_id', 'package_arch_= id'], nullable =3D ['org_id'], severityHash =3D { 'path' : 1, diff --git a/backend/server/importlib/packageImport.py b/backend/server/imp= ortlib/packageImport.py index 22a7d1e..90ba02e 100644 --- a/backend/server/importlib/packageImport.py +++ b/backend/server/importlib/packageImport.py @@ -22,6 +22,7 @@ from importLib import GenericPackageImport, IncompletePac= kage, Package, \ Import, InvalidArchError, InvalidChannelError, \ IncompatibleArchError from server import taskomatic +from common import CFG = class ChannelPackageSubscription(GenericPackageImport): def __init__(self, batch, backend, caller=3DNone, strict=3D0): @@ -69,12 +70,21 @@ class ChannelPackageSubscription(GenericPackageImport): if package.ignored: continue self._postprocessPackageNEVRA(package) - nevrao =3D ( - package['name_id'], - package['evr_id'], - package['package_arch_id'], - package['org_id'], - package['md5sum']) + if not CFG.ENABLE_NVREA: + # nvrea disabled, skip md5sum + nevrao =3D ( + package['name_id'], + package['evr_id'], + package['package_arch_id'], + package['org_id']) + else: + # As nvrea is enabled uniquify based on md5sum + nevrao =3D ( + package['name_id'], + package['evr_id'], + package['package_arch_id'], + package['org_id'], + package['md5sum']) = if not uniqdict.has_key(nevrao): # Uniquify the channel names --===============3785020992963886641==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:29 2015 Content-Type: multipart/mixed; boundary="===============6386154805152703954==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Fri, 12 Jun 2009 14:22:57 +0000 Message-ID: <20090612142257.BE8421201A2@lists.fedorahosted.org> --===============6386154805152703954== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartableTreeTest.j= ava | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ecc4fa69d88955b12f222ef0d467e6b067ff5e79 Author: Justin Sherrill Date: Wed May 20 18:55:11 2009 -0400 unit test fix diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/Kickstartab= leTreeTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/Kickst= artableTreeTest.java index 8db325d..579d63d 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartableTreeT= est.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartableTreeT= est.java @@ -85,7 +85,7 @@ public class KickstartableTreeTest extends BaseTestCaseWi= thUser { = public void testDownloadLocation() throws Exception { KickstartableTree k =3D createTestKickstartableTree(); - String expected =3D "http://localhost/ks/dist/org/" + k.getOrg().g= etId() + "/" + = + String expected =3D "/ks/dist/org/" + k.getOrg().getId() + "/" + k.getLabel(); assertEquals(expected, k.getDefaultDownloadLocation("localhost")); } --===============6386154805152703954==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:29 2015 Content-Type: multipart/mixed; boundary="===============9153476364501391655==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Fri, 12 Jun 2009 14:26:12 +0000 Message-ID: <20090612142612.504AF12022F@lists.fedorahosted.org> --===============9153476364501391655== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/org/cobbler/test/MockConnection.java | 3 +++ 1 file changed, 3 insertions(+) New commits: commit c901ac9040a6389bdc84c93ff47125fabcb54fda Author: Justin Sherrill Date: Fri Jun 12 10:25:38 2009 -0400 unit test fix diff --git a/java/code/src/org/cobbler/test/MockConnection.java b/java/code= /src/org/cobbler/test/MockConnection.java index eb1449d..87e95bf 100644 --- a/java/code/src/org/cobbler/test/MockConnection.java +++ b/java/code/src/org/cobbler/test/MockConnection.java @@ -147,6 +147,7 @@ public class MockConnection extends CobblerConnection { profile.put("kernel_options", new HashMap()); profile.put("kernel_options_post", new HashMap()); profile.put("ks_meta", new HashMap()); + profile.put("redhat_management_key", ""); return key; } //distros @@ -200,6 +201,7 @@ public class MockConnection extends CobblerConnection { distro.put("kernel_options", new HashMap()); distro.put("kernel_options_post", new HashMap()); distro.put("ks_meta", new HashMap()); + distro.put("redhat_management_key", ""); return key; } //System @@ -241,6 +243,7 @@ public class MockConnection extends CobblerConnection { systems.add(profile); systemMap.put(key, profile); profile.put("ks_meta", new HashMap()); + profile.put("redhat_management_key", ""); return key; } else { --===============9153476364501391655==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:29 2015 Content-Type: multipart/mixed; boundary="===============6154061360018991026==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Fri, 12 Jun 2009 14:31:42 +0000 Message-ID: <20090612143142.4306D1201A2@lists.fedorahosted.org> --===============6154061360018991026== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/org/cobbler/test/MockConnection.java | 3 +++ 1 file changed, 3 insertions(+) New commits: commit 31f2cb303b98ed2bb061040d6192c805e201b02a Author: Justin Sherrill Date: Fri Jun 12 10:25:38 2009 -0400 unit test fix diff --git a/java/code/src/org/cobbler/test/MockConnection.java b/java/code= /src/org/cobbler/test/MockConnection.java index eb1449d..87e95bf 100644 --- a/java/code/src/org/cobbler/test/MockConnection.java +++ b/java/code/src/org/cobbler/test/MockConnection.java @@ -147,6 +147,7 @@ public class MockConnection extends CobblerConnection { profile.put("kernel_options", new HashMap()); profile.put("kernel_options_post", new HashMap()); profile.put("ks_meta", new HashMap()); + profile.put("redhat_management_key", ""); return key; } //distros @@ -200,6 +201,7 @@ public class MockConnection extends CobblerConnection { distro.put("kernel_options", new HashMap()); distro.put("kernel_options_post", new HashMap()); distro.put("ks_meta", new HashMap()); + distro.put("redhat_management_key", ""); return key; } //System @@ -241,6 +243,7 @@ public class MockConnection extends CobblerConnection { systems.add(profile); systemMap.put(key, profile); profile.put("ks_meta", new HashMap()); + profile.put("redhat_management_key", ""); return key; } else { --===============6154061360018991026==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:30 2015 Content-Type: multipart/mixed; boundary="===============1062538653000550501==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: client/rhel Date: Fri, 12 Jun 2009 14:35:44 +0000 Message-ID: <20090612143544.27F191201A2@lists.fedorahosted.org> --===============1062538653000550501== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 7 +++++-- client/rhel/rhn-client-tools/src/up2date_client/tui.py | 11 ++++++= +---- 2 files changed, 12 insertions(+), 6 deletions(-) New commits: commit deb14e8190d6d5026dda81dc1e18a1e20bbcb589 Author: Pradeep Kilambi Date: Fri Jun 12 10:35:37 2009 -0400 504292 - fix the registration gui and tui to honor the ssl cert paths s= pecified in the config. Set the paths to default locations only if the user= hasn't explicitly defined it. diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py b= /client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py index 9c1683d..26d7de0 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py @@ -293,7 +293,8 @@ class ChooseServerPage: if self.hostedButton.get_active(): up2dateConfig.set('serverURL', = 'https://xmlrpc.rhn.redhat.com/XMLRPC') - up2dateConfig.set('sslCACert', '/usr/share/rhn/RHNS-CA-CERT') + if not cfg['sslCACert']: + up2dateConfig.set('sslCACert', '/usr/share/rhn/RHNS-CA-CER= T') serverType =3D 'hosted' else: customServer =3D self.chooseServerXml.get_widget( @@ -308,7 +309,9 @@ class ChooseServerPage: # If they changed the value, write it back to the config file. if customServer !=3D self.server: up2dateConfig.set('serverURL', customServer) - up2dateConfig.set('sslCACert', '/usr/share/rhn/RHN-ORG-TRUSTED= -SSL-CERT') + if not cfg['sslCACert']: + up2dateConfig.set('sslCACert', = + '/usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT= ') serverType =3D 'satellite' = = = diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py b/clien= t/rhel/rhn-client-tools/src/up2date_client/tui.py index 48cec38..1a784f6 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py @@ -1413,10 +1413,13 @@ class Tui: else: self.serverURL =3D cfg['serverURL'] = - if self.serverType =3D=3D "hosted": - cfg.set('sslCACert', '/usr/share/rhn/RHNS-CA-CERT') - else: - cfg.set('sslCACert', '/usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT'= ) = + if not cfg['sslCACert']: + # Always use the path from the cert if available, else set to = + # default location + if self.serverType =3D=3D "hosted": + cfg.set('sslCACert', '/usr/share/rhn/RHNS-CA-CERT') + else: + cfg.set('sslCACert', '/usr/share/rhn/RHN-ORG-TRUSTED-SSL-C= ERT') = = def __del__(self): self.screen.finish() --===============1062538653000550501==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:30 2015 Content-Type: multipart/mixed; boundary="===============6292594453035816533==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Fri, 12 Jun 2009 14:55:07 +0000 Message-ID: <20090612145507.E7CFA1201A2@lists.fedorahosted.org> --===============6292594453035816533== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/org/cobbler/CobblerObject.java | 4 ++++ 1 file changed, 4 insertions(+) New commits: commit e6a6b63b4a3c33b2afd3b0b4524ad277dc2b80a3 Author: Justin Sherrill Date: Fri Jun 12 10:54:36 2009 -0400 unit test fix diff --git a/java/code/src/org/cobbler/CobblerObject.java b/java/code/src/o= rg/cobbler/CobblerObject.java index fcb2d0e..4c2e693 100644 --- a/java/code/src/org/cobbler/CobblerObject.java +++ b/java/code/src/org/cobbler/CobblerObject.java @@ -366,6 +366,10 @@ public abstract class CobblerObject { private Map parseKernelOpts(String kernelOpts) { Map toRet =3D new HashMap(); = + if (StringUtils.isEmpty(kernelOpts)) { + return toRet; + } + String[] options =3D StringUtils.split(kernelOpts); for (String option : options) { String[] split =3D option.split("=3D"); --===============6292594453035816533==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:30 2015 Content-Type: multipart/mixed; boundary="===============2182893761096185978==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Fri, 12 Jun 2009 14:55:35 +0000 Message-ID: <20090612145535.F05A31201A2@lists.fedorahosted.org> --===============2182893761096185978== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/org/cobbler/CobblerObject.java | 4 ++++ 1 file changed, 4 insertions(+) New commits: commit be94a377d2ae4a0e0f8dca08d271eab20fac904e Author: Justin Sherrill Date: Fri Jun 12 10:54:36 2009 -0400 unit test fix diff --git a/java/code/src/org/cobbler/CobblerObject.java b/java/code/src/o= rg/cobbler/CobblerObject.java index fcb2d0e..4c2e693 100644 --- a/java/code/src/org/cobbler/CobblerObject.java +++ b/java/code/src/org/cobbler/CobblerObject.java @@ -366,6 +366,10 @@ public abstract class CobblerObject { private Map parseKernelOpts(String kernelOpts) { Map toRet =3D new HashMap(); = + if (StringUtils.isEmpty(kernelOpts)) { + return toRet; + } + String[] options =3D StringUtils.split(kernelOpts); for (String option : options) { String[] split =3D option.split("=3D"); --===============2182893761096185978==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:30 2015 Content-Type: multipart/mixed; boundary="===============1126472768415442106==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Fri, 12 Jun 2009 15:25:20 +0000 Message-ID: <20090612152521.090FE1201A2@lists.fedorahosted.org> --===============1126472768415442106== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.hbm.xml = | 2 - java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.java = | 16 ---------- java/code/src/com/redhat/rhn/domain/channel/test/ReleaseChannelMapTest.jav= a | 1 = java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java = | 1 = 4 files changed, 20 deletions(-) New commits: commit 159042694bfe4d7901b27b20f17b1aa538ebd95f Author: Devan Goodwin Date: Fri Jun 12 12:24:18 2009 -0300 Remove hibernate mappings for rhnReleaseChannelMap is_default column. diff --git a/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.= hbm.xml b/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.hbm= .xml index 4d50f66..537a26a 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.hbm.xml +++ b/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.hbm.xml @@ -25,8 +25,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" class=3D"com.redhat.rhn.domain.channel.Channel" column=3D"channel_id"/> = - = - = diff --git a/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.= java b/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.java index 8df0cf9..f4f48b5 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.java +++ b/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.java @@ -31,7 +31,6 @@ public class ReleaseChannelMap implements Serializable { private String release; private ChannelArch channelArch; private Channel channel; - private char isDefault; // 'Y' or 'N' = /** * @return Returns the product. @@ -104,20 +103,6 @@ public class ReleaseChannelMap implements Serializable= { } = /** - * @return Returns the isDefault. - */ - public char getIsDefault() { - return isDefault; - } - = - /** - * @param isDefaultIn The isDefault to set. - */ - public void setIsDefault(char isDefaultIn) { - this.isDefault =3D isDefaultIn; - } - = - /** * {@inheritDoc} */ public boolean equals(final Object other) { @@ -129,7 +114,6 @@ public class ReleaseChannelMap implements Serializable { append(getRelease(), castOther.getRelease()). append(getVersion(), castOther.getVersion()). append(getChannelArch(), castOther.getChannelArch()). - append(getIsDefault(), castOther.getIsDefault()). append(getChannel(), castOther.getChannel()).isEquals(); } = diff --git a/java/code/src/com/redhat/rhn/domain/channel/test/ReleaseChanne= lMapTest.java b/java/code/src/com/redhat/rhn/domain/channel/test/ReleaseCha= nnelMapTest.java index 10f66ef..d67167b 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/test/ReleaseChannelMapTes= t.java +++ b/java/code/src/com/redhat/rhn/domain/channel/test/ReleaseChannelMapTes= t.java @@ -38,7 +38,6 @@ public class ReleaseChannelMapTest extends BaseTestCaseWi= thUser { rcm.setProduct(PRODUCT); rcm.setVersion(VERSION); rcm.setRelease(RELEASE); - rcm.setIsDefault('N'); TestUtils.saveAndReload(rcm); } = diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManag= erTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelMana= gerTest.java index cef8092..0e936b1 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java +++ b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java @@ -358,7 +358,6 @@ public class ChannelManagerTest extends BaseTestCaseWit= hUser { rcm.setProduct(product); rcm.setVersion(version); rcm.setRelease(release); - rcm.setIsDefault(isDefault); TestUtils.saveAndReload(rcm); } = --===============1126472768415442106==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:30 2015 Content-Type: multipart/mixed; boundary="===============5825157801395005805==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Fri, 12 Jun 2009 15:25:51 +0000 Message-ID: <20090612152551.25E711201A2@lists.fedorahosted.org> --===============5825157801395005805== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.hbm.xml = | 2 - java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.java = | 16 ---------- java/code/src/com/redhat/rhn/domain/channel/test/ReleaseChannelMapTest.jav= a | 1 = java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java = | 1 = 4 files changed, 20 deletions(-) New commits: commit d4feb1cf9f56c5838269f1e54d54e6836353d6cd Author: Devan Goodwin Date: Fri Jun 12 12:24:18 2009 -0300 Remove hibernate mappings for rhnReleaseChannelMap is_default column. diff --git a/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.= hbm.xml b/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.hbm= .xml index 4d50f66..537a26a 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.hbm.xml +++ b/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.hbm.xml @@ -25,8 +25,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" class=3D"com.redhat.rhn.domain.channel.Channel" column=3D"channel_id"/> = - = - = diff --git a/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.= java b/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.java index 8df0cf9..f4f48b5 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.java +++ b/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.java @@ -31,7 +31,6 @@ public class ReleaseChannelMap implements Serializable { private String release; private ChannelArch channelArch; private Channel channel; - private char isDefault; // 'Y' or 'N' = /** * @return Returns the product. @@ -104,20 +103,6 @@ public class ReleaseChannelMap implements Serializable= { } = /** - * @return Returns the isDefault. - */ - public char getIsDefault() { - return isDefault; - } - = - /** - * @param isDefaultIn The isDefault to set. - */ - public void setIsDefault(char isDefaultIn) { - this.isDefault =3D isDefaultIn; - } - = - /** * {@inheritDoc} */ public boolean equals(final Object other) { @@ -129,7 +114,6 @@ public class ReleaseChannelMap implements Serializable { append(getRelease(), castOther.getRelease()). append(getVersion(), castOther.getVersion()). append(getChannelArch(), castOther.getChannelArch()). - append(getIsDefault(), castOther.getIsDefault()). append(getChannel(), castOther.getChannel()).isEquals(); } = diff --git a/java/code/src/com/redhat/rhn/domain/channel/test/ReleaseChanne= lMapTest.java b/java/code/src/com/redhat/rhn/domain/channel/test/ReleaseCha= nnelMapTest.java index 10f66ef..d67167b 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/test/ReleaseChannelMapTes= t.java +++ b/java/code/src/com/redhat/rhn/domain/channel/test/ReleaseChannelMapTes= t.java @@ -38,7 +38,6 @@ public class ReleaseChannelMapTest extends BaseTestCaseWi= thUser { rcm.setProduct(PRODUCT); rcm.setVersion(VERSION); rcm.setRelease(RELEASE); - rcm.setIsDefault('N'); TestUtils.saveAndReload(rcm); } = diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManag= erTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelMana= gerTest.java index cef8092..0e936b1 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java +++ b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java @@ -358,7 +358,6 @@ public class ChannelManagerTest extends BaseTestCaseWit= hUser { rcm.setProduct(product); rcm.setVersion(version); rcm.setRelease(release); - rcm.setIsDefault(isDefault); TestUtils.saveAndReload(rcm); } = --===============5825157801395005805==-- From jdob at fedoraproject.org Thu Aug 20 11:57:30 2015 Content-Type: multipart/mixed; boundary="===============6597779275628630508==" MIME-Version: 1.0 From: jdob To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Fri, 12 Jun 2009 15:31:21 +0000 Message-ID: <20090612153121.A75711201A2@lists.fedorahosted.org> --===============6597779275628630508== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgCreateAction= Test.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit b7ba19be6acd6b49862c8be72ec10872d6168780 Author: Jason Dobies Date: Fri Jun 12 11:26:30 2009 -0400 Fixed unit test: was looking for errors as part of action messages diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/Org= CreateActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/multio= rg/test/OrgCreateActionTest.java index 2d99246..adde257 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgCreateA= ctionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgCreateA= ctionTest.java @@ -51,7 +51,7 @@ public class OrgCreateActionTest extends RhnMockStrutsTes= tCase { actionPerform(); String[] errors =3D {"errors.required", "errors.required", = "errors.required", "errors.required", "errors.required", "= errors.required"}; - verifyActionMessages(errors); + verifyActionErrors(errors); } = public void testCreateDupeUser() throws Exception { @@ -69,7 +69,7 @@ public class OrgCreateActionTest extends RhnMockStrutsTes= tCase { addRequestParameter("prefix", "Mr."); setRequestPathInfo("/admin/multiorg/OrgCreate"); actionPerform(); - verifyActionMessage("error.login_already_taken"); + verifyActionErrors(new String[]{"error.login_already_taken"}); } = } --===============6597779275628630508==-- From jdob at fedoraproject.org Thu Aug 20 11:57:30 2015 Content-Type: multipart/mixed; boundary="===============2016708361415991886==" MIME-Version: 1.0 From: jdob To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Fri, 12 Jun 2009 15:32:00 +0000 Message-ID: <20090612153200.C1EC91201A2@lists.fedorahosted.org> --===============2016708361415991886== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgCreateAction= Test.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit bc50340a663f211f5bbff0ea898f55d83ca2c8eb Author: Jason Dobies Date: Fri Jun 12 11:26:30 2009 -0400 Fixed unit test: was looking for errors as part of action messages diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/Org= CreateActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/multio= rg/test/OrgCreateActionTest.java index 2d99246..adde257 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgCreateA= ctionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgCreateA= ctionTest.java @@ -51,7 +51,7 @@ public class OrgCreateActionTest extends RhnMockStrutsTes= tCase { actionPerform(); String[] errors =3D {"errors.required", "errors.required", = "errors.required", "errors.required", "errors.required", "= errors.required"}; - verifyActionMessages(errors); + verifyActionErrors(errors); } = public void testCreateDupeUser() throws Exception { @@ -69,7 +69,7 @@ public class OrgCreateActionTest extends RhnMockStrutsTes= tCase { addRequestParameter("prefix", "Mr."); setRequestPathInfo("/admin/multiorg/OrgCreate"); actionPerform(); - verifyActionMessage("error.login_already_taken"); + verifyActionErrors(new String[]{"error.login_already_taken"}); } = } --===============2016708361415991886==-- From partha at fedoraproject.org Thu Aug 20 11:57:30 2015 Content-Type: multipart/mixed; boundary="===============4659129371107066932==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Fri, 12 Jun 2009 15:40:43 +0000 Message-ID: <20090612154043.9003B1201A2@lists.fedorahosted.org> --===============4659129371107066932== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/test/Activation= KeyHandlerTest.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) New commits: commit 5db679d984aec571fdf8ef5ab278be8428cdcded Author: Partha Aji Date: Fri Jun 12 11:43:06 2009 -0400 Unit test fix diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/tes= t/ActivationKeyHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xml= rpc/activationkey/test/ActivationKeyHandlerTest.java index 95130a8..d29f98a 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/test/Activ= ationKeyHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/test/Activ= ationKeyHandlerTest.java @@ -35,6 +35,7 @@ import com.redhat.rhn.frontend.xmlrpc.activationkey.Activ= ationKeyAlreadyExistsEx import com.redhat.rhn.frontend.xmlrpc.activationkey.ActivationKeyHandler; import com.redhat.rhn.frontend.xmlrpc.serializer.ActivationKeySerializer; import com.redhat.rhn.frontend.xmlrpc.test.BaseHandlerTestCase; +import com.redhat.rhn.manager.entitlement.EntitlementManager; import com.redhat.rhn.manager.token.ActivationKeyManager; import com.redhat.rhn.testing.ChannelTestUtils; import com.redhat.rhn.testing.ConfigTestUtils; @@ -61,8 +62,8 @@ public class ActivationKeyHandlerTest extends BaseHandler= TestCase { private static final List KEY_ENTITLEMENTS; static { KEY_ENTITLEMENTS =3D new LinkedList(); - KEY_ENTITLEMENTS.add("provisioning_entitled"); - KEY_ENTITLEMENTS.add("virtualization_host"); + KEY_ENTITLEMENTS.add(EntitlementManager.PROVISIONING_ENTITLED); + KEY_ENTITLEMENTS.add(EntitlementManager.VIRTUALIZATION_ENTITLED); } = private Channel baseChannel; @@ -96,8 +97,10 @@ public class ActivationKeyHandlerTest extends BaseHandle= rTestCase { } = public void testCreateWithBlankChannelAndUnlimitedUsageLimit() throws = Exception { + List ents =3D new ArrayList(1); + ents.add(EntitlementManager.PROVISIONING_ENTITLED); String key =3D keyHandler.create(adminKey, "", KEY_DESCRIPTION, nu= ll, = - KEY_ENTITLEMENTS, Boolean.TRUE); + ents, Boolean.TRUE); assertTrue(key.length() > 0); ActivationKey activationKey =3D ActivationKeyManager.getInstance(). lookupByKey(key, admin); --===============4659129371107066932==-- From partha at fedoraproject.org Thu Aug 20 11:57:30 2015 Content-Type: multipart/mixed; boundary="===============8112294576429339728==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Fri, 12 Jun 2009 15:41:28 +0000 Message-ID: <20090612154128.E96B81201A2@lists.fedorahosted.org> --===============8112294576429339728== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/test/Activation= KeyHandlerTest.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) New commits: commit 986c9667df829f4737b9617c15f44f56efe4012c Author: Partha Aji Date: Fri Jun 12 11:43:06 2009 -0400 Unit test fix diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/tes= t/ActivationKeyHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xml= rpc/activationkey/test/ActivationKeyHandlerTest.java index 95130a8..d29f98a 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/test/Activ= ationKeyHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/test/Activ= ationKeyHandlerTest.java @@ -35,6 +35,7 @@ import com.redhat.rhn.frontend.xmlrpc.activationkey.Activ= ationKeyAlreadyExistsEx import com.redhat.rhn.frontend.xmlrpc.activationkey.ActivationKeyHandler; import com.redhat.rhn.frontend.xmlrpc.serializer.ActivationKeySerializer; import com.redhat.rhn.frontend.xmlrpc.test.BaseHandlerTestCase; +import com.redhat.rhn.manager.entitlement.EntitlementManager; import com.redhat.rhn.manager.token.ActivationKeyManager; import com.redhat.rhn.testing.ChannelTestUtils; import com.redhat.rhn.testing.ConfigTestUtils; @@ -61,8 +62,8 @@ public class ActivationKeyHandlerTest extends BaseHandler= TestCase { private static final List KEY_ENTITLEMENTS; static { KEY_ENTITLEMENTS =3D new LinkedList(); - KEY_ENTITLEMENTS.add("provisioning_entitled"); - KEY_ENTITLEMENTS.add("virtualization_host"); + KEY_ENTITLEMENTS.add(EntitlementManager.PROVISIONING_ENTITLED); + KEY_ENTITLEMENTS.add(EntitlementManager.VIRTUALIZATION_ENTITLED); } = private Channel baseChannel; @@ -96,8 +97,10 @@ public class ActivationKeyHandlerTest extends BaseHandle= rTestCase { } = public void testCreateWithBlankChannelAndUnlimitedUsageLimit() throws = Exception { + List ents =3D new ArrayList(1); + ents.add(EntitlementManager.PROVISIONING_ENTITLED); String key =3D keyHandler.create(adminKey, "", KEY_DESCRIPTION, nu= ll, = - KEY_ENTITLEMENTS, Boolean.TRUE); + ents, Boolean.TRUE); assertTrue(key.length() > 0); ActivationKey activationKey =3D ActivationKeyManager.getInstance(). lookupByKey(key, admin); --===============8112294576429339728==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:30 2015 Content-Type: multipart/mixed; boundary="===============0222625536946478829==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 2 commits - backend/server Date: Fri, 12 Jun 2009 15:44:45 +0000 Message-ID: <20090612154445.80EB91201A2@lists.fedorahosted.org> --===============0222625536946478829== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/rhnChannel.py | 46 ++++++++++++++++++++++++++++++++++----= ----- 1 file changed, 37 insertions(+), 9 deletions(-) New commits: commit 491bfb85fec666645ddbfd3ce673eb77d17ea6fe Merge: 18dee79... 986c966... Author: Pradeep Kilambi Date: Fri Jun 12 11:44:41 2009 -0400 Merge branch 'VADER' of ssh://pkilambi(a)git.fedorahosted.org/git/space= walk into vader commit 18dee7980a40f830b19df873f593681187916f6e Author: James Bowes Date: Wed May 27 13:44:36 2009 -0400 Show all available eus channels during registration = There were two problems with the existing logic for getting applicable eus base channels during registration: - The rpm release version was compared exactly to the row in the db, vs using the first X parts (where X is 1 for rhel 4 and 3 for everything else), meaning if the redhat-release rpm was bumped during an EUS lifetime, you would see no EUS channels with the new rpm. - If your redhat-release version did match an EUS channel, the code would only return that matching channel, instead of that matching ch= annel and all newer EUS versions. - The newest EUS channel was always the 'default' channel, meaning that when registering to EUS with rhnreg_ks, the help desk for the --use-eus-channel option was wrong. = In practice, during registration a user would either only see the newest EUS channel, or no EUS channels at all. Fix the code to display all relevant EUS channels. diff --git a/backend/server/rhnChannel.py b/backend/server/rhnChannel.py index 1198cb7..292783f 100644 --- a/backend/server/rhnChannel.py +++ b/backend/server/rhnChannel.py @@ -1075,6 +1075,11 @@ def base_channel_for_rel_arch(release, server_arch, = org_id=3D-1, = def base_eus_channel_for_ver_rel_arch(version, release, server_arch, org_id=3D-1, user_id=3DNone): + """ + given a redhat-release version, release, and server arch, return a list + of dicts containing the details of the channel z streams either match = the + version/release pair, or are greater. + """ = log_debug(4, version, release, server_arch, org_id, user_id) = @@ -1082,8 +1087,7 @@ def base_eus_channel_for_ver_rel_arch(version, releas= e, server_arch, select c.id, c.label, c.name, - rcm.is_default, - c.receiving_updates + rcm.release from rhnChannelPermissions cp, rhnChannel c, @@ -1092,7 +1096,6 @@ def base_eus_channel_for_ver_rel_arch(version, releas= e, server_arch, rhnReleaseChannelMap rcm where rcm.version =3D :version - and rcm.release =3D :release and scac.server_arch_id =3D sa.id and sa.label =3D :server_arch and scac.channel_arch_id =3D rcm.channel_arch_id @@ -1104,18 +1107,43 @@ def base_eus_channel_for_ver_rel_arch(version, rele= ase, server_arch, """ = eus_channels_prepared =3D rhnSQL.prepare(eus_channels_query) - eus_channels_prepared.execute(release =3D release, - version =3D version, + eus_channels_prepared.execute(version =3D version, server_arch =3D server_arch, user_id =3D user_id, org_id =3D org_id) = - eus_channels =3D eus_channels_prepared.fetchall_dict() + channels =3D [] + while True: + channel =3D eus_channels_prepared.fetchone_dict() + if channel is None: + break = - log_debug(4, "EUS Channels are: %s" % str(eus_channels)) + # the release part of redhat-release for rhel 4 is like + # 6.1 or 7; we just look at the first digit. + # for rhel 5 and up it's the full release number of rhel, followed= by + # the true release number of the rpm, like 5.0.0.9 (for the 9th + # version of the redhat-release rpm, for RHEL GA) + db_release =3D channel['release'] + if version in ['4AS', '4ES']: + parts =3D 1 + else: + parts =3D 3 + + server_rel =3D '.'.join(release.split('.')[:parts]) + channel_rel =3D '.'.join(db_release.split('.')[:parts]) + + # XXX we're no longer using the is_default column from the db + if rpm.labelCompare(('0', server_rel, '0'), + ('0', channel_rel, '0')) =3D=3D 0: + channel['is_default'] =3D 'Y' + channels.append(channel) + if rpm.labelCompare(('0', server_rel, '0'), + ('0', channel_rel, '0')) < 0: + channel['is_default'] =3D 'N' + channels.append(channel) + + return channels = - return eus_channels - = = def get_channel_for_release_arch(release, server_arch): log_debug(3, release, server_arch) --===============0222625536946478829==-- From jortel at fedoraproject.org Thu Aug 20 11:57:30 2015 Content-Type: multipart/mixed; boundary="===============2054940310297247802==" MIME-Version: 1.0 From: Jeff Ortel To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'pgsql' - schema/spacewalk Date: Fri, 12 Jun 2009 16:10:17 +0000 Message-ID: <20090612161017.366851201A2@lists.fedorahosted.org> --===============2054940310297247802== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable schema/spacewalk/common/tables/PXTSessions.sql | 16 - schema/spacewalk/common/tables/demo_log.sql | 6 = schema/spacewalk/common/tables/rhnAction.sql | 52 += +-- schema/spacewalk/common/tables/rhnActionConfigChannel.sql | 28 +- schema/spacewalk/common/tables/rhnActionConfigDate.sql | 24 +- schema/spacewalk/common/tables/rhnActionConfigDateFile.sql | 22 +- schema/spacewalk/common/tables/rhnActionConfigFileName.sql | 30 +- schema/spacewalk/common/tables/rhnActionConfigRevision.sql | 36 += -- schema/spacewalk/common/tables/rhnActionConfigRevisionResult.sql | 18 - schema/spacewalk/common/tables/rhnActionDaemonConfig.sql | 24 +- schema/spacewalk/common/tables/rhnActionErrataUpdate.sql | 14 - schema/spacewalk/common/tables/rhnActionKickstart.sql | 24 +- schema/spacewalk/common/tables/rhnActionKickstartFileList.sql | 22 +- schema/spacewalk/common/tables/rhnActionKickstartGuest.sql | 42 += -- schema/spacewalk/common/tables/rhnActionPackage.sql | 32 += -- schema/spacewalk/common/tables/rhnActionPackageAnswerfile.sql | 18 - schema/spacewalk/common/tables/rhnActionPackageDelta.sql | 14 - schema/spacewalk/common/tables/rhnActionPackageOrder.sql | 10 = schema/spacewalk/common/tables/rhnActionPackageRemovalFailure.sql | 32 += -- schema/spacewalk/common/tables/rhnActionScript.sql | 30 +- schema/spacewalk/common/tables/rhnActionStatus.sql | 18 - schema/spacewalk/common/tables/rhnActionTransactions.sql | 20 - schema/spacewalk/common/tables/rhnActionType.sql | 24 +- schema/spacewalk/common/tables/rhnActionVirtDestroy.sql | 18 - schema/spacewalk/common/tables/rhnActionVirtReboot.sql | 18 - schema/spacewalk/common/tables/rhnActionVirtRefresh.sql | 16 - schema/spacewalk/common/tables/rhnActionVirtResume.sql | 18 - schema/spacewalk/common/tables/rhnActionVirtSchedulePoller.sql | 26 +- schema/spacewalk/common/tables/rhnActionVirtSetMemory.sql | 20 - schema/spacewalk/common/tables/rhnActionVirtShutdown.sql | 18 - schema/spacewalk/common/tables/rhnActionVirtStart.sql | 14 - schema/spacewalk/common/tables/rhnActionVirtSuspend.sql | 18 - schema/spacewalk/common/tables/rhnActionVirtVcpu.sql | 20 - schema/spacewalk/common/tables/rhnActivationKey.sql | 26 +- schema/spacewalk/common/tables/rhnAllowTrust.sql | 28 +- schema/spacewalk/common/tables/rhnAppInstallInstance.sql | 18 - schema/spacewalk/common/tables/rhnAppInstallSession.sql | 32 += -- schema/spacewalk/common/tables/rhnAppInstallSessionData.sql | 24 +- schema/spacewalk/common/tables/rhnArchType.sql | 20 - schema/spacewalk/common/tables/rhnArchTypeActions.sql | 20 - schema/spacewalk/common/tables/rhnBeehivePathMap.sql | 20 - schema/spacewalk/common/tables/rhnBlacklistObsoletes.sql | 26 +- schema/spacewalk/common/tables/rhnCVE.sql | 10 = schema/spacewalk/common/tables/rhnChannel.sql | 76 += ++---- schema/spacewalk/common/tables/rhnChannelArch.sql | 20 - schema/spacewalk/common/tables/rhnChannelCloned.sql | 22 +- schema/spacewalk/common/tables/rhnChannelComps.sql | 26 +- schema/spacewalk/common/tables/rhnChannelDownloads.sql | 20 - schema/spacewalk/common/tables/rhnChannelErrata.sql | 22 +- schema/spacewalk/common/tables/rhnChannelFamily.sql | 30 +- schema/spacewalk/common/tables/rhnChannelFamilyLicense.sql | 18 - schema/spacewalk/common/tables/rhnChannelFamilyLicenseConsent.sql | 26 +- schema/spacewalk/common/tables/rhnChannelFamilyMembers.sql | 20 - schema/spacewalk/common/tables/rhnChannelFamilyVirtSubLevel.sql | 18 - schema/spacewalk/common/tables/rhnChannelNewestPackage.sql | 26 +- schema/spacewalk/common/tables/rhnChannelNewestPackageAudit.sql | 14 - schema/spacewalk/common/tables/rhnChannelPackage.sql | 20 - schema/spacewalk/common/tables/rhnChannelPackageArchCompat.sql | 18 - schema/spacewalk/common/tables/rhnChannelParent.sql | 20 - schema/spacewalk/common/tables/rhnChannelPermission.sql | 26 +- schema/spacewalk/common/tables/rhnChannelPermissionRole.sql | 16 - schema/spacewalk/common/tables/rhnChannelProduct.sql | 26 +- schema/spacewalk/common/tables/rhnChannelTrust.sql | 22 +- schema/spacewalk/common/tables/rhnClientCapability.sql | 20 - schema/spacewalk/common/tables/rhnClientCapabilityName.sql | 12 - schema/spacewalk/common/tables/rhnConfigChannel.sql | 30 +- schema/spacewalk/common/tables/rhnConfigChannelType.sql | 24 +- schema/spacewalk/common/tables/rhnConfigContent.sql | 28 +- schema/spacewalk/common/tables/rhnConfigFile.sql | 30 +- schema/spacewalk/common/tables/rhnConfigFileFailure.sql | 28 +- schema/spacewalk/common/tables/rhnConfigFileName.sql | 14 - schema/spacewalk/common/tables/rhnConfigFileState.sql | 20 - schema/spacewalk/common/tables/rhnConfigFileType.sql | 20 - schema/spacewalk/common/tables/rhnConfigFile_foreignkeys.sql | 6 = schema/spacewalk/common/tables/rhnConfigInfo.sql | 22 +- schema/spacewalk/common/tables/rhnConfigRevision.sql | 46 += +-- schema/spacewalk/common/tables/rhnCpu.sql | 54 += +--- schema/spacewalk/common/tables/rhnCpuArch.sql | 16 - schema/spacewalk/common/tables/rhnCryptoKey.sql | 22 +- schema/spacewalk/common/tables/rhnCryptoKeyKickstart.sql | 14 - schema/spacewalk/common/tables/rhnCryptoKeyType.sql | 20 - schema/spacewalk/common/tables/rhnCustomDataKey.sql | 36 += -- schema/spacewalk/common/tables/rhnDaemonState.sql | 10 = schema/spacewalk/common/tables/rhnDailySummaryQueue.sql | 14 - schema/spacewalk/common/tables/rhnDevice.sql | 46 += +-- schema/spacewalk/common/tables/rhnDistChannelMap.sql | 16 - schema/spacewalk/common/tables/rhnDownloadType.sql | 10 = schema/spacewalk/common/tables/rhnDownloads.sql | 34 += -- schema/spacewalk/common/tables/rhnEmailAddress.sql | 26 +- schema/spacewalk/common/tables/rhnEmailAddressLog.sql | 16 - schema/spacewalk/common/tables/rhnEmailAddressState.sql | 14 - schema/spacewalk/common/tables/rhnEntitlementLog.sql | 10 = schema/spacewalk/common/tables/rhnErrata.sql | 66 += ++--- schema/spacewalk/common/tables/rhnErrataBuglist.sql | 20 - schema/spacewalk/common/tables/rhnErrataBuglistTmp.sql | 20 - schema/spacewalk/common/tables/rhnErrataCVE.sql | 20 - schema/spacewalk/common/tables/rhnErrataCloned.sql | 22 +- schema/spacewalk/common/tables/rhnErrataClonedTmp.sql | 22 +- schema/spacewalk/common/tables/rhnErrataFile.sql | 26 +- schema/spacewalk/common/tables/rhnErrataFileChannel.sql | 22 +- schema/spacewalk/common/tables/rhnErrataFileChannelTmp.sql | 22 +- schema/spacewalk/common/tables/rhnErrataFilePackage.sql | 22 +- schema/spacewalk/common/tables/rhnErrataFilePackageSource.sql | 22 +- schema/spacewalk/common/tables/rhnErrataFilePackageTmp.sql | 22 +- schema/spacewalk/common/tables/rhnErrataFileTmp.sql | 26 +- schema/spacewalk/common/tables/rhnErrataFileType.sql | 6 = schema/spacewalk/common/tables/rhnErrataKeyword.sql | 18 - schema/spacewalk/common/tables/rhnErrataKeywordTmp.sql | 18 - schema/spacewalk/common/tables/rhnErrataNotificationQueue.sql | 26 +- schema/spacewalk/common/tables/rhnErrataPackage.sql | 22 +- schema/spacewalk/common/tables/rhnErrataPackageTmp.sql | 20 - schema/spacewalk/common/tables/rhnErrataQueue.sql | 18 - schema/spacewalk/common/tables/rhnErrataSeverity.sql | 10 = schema/spacewalk/common/tables/rhnErrataTmp.sql | 62 += +--- schema/spacewalk/common/tables/rhnException.sql | 12 - schema/spacewalk/common/tables/rhnFAQ.sql | 32 += -- schema/spacewalk/common/tables/rhnFAQClass.sql | 14 - schema/spacewalk/common/tables/rhnFeature.sql | 20 - schema/spacewalk/common/tables/rhnFile.sql | 28 +- schema/spacewalk/common/tables/rhnFileDownload.sql | 22 +- schema/spacewalk/common/tables/rhnFileList.sql | 22 +- schema/spacewalk/common/tables/rhnFileListMembers.sql | 20 - schema/spacewalk/common/tables/rhnFileLocation.sql | 8 = schema/spacewalk/common/tables/rhnGrailComponentChoices.sql | 14 - schema/spacewalk/common/tables/rhnGrailComponents.sql | 20 - schema/spacewalk/common/tables/rhnIndexerWork.sql | 10 = schema/spacewalk/common/tables/rhnInfoPane.sql | 10 = schema/spacewalk/common/tables/rhnKSData.sql | 84 += ++---- schema/spacewalk/common/tables/rhnKSInstallType.sql | 20 - schema/spacewalk/common/tables/rhnKSTreeFile.sql | 26 +- schema/spacewalk/common/tables/rhnKSTreeType.sql | 20 - schema/spacewalk/common/tables/rhnKickstartChildChannel.sql | 22 +- schema/spacewalk/common/tables/rhnKickstartCommand.sql | 28 +- schema/spacewalk/common/tables/rhnKickstartCommandName.sql | 22 +- schema/spacewalk/common/tables/rhnKickstartDefaultRegToken.sql | 22 +- schema/spacewalk/common/tables/rhnKickstartDefaults.sql | 48 += +-- schema/spacewalk/common/tables/rhnKickstartIPRange.sql | 26 +- schema/spacewalk/common/tables/rhnKickstartPackage.sql | 22 +- schema/spacewalk/common/tables/rhnKickstartPreserveFileList.sql | 22 +- schema/spacewalk/common/tables/rhnKickstartScript.sql | 34 += -- schema/spacewalk/common/tables/rhnKickstartSession.sql | 98 += +++----- schema/spacewalk/common/tables/rhnKickstartSessionHistory.sql | 38 += -- schema/spacewalk/common/tables/rhnKickstartSessionState.sql | 22 +- schema/spacewalk/common/tables/rhnKickstartTimezone.sql | 16 - schema/spacewalk/common/tables/rhnKickstartVirtualizationType.sql | 22 +- schema/spacewalk/common/tables/rhnKickstartableTree.sql | 46 += +-- schema/spacewalk/common/tables/rhnMessage.sql | 26 +- schema/spacewalk/common/tables/rhnMessagePriority.sql | 10 = schema/spacewalk/common/tables/rhnMessageType.sql | 12 - schema/spacewalk/common/tables/rhnMonitor.sql | 24 +- schema/spacewalk/common/tables/rhnMonitorGranularity.sql | 10 = schema/spacewalk/common/tables/rhnOrgChannelSettings.sql | 26 +- schema/spacewalk/common/tables/rhnOrgChannelSettingsType.sql | 16 - schema/spacewalk/common/tables/rhnOrgEntitlementType.sql | 20 - schema/spacewalk/common/tables/rhnOrgEntitlements.sql | 20 - schema/spacewalk/common/tables/rhnOrgErrataCacheQueue.sql | 14 - schema/spacewalk/common/tables/rhnOrgInfo.sql | 20 - schema/spacewalk/common/tables/rhnOrgQuota.sql | 26 +- schema/spacewalk/common/tables/rhnPackage.sql | 88 += +++---- schema/spacewalk/common/tables/rhnPackageArch.sql | 20 - schema/spacewalk/common/tables/rhnPackageCapability.sql | 20 - schema/spacewalk/common/tables/rhnPackageChangeLog.sql | 28 +- schema/spacewalk/common/tables/rhnPackageConflicts.sql | 24 +- schema/spacewalk/common/tables/rhnPackageDelta.sql | 16 - schema/spacewalk/common/tables/rhnPackageDeltaElement.sql | 12 - schema/spacewalk/common/tables/rhnPackageEVR.sql | 14 - schema/spacewalk/common/tables/rhnPackageFile.sql | 46 += +-- schema/spacewalk/common/tables/rhnPackageFileDeleteQueue.sql | 8 = schema/spacewalk/common/tables/rhnPackageGroup.sql | 18 - schema/spacewalk/common/tables/rhnPackageKey.sql | 22 +- schema/spacewalk/common/tables/rhnPackageKeyAssociation.sql | 20 - schema/spacewalk/common/tables/rhnPackageKeyType.sql | 14 - schema/spacewalk/common/tables/rhnPackageNEVRA.sql | 20 - schema/spacewalk/common/tables/rhnPackageName.sql | 10 = schema/spacewalk/common/tables/rhnPackageObsoletes.sql | 24 +- schema/spacewalk/common/tables/rhnPackageProvider.sql | 14 - schema/spacewalk/common/tables/rhnPackageProvides.sql | 24 +- schema/spacewalk/common/tables/rhnPackageRequires.sql | 24 +- schema/spacewalk/common/tables/rhnPackageSense.sql | 10 = schema/spacewalk/common/tables/rhnPackageSenseMap.sql | 8 = schema/spacewalk/common/tables/rhnPackageSource.sql | 54 += +--- schema/spacewalk/common/tables/rhnPackageSyncBlacklist.sql | 20 - schema/spacewalk/common/tables/rhnPaidErrataTempCache.sql | 8 = schema/spacewalk/common/tables/rhnPathChannelMap.sql | 20 - schema/spacewalk/common/tables/rhnPrivateChannelFamily.sql | 26 +- schema/spacewalk/common/tables/rhnProduct.sql | 26 +- schema/spacewalk/common/tables/rhnProductChannel.sql | 20 - schema/spacewalk/common/tables/rhnProductLine.sql | 20 - schema/spacewalk/common/tables/rhnProductName.sql | 18 - schema/spacewalk/common/tables/rhnProvisionState.sql | 18 - schema/spacewalk/common/tables/rhnProxyInfo.sql | 10 = schema/spacewalk/common/tables/rhnPublicChannelFamily.sql | 14 - schema/spacewalk/common/tables/rhnPushClient.sql | 34 += -- schema/spacewalk/common/tables/rhnPushClientState.sql | 20 - schema/spacewalk/common/tables/rhnPushDispatcher.sql | 26 +- schema/spacewalk/common/tables/rhnRam.sql | 24 +- schema/spacewalk/common/tables/rhnRedHatCanonVersion.sql | 16 - schema/spacewalk/common/tables/rhnRegToken.sql | 38 += -- schema/spacewalk/common/tables/rhnRegTokenChannels.sql | 14 - schema/spacewalk/common/tables/rhnRegTokenConfigChannels.sql | 16 - schema/spacewalk/common/tables/rhnRegTokenEntitlement.sql | 14 - schema/spacewalk/common/tables/rhnRegTokenGroups.sql | 14 - schema/spacewalk/common/tables/rhnRegTokenOrgDefault.sql | 14 - schema/spacewalk/common/tables/rhnRegTokenPackages.sql | 24 +- schema/spacewalk/common/tables/rhnRelationshipType.sql | 16 - schema/spacewalk/common/tables/rhnReleaseChannelMap.sql | 14 - schema/spacewalk/common/tables/rhnRepoRegenQueue.sql | 28 +- schema/spacewalk/common/tables/rhnSGTypeBaseAddonCompat.sql | 10 = schema/spacewalk/common/tables/rhnSGTypeVirtSubLevel.sql | 18 - schema/spacewalk/common/tables/rhnSNPErrataQueue.sql | 12 - schema/spacewalk/common/tables/rhnSNPServerQueue.sql | 10 = schema/spacewalk/common/tables/rhnSatelliteCert.sql | 24 +- schema/spacewalk/common/tables/rhnSatelliteChannelFamily.sql | 22 +- schema/spacewalk/common/tables/rhnSatelliteInfo.sql | 28 +- schema/spacewalk/common/tables/rhnSatelliteServerGroup.sql | 22 +- schema/spacewalk/common/tables/rhnSavedSearch.sql | 30 +- schema/spacewalk/common/tables/rhnSavedSearchType.sql | 14 - schema/spacewalk/common/tables/rhnServer.sql | 72 += ++--- schema/spacewalk/common/tables/rhnServerAction.sql | 36 += -- schema/spacewalk/common/tables/rhnServerActionPackageResult.sql | 26 +- schema/spacewalk/common/tables/rhnServerActionScriptResult.sql | 28 +- schema/spacewalk/common/tables/rhnServerActionVerifyMissing.sql | 36 += -- schema/spacewalk/common/tables/rhnServerActionVerifyResult.sql | 72 += ++--- schema/spacewalk/common/tables/rhnServerArch.sql | 20 - schema/spacewalk/common/tables/rhnServerCacheInfo.sql | 8 = schema/spacewalk/common/tables/rhnServerChannel.sql | 18 - schema/spacewalk/common/tables/rhnServerChannelArchCompat.sql | 18 - schema/spacewalk/common/tables/rhnServerConfigChannel.sql | 22 +- schema/spacewalk/common/tables/rhnServerCustomDataValue.sql | 32 += -- schema/spacewalk/common/tables/rhnServerDMI.sql | 36 += -- schema/spacewalk/common/tables/rhnServerEvent.sql | 22 +- schema/spacewalk/common/tables/rhnServerGroup.sql | 36 += -- schema/spacewalk/common/tables/rhnServerGroupMembers.sql | 18 - schema/spacewalk/common/tables/rhnServerGroupNotes.sql | 32 += -- schema/spacewalk/common/tables/rhnServerGroupType.sql | 32 += -- schema/spacewalk/common/tables/rhnServerGroupTypeFeature.sql | 18 - schema/spacewalk/common/tables/rhnServerHistory.sql | 24 +- schema/spacewalk/common/tables/rhnServerInfo.sql | 14 - schema/spacewalk/common/tables/rhnServerInstallInfo.sql | 26 +- schema/spacewalk/common/tables/rhnServerLocation.sql | 38 += -- schema/spacewalk/common/tables/rhnServerLock.sql | 18 - schema/spacewalk/common/tables/rhnServerMessage.sql | 26 +- schema/spacewalk/common/tables/rhnServerNeededCache.sql | 20 - schema/spacewalk/common/tables/rhnServerNetInterface.sql | 26 +- schema/spacewalk/common/tables/rhnServerNetwork.sql | 24 +- schema/spacewalk/common/tables/rhnServerNotes.sql | 30 +- schema/spacewalk/common/tables/rhnServerPackage.sql | 20 - schema/spacewalk/common/tables/rhnServerPackageArchCompat.sql | 22 +- schema/spacewalk/common/tables/rhnServerPath.sql | 22 +- schema/spacewalk/common/tables/rhnServerPreserveFileList.sql | 20 - schema/spacewalk/common/tables/rhnServerProfile.sql | 32 += -- schema/spacewalk/common/tables/rhnServerProfilePackage.sql | 20 - schema/spacewalk/common/tables/rhnServerProfileType.sql | 20 - schema/spacewalk/common/tables/rhnServerServerGroupArchCompat.sql | 18 - schema/spacewalk/common/tables/rhnServerTokenRegs.sql | 12 - schema/spacewalk/common/tables/rhnServerUuid.sql | 8 = schema/spacewalk/common/tables/rhnSet.sql | 20 - schema/spacewalk/common/tables/rhnSnapshot.sql | 30 +- schema/spacewalk/common/tables/rhnSnapshotChannel.sql | 12 - schema/spacewalk/common/tables/rhnSnapshotConfigChannel.sql | 20 - schema/spacewalk/common/tables/rhnSnapshotConfigRevision.sql | 20 - schema/spacewalk/common/tables/rhnSnapshotInvalidReason.sql | 20 - schema/spacewalk/common/tables/rhnSnapshotPackage.sql | 12 - schema/spacewalk/common/tables/rhnSnapshotServerGroup.sql | 12 - schema/spacewalk/common/tables/rhnSnapshotTag.sql | 24 +- schema/spacewalk/common/tables/rhnSolarisPackage.sql | 22 +- schema/spacewalk/common/tables/rhnSolarisPatch.sql | 32 += -- schema/spacewalk/common/tables/rhnSolarisPatchPackages.sql | 14 - schema/spacewalk/common/tables/rhnSolarisPatchSet.sql | 24 +- schema/spacewalk/common/tables/rhnSolarisPatchSetMembers.sql | 24 +- schema/spacewalk/common/tables/rhnSolarisPatchType.sql | 10 = schema/spacewalk/common/tables/rhnSolarisPatchedPackage.sql | 20 - schema/spacewalk/common/tables/rhnSourceRPM.sql | 10 = schema/spacewalk/common/tables/rhnSsmOperation.sql | 24 +- schema/spacewalk/common/tables/rhnSsmOperationServer.sql | 14 - schema/spacewalk/common/tables/rhnSystemMigrations.sql | 20 - schema/spacewalk/common/tables/rhnTag.sql | 24 +- schema/spacewalk/common/tables/rhnTagName.sql | 16 - schema/spacewalk/common/tables/rhnTaskQueue.sql | 20 - schema/spacewalk/common/tables/rhnTemplateCategory.sql | 16 - schema/spacewalk/common/tables/rhnTemplateString.sql | 22 +- schema/spacewalk/common/tables/rhnTextMessage.sql | 18 - schema/spacewalk/common/tables/rhnTimezone.sql | 8 = schema/spacewalk/common/tables/rhnTinyURL.sql | 18 - schema/spacewalk/common/tables/rhnTransaction.sql | 28 +- schema/spacewalk/common/tables/rhnTransactionElement.sql | 12 - schema/spacewalk/common/tables/rhnTransactionOperation.sql | 22 +- schema/spacewalk/common/tables/rhnTransactionPackage.sql | 24 +- schema/spacewalk/common/tables/rhnTrustedOrgs.sql | 22 +- schema/spacewalk/common/tables/rhnUserDefaultSystemGroups.sql | 14 - schema/spacewalk/common/tables/rhnUserGroup.sql | 38 += -- schema/spacewalk/common/tables/rhnUserGroupMembers.sql | 20 - schema/spacewalk/common/tables/rhnUserGroupType.sql | 20 - schema/spacewalk/common/tables/rhnUserGroup_sequences.sql | 4 = schema/spacewalk/common/tables/rhnUserInfo.sql | 80 += ++---- schema/spacewalk/common/tables/rhnUserInfoPane.sql | 14 - schema/spacewalk/common/tables/rhnUserMessage.sql | 16 - schema/spacewalk/common/tables/rhnUserMessageStatus.sql | 10 = schema/spacewalk/common/tables/rhnUserMessageType.sql | 12 - schema/spacewalk/common/tables/rhnUserReserved.sql | 16 - schema/spacewalk/common/tables/rhnUserServerGroupPerms.sql | 22 +- schema/spacewalk/common/tables/rhnUserServerPerms.sql | 10 = schema/spacewalk/common/tables/rhnUserServerPrefs.sql | 24 +- schema/spacewalk/common/tables/rhnVersionInfo.sql | 20 - schema/spacewalk/common/tables/rhnVirtSubLevel.sql | 18 - schema/spacewalk/common/tables/rhnVirtualInstance.sql | 30 +- schema/spacewalk/common/tables/rhnVirtualInstanceEventLog.sql | 54 += +--- schema/spacewalk/common/tables/rhnVirtualInstanceEventType.sql | 20 - schema/spacewalk/common/tables/rhnVirtualInstanceInfo.sql | 30 +- schema/spacewalk/common/tables/rhnVirtualInstanceInstallLog.sql | 24 +- schema/spacewalk/common/tables/rhnVirtualInstanceState.sql | 20 - schema/spacewalk/common/tables/rhnVirtualInstanceType.sql | 20 - schema/spacewalk/common/tables/rhnVisibleObjects.sql | 12 - schema/spacewalk/common/tables/rhnWebContactChangeLog.sql | 26 +- schema/spacewalk/common/tables/rhnWebContactChangeState.sql | 8 = schema/spacewalk/common/tables/rhn_check_probe.sql | 22 +- schema/spacewalk/common/tables/rhn_check_suite_probe.sql | 18 - schema/spacewalk/common/tables/rhn_check_suites.sql | 18 - schema/spacewalk/common/tables/rhn_command.sql | 42 += -- schema/spacewalk/common/tables/rhn_command_center_state.sql | 10 = schema/spacewalk/common/tables/rhn_command_class.sql | 8 = schema/spacewalk/common/tables/rhn_command_groups.sql | 10 = schema/spacewalk/common/tables/rhn_command_param_threshold.sql | 24 +- schema/spacewalk/common/tables/rhn_command_parameter.sql | 46 += +-- schema/spacewalk/common/tables/rhn_command_queue_commands.sql | 26 +- schema/spacewalk/common/tables/rhn_command_queue_execs.sql | 26 +- schema/spacewalk/common/tables/rhn_command_queue_execs_bk.sql | 22 +- schema/spacewalk/common/tables/rhn_command_queue_instances.sql | 24 +- schema/spacewalk/common/tables/rhn_command_queue_instances_bk.sql | 20 - schema/spacewalk/common/tables/rhn_command_queue_params.sql | 10 = schema/spacewalk/common/tables/rhn_command_queue_sessions.sql | 12 - schema/spacewalk/common/tables/rhn_command_requirements.sql | 10 = schema/spacewalk/common/tables/rhn_command_target.sql | 10 = schema/spacewalk/common/tables/rhn_config_group.sql | 10 = schema/spacewalk/common/tables/rhn_config_macro.sql | 18 - schema/spacewalk/common/tables/rhn_config_parameter.sql | 14 - schema/spacewalk/common/tables/rhn_config_security_type.sql | 10 = schema/spacewalk/common/tables/rhn_contact_group_members.sql | 26 +- schema/spacewalk/common/tables/rhn_contact_groups.sql | 32 += -- schema/spacewalk/common/tables/rhn_contact_methods.sql | 48 += +-- schema/spacewalk/common/tables/rhn_current_alerts.sql | 56 += +--- schema/spacewalk/common/tables/rhn_current_state_summaries.sql | 12 - schema/spacewalk/common/tables/rhn_db_environment.sql | 10 = schema/spacewalk/common/tables/rhn_deployed_probe.sql | 44 += +-- schema/spacewalk/common/tables/rhn_environment.sql | 10 = schema/spacewalk/common/tables/rhn_host_check_suites.sql | 10 = schema/spacewalk/common/tables/rhn_host_probe.sql | 22 +- schema/spacewalk/common/tables/rhn_interface_monitoring.sql | 10 = schema/spacewalk/common/tables/rhn_ll_netsaint.sql | 6 = schema/spacewalk/common/tables/rhn_method_types.sql | 16 - schema/spacewalk/common/tables/rhn_metrics.sql | 18 - schema/spacewalk/common/tables/rhn_multi_scout_threshold.sql | 20 - schema/spacewalk/common/tables/rhn_notification_formats.sql | 24 +- schema/spacewalk/common/tables/rhn_notifservers.sql | 10 = schema/spacewalk/common/tables/rhn_os.sql | 10 = schema/spacewalk/common/tables/rhn_os_commands_xref.sql | 6 = schema/spacewalk/common/tables/rhn_pager_types.sql | 12 - schema/spacewalk/common/tables/rhn_physical_location.sql | 34 += -- schema/spacewalk/common/tables/rhn_probe.sql | 38 += -- schema/spacewalk/common/tables/rhn_probe_param_value.sql | 18 - schema/spacewalk/common/tables/rhn_probe_state.sql | 12 - schema/spacewalk/common/tables/rhn_probe_types.sql | 10 = schema/spacewalk/common/tables/rhn_quanta.sql | 16 - schema/spacewalk/common/tables/rhn_redirect_criteria.sql | 20 - schema/spacewalk/common/tables/rhn_redirect_email_targets.sql | 8 = schema/spacewalk/common/tables/rhn_redirect_group_targets.sql | 8 = schema/spacewalk/common/tables/rhn_redirect_match_types.sql | 8 = schema/spacewalk/common/tables/rhn_redirect_method_targets.sql | 10 = schema/spacewalk/common/tables/rhn_redirect_types.sql | 12 - schema/spacewalk/common/tables/rhn_redirects.sql | 50 += +-- schema/spacewalk/common/tables/rhn_sat_cluster.sql | 40 += -- schema/spacewalk/common/tables/rhn_sat_cluster_probe.sql | 20 - schema/spacewalk/common/tables/rhn_sat_node.sql | 48 += +-- schema/spacewalk/common/tables/rhn_sat_node_probe.sql | 20 - schema/spacewalk/common/tables/rhn_satellite_state.sql | 38 += -- schema/spacewalk/common/tables/rhn_schedule_days.sql | 36 += -- schema/spacewalk/common/tables/rhn_schedule_days_norm.sql | 10 = schema/spacewalk/common/tables/rhn_schedule_types.sql | 12 - schema/spacewalk/common/tables/rhn_schedule_weeks.sql | 22 +- schema/spacewalk/common/tables/rhn_schedules.sql | 22 +- schema/spacewalk/common/tables/rhn_semantic_data_type.sql | 20 - schema/spacewalk/common/tables/rhn_server_monitoring_info.sql | 10 = schema/spacewalk/common/tables/rhn_service_probe_origins.sql | 14 - schema/spacewalk/common/tables/rhn_snmp_alert.sql | 44 += +-- schema/spacewalk/common/tables/rhn_strategies.sql | 24 +- schema/spacewalk/common/tables/rhn_threshold_type.sql | 16 - schema/spacewalk/common/tables/rhn_time_zone_names.sql | 20 - schema/spacewalk/common/tables/rhn_units.sql | 24 +- schema/spacewalk/common/tables/rhn_url_probe.sql | 54 += +--- schema/spacewalk/common/tables/rhn_url_probe_step.sql | 106 += ++++----- schema/spacewalk/common/tables/rhn_widget.sql | 14 - schema/spacewalk/common/tables/state_change.sql | 8 = schema/spacewalk/common/tables/valid_countries.sql | 10 = schema/spacewalk/common/tables/web_contact.sql | 44 += +-- schema/spacewalk/common/tables/web_customer.sql | 38 += -- schema/spacewalk/common/tables/web_customer_notification.sql | 18 - schema/spacewalk/common/tables/web_user_contact_permission.sql | 40 += -- schema/spacewalk/common/tables/web_user_personal_info.sql | 56 += +--- schema/spacewalk/common/tables/web_user_prefix.sql | 6 = schema/spacewalk/common/tables/web_user_site_info.sql | 80 += ++---- schema/spacewalk/common/tables/web_user_site_type.sql | 8 = 401 files changed, 4596 insertions(+), 4596 deletions(-) New commits: commit c8a57a89b7d144079d649c8c4d20d33e99726758 Author: Jeff Ortel Date: Fri Jun 12 10:57:37 2009 -0500 Remove trailing whitespace diff --git a/schema/spacewalk/common/tables/PXTSessions.sql b/schema/spacew= alk/common/tables/PXTSessions.sql index 0c1e63c..7378aa7 100644 --- a/schema/spacewalk/common/tables/PXTSessions.sql +++ b/schema/spacewalk/common/tables/PXTSessions.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE PXTSessions ( - id NUMBER, = - web_user_id NUMBER = + id NUMBER, + web_user_id NUMBER CONSTRAINT pxtsessions_user - REFERENCES web_contact (id) = - ON DELETE CASCADE, = - expires NUMBER = - DEFAULT (0) NOT NULL, = + REFERENCES web_contact (id) + ON DELETE CASCADE, + expires NUMBER + DEFAULT (0) NOT NULL, value VARCHAR2(4000) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/demo_log.sql b/schema/spacewalk= /common/tables/demo_log.sql index 0c6b785..a59b873 100644 --- a/schema/spacewalk/common/tables/demo_log.sql +++ b/schema/spacewalk/common/tables/demo_log.sql @@ -7,16 +7,16 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE demo_log ( - org_id NUMBER, = + org_id NUMBER, server_id NUMBER ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnAction.sql b/schema/spacewal= k/common/tables/rhnAction.sql index 522169f..559e3c6 100644 --- a/schema/spacewalk/common/tables/rhnAction.sql +++ b/schema/spacewalk/common/tables/rhnAction.sql @@ -7,44 +7,44 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnAction ( - id NUMBER NOT NULL = - CONSTRAINT rhn_action_pk PRIMARY KEY = - USING INDEX TABLESPACE [[4m_tbs]], = - org_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_action_pk PRIMARY KEY + USING INDEX TABLESPACE [[4m_tbs]], + org_id NUMBER NOT NULL CONSTRAINT rhn_action_oid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - action_type NUMBER NOT NULL = + REFERENCES web_customer (id) + ON DELETE CASCADE, + action_type NUMBER NOT NULL CONSTRAINT rhn_action_at_fk - REFERENCES rhnActionType (id), = - name VARCHAR2(128), = - scheduler NUMBER = + REFERENCES rhnActionType (id), + name VARCHAR2(128), + scheduler NUMBER CONSTRAINT rhn_action_scheduler_fk - REFERENCES web_contact (id) = - ON DELETE SET NULL, = - earliest_action DATE NOT NULL, = - version NUMBER = - DEFAULT (0) NOT NULL, = - archived NUMBER = - DEFAULT (0) NOT NULL = + REFERENCES web_contact (id) + ON DELETE SET NULL, + earliest_action DATE NOT NULL, + version NUMBER + DEFAULT (0) NOT NULL, + archived NUMBER + DEFAULT (0) NOT NULL CONSTRAINT rhn_action_archived_ck - CHECK (archived in ( 0 , 1 )), = - prerequisite NUMBER = + CHECK (archived in ( 0 , 1 )), + prerequisite NUMBER CONSTRAINT rhn_action_prereq_fk - REFERENCES rhnAction (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnAction (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnActionConfigChannel.sql b/sc= hema/spacewalk/common/tables/rhnActionConfigChannel.sql index 7f4f417..fb617d6 100644 --- a/schema/spacewalk/common/tables/rhnActionConfigChannel.sql +++ b/schema/spacewalk/common/tables/rhnActionConfigChannel.sql @@ -7,29 +7,29 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionConfigChannel ( - action_id NUMBER NOT NULL = + action_id NUMBER NOT NULL CONSTRAINT rhn_actioncc_aid_fk - REFERENCES rhnAction (id) = - ON DELETE CASCADE, = - server_id NUMBER NOT NULL = + REFERENCES rhnAction (id) + ON DELETE CASCADE, + server_id NUMBER NOT NULL CONSTRAINT rhn_actioncc_sid_fk - REFERENCES rhnServer (id), = - config_channel_id NUMBER NOT NULL = + REFERENCES rhnServer (id), + config_channel_id NUMBER NOT NULL CONSTRAINT rhn_actioncc_ccid_fk - REFERENCES rhnConfigChannel (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnConfigChannel (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT @@ -49,6 +49,6 @@ CREATE INDEX rhn_act_cc_ccid_aid_sid_idx = ALTER TABLE rhnActionConfigChannel ADD CONSTRAINT rhn_actioncc_sid_aid_fk FOREIGN KEY (server_id, action_= id) - REFERENCES rhnServerAction (server_id, action_id) = + REFERENCES rhnServerAction (server_id, action_id) ON DELETE CASCADE; = diff --git a/schema/spacewalk/common/tables/rhnActionConfigDate.sql b/schem= a/spacewalk/common/tables/rhnActionConfigDate.sql index 9a0721f..43a7d39 100644 --- a/schema/spacewalk/common/tables/rhnActionConfigDate.sql +++ b/schema/spacewalk/common/tables/rhnActionConfigDate.sql @@ -7,27 +7,27 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionConfigDate ( - action_id NUMBER NOT NULL = + action_id NUMBER NOT NULL CONSTRAINT rhn_actioncd_aid_fk - REFERENCES rhnAction (id) = - ON DELETE CASCADE, = - start_date DATE NOT NULL, = - end_date DATE, = - import_contents CHAR(1) NOT NULL = + REFERENCES rhnAction (id) + ON DELETE CASCADE, + start_date DATE NOT NULL, + end_date DATE, + import_contents CHAR(1) NOT NULL CONSTRAINT rhn_actioncd_file_ic_ck - CHECK (import_contents in ( 'Y' , 'N' )), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + CHECK (import_contents in ( 'Y' , 'N' )), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnActionConfigDateFile.sql b/s= chema/spacewalk/common/tables/rhnActionConfigDateFile.sql index bbd4d36..7af75b9 100644 --- a/schema/spacewalk/common/tables/rhnActionConfigDateFile.sql +++ b/schema/spacewalk/common/tables/rhnActionConfigDateFile.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionConfigDateFile ( - action_id NUMBER NOT NULL = + action_id NUMBER NOT NULL CONSTRAINT rhn_actioncd_file_aid_fk - REFERENCES rhnAction (id) = - ON DELETE CASCADE, = - file_name VARCHAR2(512) NOT NULL, = - file_type CHAR(1) NOT NULL = + REFERENCES rhnAction (id) + ON DELETE CASCADE, + file_name VARCHAR2(512) NOT NULL, + file_type CHAR(1) NOT NULL CONSTRAINT rhn_actioncd_file_ft_ck - CHECK (file_type in ( 'W' , 'B' )), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + CHECK (file_type in ( 'W' , 'B' )), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnActionConfigFileName.sql b/s= chema/spacewalk/common/tables/rhnActionConfigFileName.sql index d88463e..a685db8 100644 --- a/schema/spacewalk/common/tables/rhnActionConfigFileName.sql +++ b/schema/spacewalk/common/tables/rhnActionConfigFileName.sql @@ -7,30 +7,30 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionConfigFileName ( - action_id NUMBER NOT NULL, = - server_id NUMBER NOT NULL, = - config_file_name_id NUMBER NOT NULL = + action_id NUMBER NOT NULL, + server_id NUMBER NOT NULL, + config_file_name_id NUMBER NOT NULL CONSTRAINT rhn_actioncf_name_cfnid_fk - REFERENCES rhnConfigFileName (id), = - config_revision_id NUMBER = + REFERENCES rhnConfigFileName (id), + config_revision_id NUMBER CONSTRAINT rhn_actioncf_name_crid_fk - REFERENCES rhnConfigRevision (id) = - ON DELETE SET NULL, = - failure_id NUMBER = + REFERENCES rhnConfigRevision (id) + ON DELETE SET NULL, + failure_id NUMBER CONSTRAINT rhn_actioncf_failure_id_fk - REFERENCES rhnConfigFileFailure (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnConfigFileFailure (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT @@ -50,6 +50,6 @@ CREATE INDEX rhn_act_cnfg_fn_crid_idx = ALTER TABLE rhnActionConfigFileName ADD CONSTRAINT rhn_actioncf_name_aid_sid_fk FOREIGN KEY (server_id, ac= tion_id) - REFERENCES rhnServerAction (server_id, action_id) = + REFERENCES rhnServerAction (server_id, action_id) ON DELETE CASCADE; = diff --git a/schema/spacewalk/common/tables/rhnActionConfigRevision.sql b/s= chema/spacewalk/common/tables/rhnActionConfigRevision.sql index a7b26e9..ed3f063 100644 --- a/schema/spacewalk/common/tables/rhnActionConfigRevision.sql +++ b/schema/spacewalk/common/tables/rhnActionConfigRevision.sql @@ -7,35 +7,35 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionConfigRevision ( - id NUMBER NOT NULL = - CONSTRAINT rhn_actioncr_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]], = - action_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_actioncr_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]], + action_id NUMBER NOT NULL CONSTRAINT rhn_actioncr_aid_fk - REFERENCES rhnAction (id) = - ON DELETE CASCADE, = - server_id NUMBER NOT NULL = + REFERENCES rhnAction (id) + ON DELETE CASCADE, + server_id NUMBER NOT NULL CONSTRAINT rhn_actioncr_sid_fk - REFERENCES rhnServer (id), = - config_revision_id NUMBER NOT NULL = + REFERENCES rhnServer (id), + config_revision_id NUMBER NOT NULL CONSTRAINT rhn_actioncr_crid_fk - REFERENCES rhnConfigRevision (id) = - ON DELETE CASCADE, = - failure_id NUMBER = + REFERENCES rhnConfigRevision (id) + ON DELETE CASCADE, + failure_id NUMBER CONSTRAINT rhn_actioncr_failid_fk - REFERENCES rhnConfigFileFailure (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnConfigFileFailure (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnActionConfigRevisionResult.s= ql b/schema/spacewalk/common/tables/rhnActionConfigRevisionResult.sql index 3b9153c..cd71c23 100644 --- a/schema/spacewalk/common/tables/rhnActionConfigRevisionResult.sql +++ b/schema/spacewalk/common/tables/rhnActionConfigRevisionResult.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionConfigRevisionResult ( - action_config_revision_id NUMBER NOT NULL = + action_config_revision_id NUMBER NOT NULL CONSTRAINT rhn_actioncfr_acrid_fk - REFERENCES rhnActionConfigRevision = (id) = - ON DELETE CASCADE, = - result BLOB, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnActionConfigRevision = (id) + ON DELETE CASCADE, + result BLOB, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnActionDaemonConfig.sql b/sch= ema/spacewalk/common/tables/rhnActionDaemonConfig.sql index 6090c47..23eb766 100644 --- a/schema/spacewalk/common/tables/rhnActionDaemonConfig.sql +++ b/schema/spacewalk/common/tables/rhnActionDaemonConfig.sql @@ -7,27 +7,27 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionDaemonConfig ( - action_id NUMBER NOT NULL = + action_id NUMBER NOT NULL CONSTRAINT rhn_actiondc_aid_fk - REFERENCES rhnAction (id) = - ON DELETE CASCADE, = - interval NUMBER NOT NULL, = - restart CHAR(1) = - DEFAULT ('Y') NOT NULL = + REFERENCES rhnAction (id) + ON DELETE CASCADE, + interval NUMBER NOT NULL, + restart CHAR(1) + DEFAULT ('Y') NOT NULL CONSTRAINT rhn_actiondc_rest_ck - CHECK (restart in ( 'Y' , 'N' )), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + CHECK (restart in ( 'Y' , 'N' )), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnActionErrataUpdate.sql b/sch= ema/spacewalk/common/tables/rhnActionErrataUpdate.sql index 455eb17..51025d9 100644 --- a/schema/spacewalk/common/tables/rhnActionErrataUpdate.sql +++ b/schema/spacewalk/common/tables/rhnActionErrataUpdate.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionErrataUpdate ( - action_id NUMBER NOT NULL = + action_id NUMBER NOT NULL CONSTRAINT rhn_act_eu_act_fk - REFERENCES rhnAction (id) = - ON DELETE CASCADE, = - errata_id NUMBER NOT NULL = + REFERENCES rhnAction (id) + ON DELETE CASCADE, + errata_id NUMBER NOT NULL CONSTRAINT rhn_act_eu_err_fk - REFERENCES rhnErrata (id) = + REFERENCES rhnErrata (id) ON DELETE CASCADE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnActionKickstart.sql b/schema= /spacewalk/common/tables/rhnActionKickstart.sql index decca63..d5f0403 100644 --- a/schema/spacewalk/common/tables/rhnActionKickstart.sql +++ b/schema/spacewalk/common/tables/rhnActionKickstart.sql @@ -7,27 +7,27 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionKickstart ( - id NUMBER NOT NULL, = - action_id NUMBER NOT NULL = + id NUMBER NOT NULL, + action_id NUMBER NOT NULL CONSTRAINT rhn_actionks_aid_fk - REFERENCES rhnAction (id) = - ON DELETE CASCADE, = - append_string VARCHAR2(1024), = - kickstart_host VARCHAR2(256), = - static_device VARCHAR2(32), = + REFERENCES rhnAction (id) + ON DELETE CASCADE, + append_string VARCHAR2(1024), + kickstart_host VARCHAR2(256), + static_device VARCHAR2(32), cobbler_system_name VARCHAR2(256), - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnActionKickstartFileList.sql = b/schema/spacewalk/common/tables/rhnActionKickstartFileList.sql index 4edddc4..d69adfc 100644 --- a/schema/spacewalk/common/tables/rhnActionKickstartFileList.sql +++ b/schema/spacewalk/common/tables/rhnActionKickstartFileList.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionKickstartFileList ( - action_ks_id NUMBER NOT NULL = + action_ks_id NUMBER NOT NULL CONSTRAINT rhn_actionksfl_askid_fk - REFERENCES rhnActionKickstart (id) = - ON DELETE CASCADE, = - file_list_id NUMBER NOT NULL = + REFERENCES rhnActionKickstart (id) + ON DELETE CASCADE, + file_list_id NUMBER NOT NULL CONSTRAINT rhn_actionksfl_flid_fk - REFERENCES rhnFileList (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnFileList (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnActionKickstartGuest.sql b/s= chema/spacewalk/common/tables/rhnActionKickstartGuest.sql index 6104dc8..3139e9a 100644 --- a/schema/spacewalk/common/tables/rhnActionKickstartGuest.sql +++ b/schema/spacewalk/common/tables/rhnActionKickstartGuest.sql @@ -7,36 +7,36 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionKickstartGuest ( - id NUMBER NOT NULL, = - action_id NUMBER NOT NULL = + id NUMBER NOT NULL, + action_id NUMBER NOT NULL CONSTRAINT rhn_actionks_xenguest_aid_fk - REFERENCES rhnAction (id) = - ON DELETE CASCADE, = - append_string VARCHAR2(1024), = - ks_session_id NUMBER = + REFERENCES rhnAction (id) + ON DELETE CASCADE, + append_string VARCHAR2(1024), + ks_session_id NUMBER CONSTRAINT rhn_actionks_xenguest_ksid_fk - REFERENCES rhnKickstartSession (id) = - ON DELETE CASCADE, = - guest_name VARCHAR2(256), = - mem_kb NUMBER, = - vcpus NUMBER, = - disk_gb NUMBER, = - cobbler_system_name VARCHAR2(256), = - disk_path VARCHAR2(256), = - virt_bridge VARCHAR2(256), = - kickstart_host VARCHAR2(256), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnKickstartSession (id) + ON DELETE CASCADE, + guest_name VARCHAR2(256), + mem_kb NUMBER, + vcpus NUMBER, + disk_gb NUMBER, + cobbler_system_name VARCHAR2(256), + disk_path VARCHAR2(256), + virt_bridge VARCHAR2(256), + kickstart_host VARCHAR2(256), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnActionPackage.sql b/schema/s= pacewalk/common/tables/rhnActionPackage.sql index 3ce6835..e82002c 100644 --- a/schema/spacewalk/common/tables/rhnActionPackage.sql +++ b/schema/spacewalk/common/tables/rhnActionPackage.sql @@ -7,33 +7,33 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionPackage ( - id NUMBER NOT NULL = - CONSTRAINT rhn_act_p_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[8m_tbs]], = - action_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_act_p_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[8m_tbs]], + action_id NUMBER NOT NULL CONSTRAINT rhn_act_p_act_fk - REFERENCES rhnAction (id) = - ON DELETE CASCADE, = - parameter VARCHAR2(128) = - DEFAULT ('upgrade') NOT NULL = + REFERENCES rhnAction (id) + ON DELETE CASCADE, + parameter VARCHAR2(128) + DEFAULT ('upgrade') NOT NULL CONSTRAINT rhn_act_p_param_ck - CHECK (parameter IN ( 'upgrade' , 'install' ,= 'remove' , 'downgrade' )), = - name_id NUMBER NOT NULL = + CHECK (parameter IN ( 'upgrade' , 'install' ,= 'remove' , 'downgrade' )), + name_id NUMBER NOT NULL CONSTRAINT rhn_act_p_name_fk - REFERENCES rhnPackageName (id), = - evr_id NUMBER = + REFERENCES rhnPackageName (id), + evr_id NUMBER CONSTRAINT rhn_act_p_evr_fk - REFERENCES rhnPackageEvr (id), = - package_arch_id NUMBER = + REFERENCES rhnPackageEvr (id), + package_arch_id NUMBER CONSTRAINT rhn_act_p_paid_fk REFERENCES rhnPackageArch (id) ) diff --git a/schema/spacewalk/common/tables/rhnActionPackageAnswerfile.sql = b/schema/spacewalk/common/tables/rhnActionPackageAnswerfile.sql index bc52131..124a2fe 100644 --- a/schema/spacewalk/common/tables/rhnActionPackageAnswerfile.sql +++ b/schema/spacewalk/common/tables/rhnActionPackageAnswerfile.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionPackageAnswerfile ( - action_package_id NUMBER NOT NULL = + action_package_id NUMBER NOT NULL CONSTRAINT rhn_act_p_af_apid_fk - REFERENCES rhnActionPackage (id) = - ON DELETE CASCADE, = - answerfile BLOB, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnActionPackage (id) + ON DELETE CASCADE, + answerfile BLOB, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) TABLESPACE [[blob]] diff --git a/schema/spacewalk/common/tables/rhnActionPackageDelta.sql b/sch= ema/spacewalk/common/tables/rhnActionPackageDelta.sql index 8851991..da415e3 100644 --- a/schema/spacewalk/common/tables/rhnActionPackageDelta.sql +++ b/schema/spacewalk/common/tables/rhnActionPackageDelta.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionPackageDelta ( - action_id NUMBER NOT NULL = + action_id NUMBER NOT NULL CONSTRAINT rhn_act_pd_aid_fk - REFERENCES rhnAction (id) = - ON DELETE CASCADE, = - package_delta_id NUMBER NOT NULL = + REFERENCES rhnAction (id) + ON DELETE CASCADE, + package_delta_id NUMBER NOT NULL CONSTRAINT rhn_act_pd_pdid_fk - REFERENCES rhnPackageDelta (id) = + REFERENCES rhnPackageDelta (id) ON DELETE CASCADE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnActionPackageOrder.sql b/sch= ema/spacewalk/common/tables/rhnActionPackageOrder.sql index b1a4e2a..d869827 100644 --- a/schema/spacewalk/common/tables/rhnActionPackageOrder.sql +++ b/schema/spacewalk/common/tables/rhnActionPackageOrder.sql @@ -7,19 +7,19 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionPackageOrder ( - action_package_id NUMBER NOT NULL = + action_package_id NUMBER NOT NULL CONSTRAINT rhn_act_pkg_apid_fk - REFERENCES rhnActionPackage (id) = - ON DELETE CASCADE, = + REFERENCES rhnActionPackage (id) + ON DELETE CASCADE, package_order NUMBER NOT NULL ) TABLESPACE [[8m_data_tbs]] diff --git a/schema/spacewalk/common/tables/rhnActionPackageRemovalFailure.= sql b/schema/spacewalk/common/tables/rhnActionPackageRemovalFailure.sql index e8490a0..c816bb4 100644 --- a/schema/spacewalk/common/tables/rhnActionPackageRemovalFailure.sql +++ b/schema/spacewalk/common/tables/rhnActionPackageRemovalFailure.sql @@ -7,35 +7,35 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionPackageRemovalFailure ( - server_id NUMBER NOT NULL = + server_id NUMBER NOT NULL CONSTRAINT rhn_apr_failure_sid_fk - REFERENCES rhnServer (id), = - action_id NUMBER NOT NULL = + REFERENCES rhnServer (id), + action_id NUMBER NOT NULL CONSTRAINT rhn_apr_failure_aid_fk - REFERENCES rhnAction (id) = - ON DELETE CASCADE, = - name_id NUMBER NOT NULL = + REFERENCES rhnAction (id) + ON DELETE CASCADE, + name_id NUMBER NOT NULL CONSTRAINT rhn_apr_failure_nid_fk - REFERENCES rhnPackageName (id), = - evr_id NUMBER NOT NULL = + REFERENCES rhnPackageName (id), + evr_id NUMBER NOT NULL CONSTRAINT rhn_apr_failure_eid_fk - REFERENCES rhnPackageEVR (id), = - capability_id NUMBER NOT NULL = + REFERENCES rhnPackageEVR (id), + capability_id NUMBER NOT NULL CONSTRAINT rhn_apr_failure_capid_fk - REFERENCES rhnPackageCapability (id), = - flags NUMBER NOT NULL, = - suggested NUMBER = + REFERENCES rhnPackageCapability (id), + flags NUMBER NOT NULL, + suggested NUMBER CONSTRAINT rhn_apr_failure_suggested_fk - REFERENCES rhnPackageName (id), = + REFERENCES rhnPackageName (id), sense NUMBER NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnActionScript.sql b/schema/sp= acewalk/common/tables/rhnActionScript.sql index 0bb9ac7..c3172ae 100644 --- a/schema/spacewalk/common/tables/rhnActionScript.sql +++ b/schema/spacewalk/common/tables/rhnActionScript.sql @@ -7,29 +7,29 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionScript ( - id NUMBER NOT NULL = - CONSTRAINT rhn_actscript_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[4m_tbs]], = - action_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_actscript_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[4m_tbs]], + action_id NUMBER NOT NULL CONSTRAINT rhn_actscript_aid_fk - REFERENCES rhnAction (id) = - ON DELETE CASCADE, = - username VARCHAR2(32) NOT NULL, = - groupname VARCHAR2(32) NOT NULL, = - script BLOB, = - timeout NUMBER, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnAction (id) + ON DELETE CASCADE, + username VARCHAR2(32) NOT NULL, + groupname VARCHAR2(32) NOT NULL, + script BLOB, + timeout NUMBER, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) TABLESPACE [[blob]] diff --git a/schema/spacewalk/common/tables/rhnActionStatus.sql b/schema/sp= acewalk/common/tables/rhnActionStatus.sql index c9ac60a..d6785cb 100644 --- a/schema/spacewalk/common/tables/rhnActionStatus.sql +++ b/schema/spacewalk/common/tables/rhnActionStatus.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionStatus ( - id NUMBER NOT NULL = - CONSTRAINT rhn_action_status_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - name VARCHAR2(16), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_action_status_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + name VARCHAR2(16), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnActionTransactions.sql b/sch= ema/spacewalk/common/tables/rhnActionTransactions.sql index 87cfd54..dd7bda0 100644 --- a/schema/spacewalk/common/tables/rhnActionTransactions.sql +++ b/schema/spacewalk/common/tables/rhnActionTransactions.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionTransactions ( - action_id NUMBER NOT NULL = + action_id NUMBER NOT NULL CONSTRAINT rhn_at_aid_fk - REFERENCES rhnAction (id) = - ON DELETE CASCADE, = - from_trans_id NUMBER NOT NULL = + REFERENCES rhnAction (id) + ON DELETE CASCADE, + from_trans_id NUMBER NOT NULL CONSTRAINT rhn_at_ftid_fk - REFERENCES rhnTransaction (id) = - ON DELETE CASCADE, = - to_trans_id NUMBER NOT NULL = + REFERENCES rhnTransaction (id) + ON DELETE CASCADE, + to_trans_id NUMBER NOT NULL CONSTRAINT rhn_at_ttid_fk - REFERENCES rhnTransaction (id) = + REFERENCES rhnTransaction (id) ON DELETE CASCADE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnActionType.sql b/schema/spac= ewalk/common/tables/rhnActionType.sql index 397c472..6c78c28 100644 --- a/schema/spacewalk/common/tables/rhnActionType.sql +++ b/schema/spacewalk/common/tables/rhnActionType.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionType ( - id NUMBER NOT NULL = - CONSTRAINT rhn_action_type_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - label VARCHAR2(48) NOT NULL, = - name VARCHAR2(100) NOT NULL, = - trigger_snapshot CHAR(1) = - DEFAULT ('N') NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_action_type_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + label VARCHAR2(48) NOT NULL, + name VARCHAR2(100) NOT NULL, + trigger_snapshot CHAR(1) + DEFAULT ('N') NOT NULL CONSTRAINT rhn_action_type_trigsnap_ck - CHECK (trigger_snapshot in ( 'Y' , 'N' )), = - unlocked_only CHAR(1) = - DEFAULT ('N') NOT NULL = + CHECK (trigger_snapshot in ( 'Y' , 'N' )), + unlocked_only CHAR(1) + DEFAULT ('N') NOT NULL CONSTRAINT rhn_action_type_unlck_ck CHECK (unlocked_only in ( 'Y' , 'N' )) ) diff --git a/schema/spacewalk/common/tables/rhnActionVirtDestroy.sql b/sche= ma/spacewalk/common/tables/rhnActionVirtDestroy.sql index 7af55fc..cc78021 100644 --- a/schema/spacewalk/common/tables/rhnActionVirtDestroy.sql +++ b/schema/spacewalk/common/tables/rhnActionVirtDestroy.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionVirtDestroy ( - action_id NUMBER NOT NULL = + action_id NUMBER NOT NULL CONSTRAINT rhn_avd_aid_fk - REFERENCES rhnAction (id) = - ON DELETE CASCADE, = - uuid VARCHAR2(128) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnAction (id) + ON DELETE CASCADE, + uuid VARCHAR2(128) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnActionVirtReboot.sql b/schem= a/spacewalk/common/tables/rhnActionVirtReboot.sql index 2a5f707..0b7c7f0 100644 --- a/schema/spacewalk/common/tables/rhnActionVirtReboot.sql +++ b/schema/spacewalk/common/tables/rhnActionVirtReboot.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionVirtReboot ( - action_id NUMBER NOT NULL = + action_id NUMBER NOT NULL CONSTRAINT rhn_avreboot_aid_fk - REFERENCES rhnAction (id) = - ON DELETE CASCADE, = - uuid VARCHAR2(128) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnAction (id) + ON DELETE CASCADE, + uuid VARCHAR2(128) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnActionVirtRefresh.sql b/sche= ma/spacewalk/common/tables/rhnActionVirtRefresh.sql index a589e95..0891f0a 100644 --- a/schema/spacewalk/common/tables/rhnActionVirtRefresh.sql +++ b/schema/spacewalk/common/tables/rhnActionVirtRefresh.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionVirtRefresh ( - action_id NUMBER NOT NULL = + action_id NUMBER NOT NULL CONSTRAINT rhn_avrefresh_aid_fk - REFERENCES rhnAction (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnAction (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnActionVirtResume.sql b/schem= a/spacewalk/common/tables/rhnActionVirtResume.sql index b0a4962..d3d6ad1 100644 --- a/schema/spacewalk/common/tables/rhnActionVirtResume.sql +++ b/schema/spacewalk/common/tables/rhnActionVirtResume.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionVirtResume ( - action_id NUMBER NOT NULL = + action_id NUMBER NOT NULL CONSTRAINT rhn_avresume_aid_fk - REFERENCES rhnAction (id) = - ON DELETE CASCADE, = - uuid VARCHAR2(128) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnAction (id) + ON DELETE CASCADE, + uuid VARCHAR2(128) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnActionVirtSchedulePoller.sql= b/schema/spacewalk/common/tables/rhnActionVirtSchedulePoller.sql index c3b5efb..69f58e5 100644 --- a/schema/spacewalk/common/tables/rhnActionVirtSchedulePoller.sql +++ b/schema/spacewalk/common/tables/rhnActionVirtSchedulePoller.sql @@ -7,27 +7,27 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionVirtSchedulePoller ( - action_id NUMBER NOT NULL = + action_id NUMBER NOT NULL CONSTRAINT rhn_avsp_aid_fk - REFERENCES rhnAction (id) = - ON DELETE CASCADE, = - minute NUMBER, = - hour NUMBER, = - dom NUMBER, = - month NUMBER, = - dow NUMBER, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnAction (id) + ON DELETE CASCADE, + minute NUMBER, + hour NUMBER, + dom NUMBER, + month NUMBER, + dow NUMBER, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnActionVirtSetMemory.sql b/sc= hema/spacewalk/common/tables/rhnActionVirtSetMemory.sql index 928d1a2..e0b7023 100644 --- a/schema/spacewalk/common/tables/rhnActionVirtSetMemory.sql +++ b/schema/spacewalk/common/tables/rhnActionVirtSetMemory.sql @@ -7,24 +7,24 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionVirtSetMemory ( - action_id NUMBER NOT NULL = + action_id NUMBER NOT NULL CONSTRAINT rhn_avsm_aid_fk - REFERENCES rhnAction (id) = - ON DELETE CASCADE, = - uuid VARCHAR2(128) NOT NULL, = - memory NUMBER NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnAction (id) + ON DELETE CASCADE, + uuid VARCHAR2(128) NOT NULL, + memory NUMBER NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnActionVirtShutdown.sql b/sch= ema/spacewalk/common/tables/rhnActionVirtShutdown.sql index 3fc5be6..ed2920b 100644 --- a/schema/spacewalk/common/tables/rhnActionVirtShutdown.sql +++ b/schema/spacewalk/common/tables/rhnActionVirtShutdown.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionVirtShutdown ( - action_id NUMBER NOT NULL = + action_id NUMBER NOT NULL CONSTRAINT rhn_avshutdown_aid_fk - REFERENCES rhnAction (id) = - ON DELETE CASCADE, = - uuid VARCHAR2(128) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnAction (id) + ON DELETE CASCADE, + uuid VARCHAR2(128) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnActionVirtStart.sql b/schema= /spacewalk/common/tables/rhnActionVirtStart.sql index b9f5531..a4ba6c2 100644 --- a/schema/spacewalk/common/tables/rhnActionVirtStart.sql +++ b/schema/spacewalk/common/tables/rhnActionVirtStart.sql @@ -7,20 +7,20 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionVirtStart ( - action_id NUMBER NOT NULL, = - uuid VARCHAR2(128) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + action_id NUMBER NOT NULL, + uuid VARCHAR2(128) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnActionVirtSuspend.sql b/sche= ma/spacewalk/common/tables/rhnActionVirtSuspend.sql index 9fccd33..d6df80a 100644 --- a/schema/spacewalk/common/tables/rhnActionVirtSuspend.sql +++ b/schema/spacewalk/common/tables/rhnActionVirtSuspend.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionVirtSuspend ( - action_id NUMBER NOT NULL = + action_id NUMBER NOT NULL CONSTRAINT rhn_avsuspend_aid_fk - REFERENCES rhnAction (id) = - ON DELETE CASCADE, = - uuid VARCHAR2(128) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnAction (id) + ON DELETE CASCADE, + uuid VARCHAR2(128) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnActionVirtVcpu.sql b/schema/= spacewalk/common/tables/rhnActionVirtVcpu.sql index 49764cf..007a6ad 100644 --- a/schema/spacewalk/common/tables/rhnActionVirtVcpu.sql +++ b/schema/spacewalk/common/tables/rhnActionVirtVcpu.sql @@ -7,24 +7,24 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActionVirtVcpu ( - action_id NUMBER NOT NULL = + action_id NUMBER NOT NULL CONSTRAINT rhn_avcpu_aid_fk - REFERENCES rhnAction (id) = - ON DELETE CASCADE, = - uuid VARCHAR2(128) NOT NULL, = - vcpu NUMBER NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnAction (id) + ON DELETE CASCADE, + uuid VARCHAR2(128) NOT NULL, + vcpu NUMBER NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnActivationKey.sql b/schema/s= pacewalk/common/tables/rhnActivationKey.sql index 360e861..d590281 100644 --- a/schema/spacewalk/common/tables/rhnActivationKey.sql +++ b/schema/spacewalk/common/tables/rhnActivationKey.sql @@ -7,28 +7,28 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnActivationKey ( - token VARCHAR2(48) NOT NULL = - CONSTRAINT rhn_act_key_token_uq UNIQUE, = - reg_token_id NUMBER NOT NULL = + token VARCHAR2(48) NOT NULL + CONSTRAINT rhn_act_key_token_uq UNIQUE, + reg_token_id NUMBER NOT NULL CONSTRAINT rhn_act_key_reg_tid_fk - REFERENCES rhnRegToken (id) = - ON DELETE CASCADE, = - ks_session_id NUMBER = + REFERENCES rhnRegToken (id) + ON DELETE CASCADE, + ks_session_id NUMBER CONSTRAINT rhn_act_key_ks_sid_fk - REFERENCES rhnKickstartSession (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnKickstartSession (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnAllowTrust.sql b/schema/spac= ewalk/common/tables/rhnAllowTrust.sql index bff6ba9..081e193 100644 --- a/schema/spacewalk/common/tables/rhnAllowTrust.sql +++ b/schema/spacewalk/common/tables/rhnAllowTrust.sql @@ -7,30 +7,30 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnAllowTrust ( - org_id NUMBER NOT NULL = + org_id NUMBER NOT NULL CONSTRAINT rhn_allow_trust_oid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - channel_flag CHAR(1) = - DEFAULT ('N') NOT NULL = + REFERENCES web_customer (id) + ON DELETE CASCADE, + channel_flag CHAR(1) + DEFAULT ('N') NOT NULL CONSTRAINT rhn_allow_trust_channelflg_ck - CHECK (channel_flag in ( 'N' , 'Y' )), = - migration_flag CHAR(1) = - DEFAULT ('N') NOT NULL = + CHECK (channel_flag in ( 'N' , 'Y' )), + migration_flag CHAR(1) + DEFAULT ('N') NOT NULL CONSTRAINT rhn_allow_trust_migrflg_ck - CHECK (migration_flag in ( 'N' , 'Y' )), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + CHECK (migration_flag in ( 'N' , 'Y' )), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnAppInstallInstance.sql b/sch= ema/spacewalk/common/tables/rhnAppInstallInstance.sql index 48e46ed..e484ba6 100644 --- a/schema/spacewalk/common/tables/rhnAppInstallInstance.sql +++ b/schema/spacewalk/common/tables/rhnAppInstallInstance.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnAppInstallInstance ( - id NUMBER NOT NULL, = - name VARCHAR2(128) NOT NULL, = - label VARCHAR2(128) NOT NULL, = - version VARCHAR2(32) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL, + name VARCHAR2(128) NOT NULL, + label VARCHAR2(128) NOT NULL, + version VARCHAR2(32) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnAppInstallSession.sql b/sche= ma/spacewalk/common/tables/rhnAppInstallSession.sql index b241e58..9b8871a 100644 --- a/schema/spacewalk/common/tables/rhnAppInstallSession.sql +++ b/schema/spacewalk/common/tables/rhnAppInstallSession.sql @@ -7,32 +7,32 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnAppInstallSession ( - id NUMBER NOT NULL, = - instance_id NUMBER NOT NULL = + id NUMBER NOT NULL, + instance_id NUMBER NOT NULL CONSTRAINT rhn_appinst_session_iid_fk - REFERENCES rhnAppInstallInstance (id) = - ON DELETE CASCADE, = - md5sum VARCHAR2(64), = - process_name VARCHAR2(32), = - step_number NUMBER, = - user_id NUMBER NOT NULL = + REFERENCES rhnAppInstallInstance (id) + ON DELETE CASCADE, + md5sum VARCHAR2(64), + process_name VARCHAR2(32), + step_number NUMBER, + user_id NUMBER NOT NULL CONSTRAINT rhn_appinst_session_uid_fk - REFERENCES web_contact (id), = - server_id NUMBER NOT NULL = + REFERENCES web_contact (id), + server_id NUMBER NOT NULL CONSTRAINT rhn_appinst_session_sid_fk - REFERENCES rhnServer (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnServer (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnAppInstallSessionData.sql b/= schema/spacewalk/common/tables/rhnAppInstallSessionData.sql index 9f36fd3..3990eb9 100644 --- a/schema/spacewalk/common/tables/rhnAppInstallSessionData.sql +++ b/schema/spacewalk/common/tables/rhnAppInstallSessionData.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnAppInstallSessionData ( - id NUMBER NOT NULL, = - session_id NUMBER NOT NULL = + id NUMBER NOT NULL, + session_id NUMBER NOT NULL CONSTRAINT rhn_appinst_sdata_sid_fk - REFERENCES rhnAppInstallSession (id) = - ON DELETE CASCADE, = - key VARCHAR2(64) NOT NULL, = - value VARCHAR2(2048), = - extra_data BLOB, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnAppInstallSession (id) + ON DELETE CASCADE, + key VARCHAR2(64) NOT NULL, + value VARCHAR2(2048), + extra_data BLOB, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) TABLESPACE [[blob]] diff --git a/schema/spacewalk/common/tables/rhnArchType.sql b/schema/spacew= alk/common/tables/rhnArchType.sql index 7c71005..1cc495b 100644 --- a/schema/spacewalk/common/tables/rhnArchType.sql +++ b/schema/spacewalk/common/tables/rhnArchType.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnArchType ( - id NUMBER NOT NULL = - CONSTRAINT rhn_archtype_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - label VARCHAR2(64) NOT NULL, = - name VARCHAR2(128) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_archtype_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + label VARCHAR2(64) NOT NULL, + name VARCHAR2(128) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnArchTypeActions.sql b/schema= /spacewalk/common/tables/rhnArchTypeActions.sql index 851d1a9..9f48ff8 100644 --- a/schema/spacewalk/common/tables/rhnArchTypeActions.sql +++ b/schema/spacewalk/common/tables/rhnArchTypeActions.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnArchTypeActions ( - arch_type_id NUMBER NOT NULL = + arch_type_id NUMBER NOT NULL CONSTRAINT rhn_archtypeacts_atid_fk - REFERENCES rhnArchType (id), = - action_style VARCHAR2(64) NOT NULL, = - action_type_id NUMBER NOT NULL = + REFERENCES rhnArchType (id), + action_style VARCHAR2(64) NOT NULL, + action_type_id NUMBER NOT NULL CONSTRAINT rhn_archtypeacts_actid_fk - REFERENCES rhnActionType (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnActionType (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnBeehivePathMap.sql b/schema/= spacewalk/common/tables/rhnBeehivePathMap.sql index 929268b..792ef0c 100644 --- a/schema/spacewalk/common/tables/rhnBeehivePathMap.sql +++ b/schema/spacewalk/common/tables/rhnBeehivePathMap.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnBeehivePathMap ( - path VARCHAR2(128) NOT NULL = - CONSTRAINT rhn_beehive_path_map_p_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - beehive_path VARCHAR2(128) NOT NULL, = - ftp_path VARCHAR2(128) NOT NULL, = - created DATE = - DEFAULT (SYSDATE), = - modified DATE = + path VARCHAR2(128) NOT NULL + CONSTRAINT rhn_beehive_path_map_p_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + beehive_path VARCHAR2(128) NOT NULL, + ftp_path VARCHAR2(128) NOT NULL, + created DATE + DEFAULT (SYSDATE), + modified DATE DEFAULT (SYSDATE) ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnBlacklistObsoletes.sql b/sch= ema/spacewalk/common/tables/rhnBlacklistObsoletes.sql index 6878efb..42a1ea5 100644 --- a/schema/spacewalk/common/tables/rhnBlacklistObsoletes.sql +++ b/schema/spacewalk/common/tables/rhnBlacklistObsoletes.sql @@ -7,30 +7,30 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnBlacklistObsoletes ( - name_id NUMBER NOT NULL = + name_id NUMBER NOT NULL CONSTRAINT rhn_bl_obs_nid_fk - REFERENCES rhnPackageName (id), = - evr_id NUMBER NOT NULL = + REFERENCES rhnPackageName (id), + evr_id NUMBER NOT NULL CONSTRAINT rhn_bl_obs_eid_fk - REFERENCES rhnPackageEVR (id), = - package_arch_id NUMBER NOT NULL = + REFERENCES rhnPackageEVR (id), + package_arch_id NUMBER NOT NULL CONSTRAINT rhn_bl_obs_paid_fk - REFERENCES rhnPackageArch (id), = - ignore_name_id NUMBER NOT NULL = + REFERENCES rhnPackageArch (id), + ignore_name_id NUMBER NOT NULL CONSTRAINT rhn_bl_obs_inid_fk - REFERENCES rhnPackageName (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnPackageName (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnCVE.sql b/schema/spacewalk/c= ommon/tables/rhnCVE.sql index 1bc93ac..1056841 100644 --- a/schema/spacewalk/common/tables/rhnCVE.sql +++ b/schema/spacewalk/common/tables/rhnCVE.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnCVE ( - id NUMBER NOT NULL = - CONSTRAINT rhn_cve_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]], = + id NUMBER NOT NULL + CONSTRAINT rhn_cve_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]], name VARCHAR2(13) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnChannel.sql b/schema/spacewa= lk/common/tables/rhnChannel.sql index 69afd9c..de3dd04 100644 --- a/schema/spacewalk/common/tables/rhnChannel.sql +++ b/schema/spacewalk/common/tables/rhnChannel.sql @@ -7,57 +7,57 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnChannel ( - id NUMBER NOT NULL = - CONSTRAINT rhn_channel_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - parent_channel NUMBER = + id NUMBER NOT NULL + CONSTRAINT rhn_channel_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + parent_channel NUMBER CONSTRAINT rhn_channel_parent_ch_fk - REFERENCES rhnChannel (id), = - org_id NUMBER = + REFERENCES rhnChannel (id), + org_id NUMBER CONSTRAINT rhn_channel_org_fk - REFERENCES web_customer (id), = - channel_arch_id NUMBER NOT NULL = + REFERENCES web_customer (id), + channel_arch_id NUMBER NOT NULL CONSTRAINT rhn_channel_caid_fk - REFERENCES rhnChannelArch (id), = - label VARCHAR2(128) NOT NULL, = - basedir VARCHAR2(256) NOT NULL, = - name VARCHAR2(256) NOT NULL, = - summary VARCHAR2(500) NOT NULL, = - description VARCHAR2(4000), = - product_name_id NUMBER = + REFERENCES rhnChannelArch (id), + label VARCHAR2(128) NOT NULL, + basedir VARCHAR2(256) NOT NULL, + name VARCHAR2(256) NOT NULL, + summary VARCHAR2(500) NOT NULL, + description VARCHAR2(4000), + product_name_id NUMBER CONSTRAINT rhn_channel_product_name_ch_fk - REFERENCES rhnProductName (id), = - gpg_key_url VARCHAR2(256), = - gpg_key_id VARCHAR2(14), = - gpg_key_fp VARCHAR2(50), = - end_of_life DATE, = - receiving_updates CHAR(1) = - DEFAULT ('Y') NOT NULL = + REFERENCES rhnProductName (id), + gpg_key_url VARCHAR2(256), + gpg_key_id VARCHAR2(14), + gpg_key_fp VARCHAR2(50), + end_of_life DATE, + receiving_updates CHAR(1) + DEFAULT ('Y') NOT NULL CONSTRAINT rhn_channel_ru_ck - CHECK (receiving_updates in ( 'Y' , 'N' ))= , = - last_modified DATE = - DEFAULT (sysdate) NOT NULL, = - channel_product_id NUMBER = + CHECK (receiving_updates in ( 'Y' , 'N' )), + last_modified DATE + DEFAULT (sysdate) NOT NULL, + channel_product_id NUMBER CONSTRAINT rhn_channel_cpid_fk - REFERENCES rhnChannelProduct (id), = - channel_access VARCHAR2(10) = - DEFAULT ('private'), = - maint_name VARCHAR2(128), = - maint_email VARCHAR2(128), = - maint_phone VARCHAR2(128), = - support_policy VARCHAR2(256), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnChannelProduct (id), + channel_access VARCHAR2(10) + DEFAULT ('private'), + maint_name VARCHAR2(128), + maint_email VARCHAR2(128), + maint_phone VARCHAR2(128), + support_policy VARCHAR2(256), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnChannelArch.sql b/schema/spa= cewalk/common/tables/rhnChannelArch.sql index 0cf38b3..46bfdf5 100644 --- a/schema/spacewalk/common/tables/rhnChannelArch.sql +++ b/schema/spacewalk/common/tables/rhnChannelArch.sql @@ -7,24 +7,24 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnChannelArch ( - id NUMBER NOT NULL, = - label VARCHAR2(64) NOT NULL, = - arch_type_id NUMBER NOT NULL = + id NUMBER NOT NULL, + label VARCHAR2(64) NOT NULL, + arch_type_id NUMBER NOT NULL CONSTRAINT rhn_carch_atid_fk - REFERENCES rhnArchType (id), = - name VARCHAR2(64) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnArchType (id), + name VARCHAR2(64) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnChannelCloned.sql b/schema/s= pacewalk/common/tables/rhnChannelCloned.sql index 171943f..831f174 100644 --- a/schema/spacewalk/common/tables/rhnChannelCloned.sql +++ b/schema/spacewalk/common/tables/rhnChannelCloned.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnChannelCloned ( - original_id NUMBER NOT NULL = + original_id NUMBER NOT NULL CONSTRAINT rhn_channelclone_fcid_fk - REFERENCES rhnChannel (id) = - ON DELETE CASCADE, = - id NUMBER NOT NULL = + REFERENCES rhnChannel (id) + ON DELETE CASCADE, + id NUMBER NOT NULL CONSTRAINT rhn_channelclone_tcid_fk - REFERENCES rhnChannel (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnChannel (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnChannelComps.sql b/schema/sp= acewalk/common/tables/rhnChannelComps.sql index dc3961f..b4621ae 100644 --- a/schema/spacewalk/common/tables/rhnChannelComps.sql +++ b/schema/spacewalk/common/tables/rhnChannelComps.sql @@ -7,27 +7,27 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnChannelComps ( - id NUMBER NOT NULL = - CONSTRAINT rhn_channelcomps_id_pk PRIMARY KEY, = - channel_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_channelcomps_id_pk PRIMARY KEY, + channel_id NUMBER NOT NULL CONSTRAINT rhn_channelcomps_cid_fk - REFERENCES rhnChannel (id) = - ON DELETE CASCADE, = - relative_filename VARCHAR2(256) NOT NULL, = - last_modified DATE = - DEFAULT (sysdate) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnChannel (id) + ON DELETE CASCADE, + relative_filename VARCHAR2(256) NOT NULL, + last_modified DATE + DEFAULT (sysdate) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnChannelDownloads.sql b/schem= a/spacewalk/common/tables/rhnChannelDownloads.sql index 1caea5e..792fc78 100644 --- a/schema/spacewalk/common/tables/rhnChannelDownloads.sql +++ b/schema/spacewalk/common/tables/rhnChannelDownloads.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnChannelDownloads ( - channel_id NUMBER NOT NULL = + channel_id NUMBER NOT NULL CONSTRAINT rhn_cd_cid_fk - REFERENCES rhnChannel (id) = - ON DELETE CASCADE, = - downloads_id NUMBER NOT NULL = + REFERENCES rhnChannel (id) + ON DELETE CASCADE, + downloads_id NUMBER NOT NULL CONSTRAINT rhn_cd_did_fk - REFERENCES rhnDownloads (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnDownloads (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnChannelErrata.sql b/schema/s= pacewalk/common/tables/rhnChannelErrata.sql index 5b4c434..3bc8b9b 100644 --- a/schema/spacewalk/common/tables/rhnChannelErrata.sql +++ b/schema/spacewalk/common/tables/rhnChannelErrata.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnChannelErrata ( - channel_id NUMBER NOT NULL = + channel_id NUMBER NOT NULL CONSTRAINT rhn_ce_cid_fk - REFERENCES rhnChannel (id) = - ON DELETE CASCADE, = - errata_id NUMBER NOT NULL = + REFERENCES rhnChannel (id) + ON DELETE CASCADE, + errata_id NUMBER NOT NULL CONSTRAINT rhn_ce_eid_fk - REFERENCES rhnErrata (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnErrata (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnChannelFamily.sql b/schema/s= pacewalk/common/tables/rhnChannelFamily.sql index bacc23f..14d7d13 100644 --- a/schema/spacewalk/common/tables/rhnChannelFamily.sql +++ b/schema/spacewalk/common/tables/rhnChannelFamily.sql @@ -7,29 +7,29 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnChannelFamily ( - id NUMBER NOT NULL = - CONSTRAINT rhn_channel_family_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - org_id NUMBER = + id NUMBER NOT NULL + CONSTRAINT rhn_channel_family_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + org_id NUMBER CONSTRAINT rhn_channel_family_org_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - name VARCHAR2(128) NOT NULL, = - label VARCHAR2(128) NOT NULL, = - product_url VARCHAR2(128) = - DEFAULT ('http://www.redhat.com/products/') NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES web_customer (id) + ON DELETE CASCADE, + name VARCHAR2(128) NOT NULL, + label VARCHAR2(128) NOT NULL, + product_url VARCHAR2(128) + DEFAULT ('http://www.redhat.com/products/') NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnChannelFamilyLicense.sql b/s= chema/spacewalk/common/tables/rhnChannelFamilyLicense.sql index c82a618..dfca5ce 100644 --- a/schema/spacewalk/common/tables/rhnChannelFamilyLicense.sql +++ b/schema/spacewalk/common/tables/rhnChannelFamilyLicense.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnChannelFamilyLicense ( - channel_family_id NUMBER NOT NULL = + channel_family_id NUMBER NOT NULL CONSTRAINT rhn_cfl_cfid_fk - REFERENCES rhnChannelFamily (id) = - ON DELETE CASCADE, = - license_path VARCHAR2(1000) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnChannelFamily (id) + ON DELETE CASCADE, + license_path VARCHAR2(1000) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnChannelFamilyLicenseConsent.= sql b/schema/spacewalk/common/tables/rhnChannelFamilyLicenseConsent.sql index acba42e..41af7ce 100644 --- a/schema/spacewalk/common/tables/rhnChannelFamilyLicenseConsent.sql +++ b/schema/spacewalk/common/tables/rhnChannelFamilyLicenseConsent.sql @@ -7,29 +7,29 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnChannelFamilyLicenseConsent ( - channel_family_id NUMBER NOT NULL = + channel_family_id NUMBER NOT NULL CONSTRAINT rhn_cfl_consent_cfid_fk - REFERENCES rhnChannelFamily (id) = - ON DELETE CASCADE, = - user_id NUMBER NOT NULL = + REFERENCES rhnChannelFamily (id) + ON DELETE CASCADE, + user_id NUMBER NOT NULL CONSTRAINT rhn_cfl_consent_uid_fk - REFERENCES web_contact (id) = - ON DELETE CASCADE, = - server_id NUMBER NOT NULL = + REFERENCES web_contact (id) + ON DELETE CASCADE, + server_id NUMBER NOT NULL CONSTRAINT rhn_cfl_consent_sid_fk - REFERENCES rhnServer (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnServer (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnChannelFamilyMembers.sql b/s= chema/spacewalk/common/tables/rhnChannelFamilyMembers.sql index 55c044a..d782820 100644 --- a/schema/spacewalk/common/tables/rhnChannelFamilyMembers.sql +++ b/schema/spacewalk/common/tables/rhnChannelFamilyMembers.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnChannelFamilyMembers ( - channel_id NUMBER NOT NULL = + channel_id NUMBER NOT NULL CONSTRAINT rhn_cf_members_c_fk - REFERENCES rhnChannel (id) = - ON DELETE CASCADE, = - channel_family_id NUMBER NOT NULL = + REFERENCES rhnChannel (id) + ON DELETE CASCADE, + channel_family_id NUMBER NOT NULL CONSTRAINT rhn_cf_family_fk - REFERENCES rhnChannelFamily (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnChannelFamily (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnChannelFamilyVirtSubLevel.sq= l b/schema/spacewalk/common/tables/rhnChannelFamilyVirtSubLevel.sql index 27c6952..7b646b5 100644 --- a/schema/spacewalk/common/tables/rhnChannelFamilyVirtSubLevel.sql +++ b/schema/spacewalk/common/tables/rhnChannelFamilyVirtSubLevel.sql @@ -7,24 +7,24 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnChannelFamilyVirtSubLevel ( - channel_family_id NUMBER NOT NULL = + channel_family_id NUMBER NOT NULL CONSTRAINT rhn_cfvsl_cfid_fk - REFERENCES rhnChannelFamily (id), = - virt_sub_level_id NUMBER NOT NULL = + REFERENCES rhnChannelFamily (id), + virt_sub_level_id NUMBER NOT NULL CONSTRAINT rhn_cfvsl_vslid_fk - REFERENCES rhnVirtSubLevel (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnVirtSubLevel (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnChannelNewestPackage.sql b/s= chema/spacewalk/common/tables/rhnChannelNewestPackage.sql index 35deddf..eb61a96 100644 --- a/schema/spacewalk/common/tables/rhnChannelNewestPackage.sql +++ b/schema/spacewalk/common/tables/rhnChannelNewestPackage.sql @@ -7,31 +7,31 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnChannelNewestPackage ( - channel_id NUMBER NOT NULL = + channel_id NUMBER NOT NULL CONSTRAINT rhn_cnp_cid_fk - REFERENCES rhnChannel (id) = - ON DELETE CASCADE, = - name_id NUMBER NOT NULL = + REFERENCES rhnChannel (id) + ON DELETE CASCADE, + name_id NUMBER NOT NULL CONSTRAINT rhn_cnp_nid_fk - REFERENCES rhnPackageName (id), = - evr_id NUMBER NOT NULL = + REFERENCES rhnPackageName (id), + evr_id NUMBER NOT NULL CONSTRAINT rhn_cnp_eid_fk - REFERENCES rhnPackageEVR (id), = - package_arch_id NUMBER NOT NULL = + REFERENCES rhnPackageEVR (id), + package_arch_id NUMBER NOT NULL CONSTRAINT rhn_cnp_paid_fk - REFERENCES rhnPackageArch (id), = - package_id NUMBER NOT NULL = + REFERENCES rhnPackageArch (id), + package_id NUMBER NOT NULL CONSTRAINT rhn_cnp_pid_fk - REFERENCES rhnPackage (id) = + REFERENCES rhnPackage (id) ON DELETE CASCADE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnChannelNewestPackageAudit.sq= l b/schema/spacewalk/common/tables/rhnChannelNewestPackageAudit.sql index d49546e..4d5db41 100644 --- a/schema/spacewalk/common/tables/rhnChannelNewestPackageAudit.sql +++ b/schema/spacewalk/common/tables/rhnChannelNewestPackageAudit.sql @@ -7,21 +7,21 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnChannelNewestPackageAudit ( - refresh_time DATE = - DEFAULT (sysdate) NOT NULL, = - channel_id NUMBER NOT NULL = + refresh_time DATE + DEFAULT (sysdate) NOT NULL, + channel_id NUMBER NOT NULL CONSTRAINT rhn_cnp_at_cid_fk - REFERENCES rhnChannel (id) = - ON DELETE CASCADE, = + REFERENCES rhnChannel (id) + ON DELETE CASCADE, caller VARCHAR2(256) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnChannelPackage.sql b/schema/= spacewalk/common/tables/rhnChannelPackage.sql index 5f8e039..774722f 100644 --- a/schema/spacewalk/common/tables/rhnChannelPackage.sql +++ b/schema/spacewalk/common/tables/rhnChannelPackage.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnChannelPackage ( - channel_id NUMBER NOT NULL = + channel_id NUMBER NOT NULL CONSTRAINT rhn_cp_cid_fk - REFERENCES rhnChannel (id) = - ON DELETE CASCADE, = - package_id NUMBER NOT NULL = + REFERENCES rhnChannel (id) + ON DELETE CASCADE, + package_id NUMBER NOT NULL CONSTRAINT rhn_cp_pid_fk - REFERENCES rhnPackage (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnPackage (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnChannelPackageArchCompat.sql= b/schema/spacewalk/common/tables/rhnChannelPackageArchCompat.sql index cd0e7f9..06d7c14 100644 --- a/schema/spacewalk/common/tables/rhnChannelPackageArchCompat.sql +++ b/schema/spacewalk/common/tables/rhnChannelPackageArchCompat.sql @@ -7,24 +7,24 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnChannelPackageArchCompat ( - channel_arch_id NUMBER NOT NULL = + channel_arch_id NUMBER NOT NULL CONSTRAINT rhn_cp_ac_caid_fk - REFERENCES rhnChannelArch (id), = - package_arch_id NUMBER NOT NULL = + REFERENCES rhnChannelArch (id), + package_arch_id NUMBER NOT NULL CONSTRAINT rhn_cp_ac_paid_fk - REFERENCES rhnPackageArch (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnPackageArch (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnChannelParent.sql b/schema/s= pacewalk/common/tables/rhnChannelParent.sql index 13176dd..0a52e42 100644 --- a/schema/spacewalk/common/tables/rhnChannelParent.sql +++ b/schema/spacewalk/common/tables/rhnChannelParent.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnChannelParent ( - channel NUMBER NOT NULL = + channel NUMBER NOT NULL CONSTRAINT rhn_cp_ch_fk - REFERENCES rhnChannel (id) = - ON DELETE CASCADE, = - parent_channel NUMBER NOT NULL = + REFERENCES rhnChannel (id) + ON DELETE CASCADE, + parent_channel NUMBER NOT NULL CONSTRAINT rhn_cp_parent_ch_fk - REFERENCES rhnChannel (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnChannel (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnChannelPermission.sql b/sche= ma/spacewalk/common/tables/rhnChannelPermission.sql index 1c69abe..25d09c6 100644 --- a/schema/spacewalk/common/tables/rhnChannelPermission.sql +++ b/schema/spacewalk/common/tables/rhnChannelPermission.sql @@ -7,29 +7,29 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnChannelPermission ( - channel_id NUMBER NOT NULL = + channel_id NUMBER NOT NULL CONSTRAINT rhn_cperm_cidffk - REFERENCES rhnChannel (id) = - ON DELETE CASCADE, = - user_id NUMBER NOT NULL = + REFERENCES rhnChannel (id) + ON DELETE CASCADE, + user_id NUMBER NOT NULL CONSTRAINT rhn_cperm_uid_fk - REFERENCES web_contact (id) = - ON DELETE CASCADE, = - role_id NUMBER NOT NULL = + REFERENCES web_contact (id) + ON DELETE CASCADE, + role_id NUMBER NOT NULL CONSTRAINT rhn_cperm_rid_fk - REFERENCES rhnChannelPermissionRole (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnChannelPermissionRole (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnChannelPermissionRole.sql b/= schema/spacewalk/common/tables/rhnChannelPermissionRole.sql index 452ab55..9b32fb2 100644 --- a/schema/spacewalk/common/tables/rhnChannelPermissionRole.sql +++ b/schema/spacewalk/common/tables/rhnChannelPermissionRole.sql @@ -7,21 +7,21 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnChannelPermissionRole ( - id NUMBER NOT NULL, = - label VARCHAR2(32) NOT NULL, = - description VARCHAR2(128) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL, + label VARCHAR2(32) NOT NULL, + description VARCHAR2(128) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnChannelProduct.sql b/schema/= spacewalk/common/tables/rhnChannelProduct.sql index 9b0bdbf..a16306c 100644 --- a/schema/spacewalk/common/tables/rhnChannelProduct.sql +++ b/schema/spacewalk/common/tables/rhnChannelProduct.sql @@ -7,27 +7,27 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnChannelProduct ( - id NUMBER NOT NULL = - CONSTRAINT rhn_channelprod_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - product VARCHAR2(256) NOT NULL, = - version VARCHAR2(64) NOT NULL, = - beta CHAR(1) = - DEFAULT ('N') NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_channelprod_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + product VARCHAR2(256) NOT NULL, + version VARCHAR2(64) NOT NULL, + beta CHAR(1) + DEFAULT ('N') NOT NULL CONSTRAINT rhn_channelprod_beta_ck - CHECK (beta in ( 'Y' , 'N' )), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + CHECK (beta in ( 'Y' , 'N' )), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnChannelTrust.sql b/schema/sp= acewalk/common/tables/rhnChannelTrust.sql index d25ed50..0a7c3fa 100644 --- a/schema/spacewalk/common/tables/rhnChannelTrust.sql +++ b/schema/spacewalk/common/tables/rhnChannelTrust.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnChannelTrust ( - channel_id NUMBER NOT NULL = + channel_id NUMBER NOT NULL CONSTRAINT rhn_channel_trust_cid_fk - REFERENCES rhnChannel (id) = - ON DELETE CASCADE, = - org_trust_id NUMBER NOT NULL = + REFERENCES rhnChannel (id) + ON DELETE CASCADE, + org_trust_id NUMBER NOT NULL CONSTRAINT rhn_channel_trust_otid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES web_customer (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnClientCapability.sql b/schem= a/spacewalk/common/tables/rhnClientCapability.sql index ec97b99..9cfae2c 100644 --- a/schema/spacewalk/common/tables/rhnClientCapability.sql +++ b/schema/spacewalk/common/tables/rhnClientCapability.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnClientCapability ( - server_id NUMBER NOT NULL = + server_id NUMBER NOT NULL CONSTRAINT rhn_clientcap_sid_fk - REFERENCES rhnServer (id), = - capability_name_id NUMBER NOT NULL = + REFERENCES rhnServer (id), + capability_name_id NUMBER NOT NULL CONSTRAINT rhn_clientcap_cap_nid_fk - REFERENCES rhnClientCapabilityName (id), = - version VARCHAR2(32) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnClientCapabilityName (id), + version VARCHAR2(32) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnClientCapabilityName.sql b/s= chema/spacewalk/common/tables/rhnClientCapabilityName.sql index 03e1e69..2b81c42 100644 --- a/schema/spacewalk/common/tables/rhnClientCapabilityName.sql +++ b/schema/spacewalk/common/tables/rhnClientCapabilityName.sql @@ -7,19 +7,19 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnClientCapabilityName ( - id NUMBER NOT NULL = - CONSTRAINT rhn_clientcapnam_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[8m_tbs]], = - name VARCHAR2(32) NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_clientcapnam_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[8m_tbs]], + name VARCHAR2(32) NOT NULL CONSTRAINT rhn_clientcapnam_name_unq UNIQUE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnConfigChannel.sql b/schema/s= pacewalk/common/tables/rhnConfigChannel.sql index d5a257d..82f13cc 100644 --- a/schema/spacewalk/common/tables/rhnConfigChannel.sql +++ b/schema/spacewalk/common/tables/rhnConfigChannel.sql @@ -7,30 +7,30 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnConfigChannel ( - id NUMBER NOT NULL = - CONSTRAINT rhn_confchan_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]], = - org_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_confchan_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]], + org_id NUMBER NOT NULL CONSTRAINT rhn_confchan_oid_fk - REFERENCES web_customer (id), = - confchan_type_id NUMBER NOT NULL = + REFERENCES web_customer (id), + confchan_type_id NUMBER NOT NULL CONSTRAINT rhn_confchan_ctid_fk - REFERENCES rhnConfigChannelType (id), = - name VARCHAR2(128) NOT NULL, = - label VARCHAR2(64) NOT NULL, = - description VARCHAR2(1024) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnConfigChannelType (id), + name VARCHAR2(128) NOT NULL, + label VARCHAR2(64) NOT NULL, + description VARCHAR2(1024) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnConfigChannelType.sql b/sche= ma/spacewalk/common/tables/rhnConfigChannelType.sql index 62d0ae9..5f1c26a 100644 --- a/schema/spacewalk/common/tables/rhnConfigChannelType.sql +++ b/schema/spacewalk/common/tables/rhnConfigChannelType.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnConfigChannelType ( - id NUMBER NOT NULL = - CONSTRAINT rhn_confchantype_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - label VARCHAR2(64) NOT NULL, = - name VARCHAR2(64) NOT NULL, = - priority NUMBER = - DEFAULT (0) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_confchantype_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + label VARCHAR2(64) NOT NULL, + name VARCHAR2(64) NOT NULL, + priority NUMBER + DEFAULT (0) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnConfigContent.sql b/schema/s= pacewalk/common/tables/rhnConfigContent.sql index 43b57ae..11a387f 100644 --- a/schema/spacewalk/common/tables/rhnConfigContent.sql +++ b/schema/spacewalk/common/tables/rhnConfigContent.sql @@ -7,28 +7,28 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnConfigContent ( - id NUMBER NOT NULL = - CONSTRAINT rhn_confcontent_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]], = - contents BLOB, = - file_size NUMBER, = - md5sum VARCHAR2(64) NOT NULL, = - is_binary CHAR(1) = - DEFAULT ('N') NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_confcontent_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]], + contents BLOB, + file_size NUMBER, + md5sum VARCHAR2(64) NOT NULL, + is_binary CHAR(1) + DEFAULT ('N') NOT NULL CONSTRAINT rhn_confcontent_isbin_ck - CHECK (is_binary in ( 'Y' , 'N' )), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + CHECK (is_binary in ( 'Y' , 'N' )), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) TABLESPACE [[blob]] diff --git a/schema/spacewalk/common/tables/rhnConfigFile.sql b/schema/spac= ewalk/common/tables/rhnConfigFile.sql index 839f4c2..dcec1b5 100644 --- a/schema/spacewalk/common/tables/rhnConfigFile.sql +++ b/schema/spacewalk/common/tables/rhnConfigFile.sql @@ -7,31 +7,31 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnConfigFile ( - id NUMBER NOT NULL = - CONSTRAINT rhn_conffile_id_pk PRIMARY K= EY = - USING INDEX TABLESPACE [[2m_tbs]], = - config_channel_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_conffile_id_pk PRIMARY K= EY + USING INDEX TABLESPACE [[2m_tbs]], + config_channel_id NUMBER NOT NULL CONSTRAINT rhn_conffile_ccid_fk - REFERENCES rhnConfigChannel (id), = - config_file_name_id NUMBER NOT NULL = + REFERENCES rhnConfigChannel (id), + config_file_name_id NUMBER NOT NULL CONSTRAINT rhn_conffile_cfnid_fk - REFERENCES rhnConfigFileName (id), = - latest_config_revision_id NUMBER, = - state_id NUMBER NOT NULL = + REFERENCES rhnConfigFileName (id), + latest_config_revision_id NUMBER, + state_id NUMBER NOT NULL CONSTRAINT rhn_conffile_sid_fk - REFERENCES rhnConfigFileState (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnConfigFileState (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnConfigFileFailure.sql b/sche= ma/spacewalk/common/tables/rhnConfigFileFailure.sql index 9c39da7..8c35ed1 100644 --- a/schema/spacewalk/common/tables/rhnConfigFileFailure.sql +++ b/schema/spacewalk/common/tables/rhnConfigFileFailure.sql @@ -7,27 +7,27 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnConfigFileFailure ( - id NUMBER NOT NULL = - CONSTRAINT rhn_conffile_fail_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - label VARCHAR2(64) NOT NULL = - CONSTRAINT rhn_conffile_fail_label_uq UNIQUE = - USING INDEX TABLESPACE [[64k_tbs]], = - name VARCHAR2(256) NOT NULL = - CONSTRAINT rhn_conffile_fail_name_uq UNIQUE = - USING INDEX TABLESPACE [[64k_tbs]], = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_conffile_fail_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + label VARCHAR2(64) NOT NULL + CONSTRAINT rhn_conffile_fail_label_uq UNIQUE + USING INDEX TABLESPACE [[64k_tbs]], + name VARCHAR2(256) NOT NULL + CONSTRAINT rhn_conffile_fail_name_uq UNIQUE + USING INDEX TABLESPACE [[64k_tbs]], + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnConfigFileName.sql b/schema/= spacewalk/common/tables/rhnConfigFileName.sql index 74e309c..0729c61 100644 --- a/schema/spacewalk/common/tables/rhnConfigFileName.sql +++ b/schema/spacewalk/common/tables/rhnConfigFileName.sql @@ -7,20 +7,20 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnConfigFileName ( - id NUMBER NOT NULL, = - path VARCHAR2(1024) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL, + path VARCHAR2(1024) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnConfigFileState.sql b/schema= /spacewalk/common/tables/rhnConfigFileState.sql index 48a8996..89e4a49 100644 --- a/schema/spacewalk/common/tables/rhnConfigFileState.sql +++ b/schema/spacewalk/common/tables/rhnConfigFileState.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnConfigFileState ( - id NUMBER NOT NULL = - CONSTRAINT rhn_cfstate_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]], = - label VARCHAR2(32) NOT NULL, = - name VARCHAR2(256) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_cfstate_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]], + label VARCHAR2(32) NOT NULL, + name VARCHAR2(256) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnConfigFileType.sql b/schema/= spacewalk/common/tables/rhnConfigFileType.sql index b2d4870..b4f2e8a 100644 --- a/schema/spacewalk/common/tables/rhnConfigFileType.sql +++ b/schema/spacewalk/common/tables/rhnConfigFileType.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnConfigFileType ( - id NUMBER NOT NULL = - CONSTRAINT rhn_conffiletype_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]], = - label VARCHAR2(64) NOT NULL, = - name VARCHAR2(256) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_conffiletype_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]], + label VARCHAR2(64) NOT NULL, + name VARCHAR2(256) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnConfigFile_foreignkeys.sql b= /schema/spacewalk/common/tables/rhnConfigFile_foreignkeys.sql index 3963698..cb545ff 100644 --- a/schema/spacewalk/common/tables/rhnConfigFile_foreignkeys.sql +++ b/schema/spacewalk/common/tables/rhnConfigFile_foreignkeys.sql @@ -7,15 +7,15 @@ -- 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. = +-- in this software or its documentation. -- = = ALTER TABLE rhnConfigFile ADD CONSTRAINT rhn_conffile_lcrid_fk FOREIGN KEY (latest_config_revisi= on_id) - REFERENCES rhnConfigRevision (id) = + REFERENCES rhnConfigRevision (id) ON DELETE SET NULL; = diff --git a/schema/spacewalk/common/tables/rhnConfigInfo.sql b/schema/spac= ewalk/common/tables/rhnConfigInfo.sql index d37e3b9..17786c4 100644 --- a/schema/spacewalk/common/tables/rhnConfigInfo.sql +++ b/schema/spacewalk/common/tables/rhnConfigInfo.sql @@ -7,24 +7,24 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnConfigInfo ( - id NUMBER NOT NULL = - CONSTRAINT rhn_confinfo_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]], = - username VARCHAR2(32) NOT NULL, = - groupname VARCHAR2(32) NOT NULL, = - filemode NUMBER NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_confinfo_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]], + username VARCHAR2(32) NOT NULL, + groupname VARCHAR2(32) NOT NULL, + filemode NUMBER NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnConfigRevision.sql b/schema/= spacewalk/common/tables/rhnConfigRevision.sql index 93eb578..8c5c30c 100644 --- a/schema/spacewalk/common/tables/rhnConfigRevision.sql +++ b/schema/spacewalk/common/tables/rhnConfigRevision.sql @@ -7,40 +7,40 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnConfigRevision ( - id NUMBER NOT NULL = - CONSTRAINT rhn_confrevision_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[4m_tbs]], = - revision NUMBER NOT NULL, = - config_file_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_confrevision_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[4m_tbs]], + revision NUMBER NOT NULL, + config_file_id NUMBER NOT NULL CONSTRAINT rhn_confrevision_cfid_fk - REFERENCES rhnConfigFile (id), = - config_content_id NUMBER NOT NULL = + REFERENCES rhnConfigFile (id), + config_content_id NUMBER NOT NULL CONSTRAINT rhn_confrevision_ccid_fk - REFERENCES rhnConfigContent (id), = - config_info_id NUMBER NOT NULL = + REFERENCES rhnConfigContent (id), + config_info_id NUMBER NOT NULL CONSTRAINT rhn_confrevision_ciid_fk - REFERENCES rhnConfigInfo (id), = - delim_start VARCHAR2(16) NOT NULL, = - delim_end VARCHAR2(16) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = - DEFAULT (sysdate) NOT NULL, = - config_file_type_id NUMBER = - DEFAULT (1) NOT NULL = + REFERENCES rhnConfigInfo (id), + delim_start VARCHAR2(16) NOT NULL, + delim_end VARCHAR2(16) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE + DEFAULT (sysdate) NOT NULL, + config_file_type_id NUMBER + DEFAULT (1) NOT NULL CONSTRAINT rhn_conf_rev_cfti_fk - REFERENCES rhnConfigFileType (id), = - changed_by_id NUMBER = - DEFAULT (null) = + REFERENCES rhnConfigFileType (id), + changed_by_id NUMBER + DEFAULT (null) CONSTRAINT rhn_confrevision_cid_fk REFERENCES web_contact (id) ) diff --git a/schema/spacewalk/common/tables/rhnCpu.sql b/schema/spacewalk/c= ommon/tables/rhnCpu.sql index 0d38227..849068e 100644 --- a/schema/spacewalk/common/tables/rhnCpu.sql +++ b/schema/spacewalk/common/tables/rhnCpu.sql @@ -7,42 +7,42 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnCpu ( - id NUMBER NOT NULL = - CONSTRAINT rhn_cpu_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[4m_tbs]], = - server_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_cpu_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[4m_tbs]], + server_id NUMBER NOT NULL CONSTRAINT rhn_cpu_server_fk - REFERENCES rhnServer (id), = - cpu_arch_id NUMBER NOT NULL = + REFERENCES rhnServer (id), + cpu_arch_id NUMBER NOT NULL CONSTRAINT rhn_cpu_caid_fk - REFERENCES rhnCpuArch (id), = - bogomips VARCHAR2(16), = - cache VARCHAR2(16), = - family VARCHAR2(32), = - MHz VARCHAR2(16), = - stepping VARCHAR2(16), = - flags VARCHAR2(2048), = - model VARCHAR2(64), = - version VARCHAR2(32), = - vendor VARCHAR2(32), = - nrcpu NUMBER = - DEFAULT (1), = - acpiVersion VARCHAR2(64), = - apic VARCHAR2(32), = - apmVersion VARCHAR2(32), = - chipset VARCHAR2(64), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnCpuArch (id), + bogomips VARCHAR2(16), + cache VARCHAR2(16), + family VARCHAR2(32), + MHz VARCHAR2(16), + stepping VARCHAR2(16), + flags VARCHAR2(2048), + model VARCHAR2(64), + version VARCHAR2(32), + vendor VARCHAR2(32), + nrcpu NUMBER + DEFAULT (1), + acpiVersion VARCHAR2(64), + apic VARCHAR2(32), + apmVersion VARCHAR2(32), + chipset VARCHAR2(64), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnCpuArch.sql b/schema/spacewa= lk/common/tables/rhnCpuArch.sql index c6fe394..85efd5d 100644 --- a/schema/spacewalk/common/tables/rhnCpuArch.sql +++ b/schema/spacewalk/common/tables/rhnCpuArch.sql @@ -7,21 +7,21 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnCpuArch ( - id NUMBER NOT NULL, = - label VARCHAR2(64) NOT NULL, = - name VARCHAR2(64) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL, + label VARCHAR2(64) NOT NULL, + name VARCHAR2(64) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnCryptoKey.sql b/schema/space= walk/common/tables/rhnCryptoKey.sql index 152f7c8..880bdc0 100644 --- a/schema/spacewalk/common/tables/rhnCryptoKey.sql +++ b/schema/spacewalk/common/tables/rhnCryptoKey.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnCryptoKey ( - id NUMBER NOT NULL = - CONSTRAINT rhn_cryptokey_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]], = - org_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_cryptokey_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]], + org_id NUMBER NOT NULL CONSTRAINT rhn_cryptokey_oid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - description VARCHAR2(1024) NOT NULL, = - crypto_key_type_id NUMBER NOT NULL = + REFERENCES web_customer (id) + ON DELETE CASCADE, + description VARCHAR2(1024) NOT NULL, + crypto_key_type_id NUMBER NOT NULL CONSTRAINT rhn_cryptokey_cktid_fk - REFERENCES rhnCryptoKeyType (id), = + REFERENCES rhnCryptoKeyType (id), key BLOB ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnCryptoKeyKickstart.sql b/sch= ema/spacewalk/common/tables/rhnCryptoKeyKickstart.sql index 6fbc083..99312d9 100644 --- a/schema/spacewalk/common/tables/rhnCryptoKeyKickstart.sql +++ b/schema/spacewalk/common/tables/rhnCryptoKeyKickstart.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnCryptoKeyKickstart ( - crypto_key_id NUMBER NOT NULL = + crypto_key_id NUMBER NOT NULL CONSTRAINT rhn_ckey_ks_ckid_fk - REFERENCES rhnCryptoKey (id) = - ON DELETE CASCADE, = - ksdata_id NUMBER NOT NULL = + REFERENCES rhnCryptoKey (id) + ON DELETE CASCADE, + ksdata_id NUMBER NOT NULL CONSTRAINT rhn_ckey_ks_ksd_fk - REFERENCES rhnKSData (id) = + REFERENCES rhnKSData (id) ON DELETE CASCADE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnCryptoKeyType.sql b/schema/s= pacewalk/common/tables/rhnCryptoKeyType.sql index 15709c1..a85f176 100644 --- a/schema/spacewalk/common/tables/rhnCryptoKeyType.sql +++ b/schema/spacewalk/common/tables/rhnCryptoKeyType.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnCryptoKeyType ( - id NUMBER NOT NULL = - CONSTRAINT rhn_cryptokeytype_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - label VARCHAR2(32) NOT NULL, = - description VARCHAR2(256) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_cryptokeytype_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + label VARCHAR2(32) NOT NULL, + description VARCHAR2(256) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnCustomDataKey.sql b/schema/s= pacewalk/common/tables/rhnCustomDataKey.sql index d94c91a..3c29baf 100644 --- a/schema/spacewalk/common/tables/rhnCustomDataKey.sql +++ b/schema/spacewalk/common/tables/rhnCustomDataKey.sql @@ -7,34 +7,34 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnCustomDataKey ( - id NUMBER NOT NULL = - CONSTRAINT rhn_cdatakey_pk PRIMARY KEY, = - org_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_cdatakey_pk PRIMARY KEY, + org_id NUMBER NOT NULL CONSTRAINT rhn_cdatakey_oid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - label VARCHAR2(64) NOT NULL, = - description VARCHAR2(4000) NOT NULL, = - created_by NUMBER = + REFERENCES web_customer (id) + ON DELETE CASCADE, + label VARCHAR2(64) NOT NULL, + description VARCHAR2(4000) NOT NULL, + created_by NUMBER CONSTRAINT rhn_cdatakey_cb_fk - REFERENCES web_contact (id) = - ON DELETE SET NULL, = - last_modified_by NUMBER = + REFERENCES web_contact (id) + ON DELETE SET NULL, + last_modified_by NUMBER CONSTRAINT rhn_cdatakey_lmb_fk - REFERENCES web_contact (id) = - ON DELETE SET NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES web_contact (id) + ON DELETE SET NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnDaemonState.sql b/schema/spa= cewalk/common/tables/rhnDaemonState.sql index 38c8c30..b59c84b 100644 --- a/schema/spacewalk/common/tables/rhnDaemonState.sql +++ b/schema/spacewalk/common/tables/rhnDaemonState.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnDaemonState ( - label VARCHAR2(64) NOT NULL = - CONSTRAINT rhn_daemonstate_label_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = + label VARCHAR2(64) NOT NULL + CONSTRAINT rhn_daemonstate_label_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], last_poll DATE NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnDailySummaryQueue.sql b/sche= ma/spacewalk/common/tables/rhnDailySummaryQueue.sql index c2c1727..b82ccfd 100644 --- a/schema/spacewalk/common/tables/rhnDailySummaryQueue.sql +++ b/schema/spacewalk/common/tables/rhnDailySummaryQueue.sql @@ -7,21 +7,21 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnDailySummaryQueue ( - org_id NUMBER NOT NULL = + org_id NUMBER NOT NULL CONSTRAINT rhn_dsqueue_oid_fk - REFERENCES web_customer (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES web_customer (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnDevice.sql b/schema/spacewal= k/common/tables/rhnDevice.sql index 743a1ce..7660542 100644 --- a/schema/spacewalk/common/tables/rhnDevice.sql +++ b/schema/spacewalk/common/tables/rhnDevice.sql @@ -7,37 +7,37 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnDevice ( - id NUMBER NOT NULL = - CONSTRAINT rhn_device_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[32m_tbs]], = - server_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_device_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[32m_tbs]], + server_id NUMBER NOT NULL CONSTRAINT rhn_device_sid_fk - REFERENCES rhnServer (id) = - ON DELETE CASCADE, = - class VARCHAR2(16), = - bus VARCHAR2(16), = - detached NUMBER, = - device VARCHAR2(16), = - driver VARCHAR2(256), = - description VARCHAR2(256), = - pcitype NUMBER = - DEFAULT (-1), = - prop1 VARCHAR2(256), = - prop2 VARCHAR2(256), = - prop3 VARCHAR2(256), = - prop4 VARCHAR2(256), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnServer (id) + ON DELETE CASCADE, + class VARCHAR2(16), + bus VARCHAR2(16), + detached NUMBER, + device VARCHAR2(16), + driver VARCHAR2(256), + description VARCHAR2(256), + pcitype NUMBER + DEFAULT (-1), + prop1 VARCHAR2(256), + prop2 VARCHAR2(256), + prop3 VARCHAR2(256), + prop4 VARCHAR2(256), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnDistChannelMap.sql b/schema/= spacewalk/common/tables/rhnDistChannelMap.sql index 4a5fa52..9588aac 100644 --- a/schema/spacewalk/common/tables/rhnDistChannelMap.sql +++ b/schema/spacewalk/common/tables/rhnDistChannelMap.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnDistChannelMap ( - os VARCHAR2(64) NOT NULL, = - release VARCHAR2(64) NOT NULL, = - channel_arch_id NUMBER NOT NULL = + os VARCHAR2(64) NOT NULL, + release VARCHAR2(64) NOT NULL, + channel_arch_id NUMBER NOT NULL CONSTRAINT rhn_dcm_caid_fk - REFERENCES rhnChannelArch (id), = - channel_id NUMBER NOT NULL = + REFERENCES rhnChannelArch (id), + channel_id NUMBER NOT NULL CONSTRAINT rhn_dcm_cid_fk - REFERENCES rhnChannel (id) = + REFERENCES rhnChannel (id) ON DELETE CASCADE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnDownloadType.sql b/schema/sp= acewalk/common/tables/rhnDownloadType.sql index 692a1cf..645adaf 100644 --- a/schema/spacewalk/common/tables/rhnDownloadType.sql +++ b/schema/spacewalk/common/tables/rhnDownloadType.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnDownloadType ( - id NUMBER NOT NULL = - CONSTRAINT rhn_download_type_pk PRIMARY KEY, = - label VARCHAR2(48) NOT NULL, = + id NUMBER NOT NULL + CONSTRAINT rhn_download_type_pk PRIMARY KEY, + label VARCHAR2(48) NOT NULL, name VARCHAR2(96) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnDownloads.sql b/schema/space= walk/common/tables/rhnDownloads.sql index 5355894..b66dd57 100644 --- a/schema/spacewalk/common/tables/rhnDownloads.sql +++ b/schema/spacewalk/common/tables/rhnDownloads.sql @@ -7,33 +7,33 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnDownloads ( - id NUMBER NOT NULL = - CONSTRAINT rhn_dl_id_pk PRIMARY KEY, = - channel_family_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_dl_id_pk PRIMARY KEY, + channel_family_id NUMBER NOT NULL CONSTRAINT rhn_dl_cfid_fk - REFERENCES rhnChannelFamily (id), = - file_id NUMBER NOT NULL = + REFERENCES rhnChannelFamily (id), + file_id NUMBER NOT NULL CONSTRAINT rhn_dl_fid_fk - REFERENCES rhnFile (id), = - name VARCHAR2(128) NOT NULL, = - category VARCHAR2(128) NOT NULL, = - ordering NUMBER NOT NULL, = - download_type NUMBER = + REFERENCES rhnFile (id), + name VARCHAR2(128) NOT NULL, + category VARCHAR2(128) NOT NULL, + ordering NUMBER NOT NULL, + download_type NUMBER CONSTRAINT rhn_dl_dltype_fk - REFERENCES rhnDownloadType (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = - DEFAULT (sysdate) NOT NULL, = + REFERENCES rhnDownloadType (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE + DEFAULT (sysdate) NOT NULL, release_notes_url VARCHAR2(512) ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnEmailAddress.sql b/schema/sp= acewalk/common/tables/rhnEmailAddress.sql index 6fc62f7..a8d4658 100644 --- a/schema/spacewalk/common/tables/rhnEmailAddress.sql +++ b/schema/spacewalk/common/tables/rhnEmailAddress.sql @@ -7,28 +7,28 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnEmailAddress ( - id NUMBER NOT NULL, = - address VARCHAR2(128) NOT NULL, = - user_id NUMBER NOT NULL = + id NUMBER NOT NULL, + address VARCHAR2(128) NOT NULL, + user_id NUMBER NOT NULL CONSTRAINT rhn_eaddress_uid_fk - REFERENCES web_contact (id) = - ON DELETE CASCADE, = - state_id NUMBER NOT NULL = + REFERENCES web_contact (id) + ON DELETE CASCADE, + state_id NUMBER NOT NULL CONSTRAINT rhn_eaddress_sid_fk - REFERENCES rhnEmailAddressState (id), = - next_action DATE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnEmailAddressState (id), + next_action DATE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) TABLESPACE [[8m_data_tbs]] diff --git a/schema/spacewalk/common/tables/rhnEmailAddressLog.sql b/schema= /spacewalk/common/tables/rhnEmailAddressLog.sql index ba3342d..42dec93 100644 --- a/schema/spacewalk/common/tables/rhnEmailAddressLog.sql +++ b/schema/spacewalk/common/tables/rhnEmailAddressLog.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnEmailAddressLog ( - user_id NUMBER NOT NULL = + user_id NUMBER NOT NULL CONSTRAINT rhn_eaddresslog_uid_fk - REFERENCES web_contact (id) = - ON DELETE CASCADE, = - address VARCHAR2(128) NOT NULL, = - reason VARCHAR2(4000), = - created DATE = + REFERENCES web_contact (id) + ON DELETE CASCADE, + address VARCHAR2(128) NOT NULL, + reason VARCHAR2(4000), + created DATE DEFAULT (sysdate) NOT NULL ) TABLESPACE [[8m_data_tbs]] diff --git a/schema/spacewalk/common/tables/rhnEmailAddressState.sql b/sche= ma/spacewalk/common/tables/rhnEmailAddressState.sql index 2068d71..535b963 100644 --- a/schema/spacewalk/common/tables/rhnEmailAddressState.sql +++ b/schema/spacewalk/common/tables/rhnEmailAddressState.sql @@ -7,20 +7,20 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnEmailAddressState ( - id NUMBER NOT NULL, = - label VARCHAR2(32) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL, + label VARCHAR2(32) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) TABLESPACE [[8m_data_tbs]] diff --git a/schema/spacewalk/common/tables/rhnEntitlementLog.sql b/schema/= spacewalk/common/tables/rhnEntitlementLog.sql index 7d8e714..8773e19 100644 --- a/schema/spacewalk/common/tables/rhnEntitlementLog.sql +++ b/schema/spacewalk/common/tables/rhnEntitlementLog.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnEntitlementLog ( - run_time DATE = - DEFAULT (sysdate) NOT NULL, = - bdate DATE NOT NULL, = + run_time DATE + DEFAULT (sysdate) NOT NULL, + bdate DATE NOT NULL, edate DATE NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnErrata.sql b/schema/spacewal= k/common/tables/rhnErrata.sql index 6e9cc3c..3b35e0e 100644 --- a/schema/spacewalk/common/tables/rhnErrata.sql +++ b/schema/spacewalk/common/tables/rhnErrata.sql @@ -7,49 +7,49 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnErrata ( - id NUMBER NOT NULL = - CONSTRAINT rhn_errata_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - advisory VARCHAR2(37) NOT NULL, = - advisory_type VARCHAR2(32) NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_errata_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + advisory VARCHAR2(37) NOT NULL, + advisory_type VARCHAR2(32) NOT NULL CONSTRAINT rhn_errata_adv_type_ck - CHECK (advisory_type in ( 'Bug Fix Advisory'= , 'Product Enhancement Advisory' , 'Security Advisory' )), = - advisory_name VARCHAR2(32) NOT NULL, = - advisory_rel NUMBER NOT NULL, = - product VARCHAR2(64) NOT NULL, = - description VARCHAR2(4000), = - synopsis VARCHAR2(4000) NOT NULL, = - topic VARCHAR2(4000), = - solution VARCHAR2(4000) NOT NULL, = - issue_date DATE = - DEFAULT (sysdate) NOT NULL, = - update_date DATE = - DEFAULT (sysdate) NOT NULL, = - refers_to VARCHAR2(4000), = - notes VARCHAR2(4000), = - org_id NUMBER = + CHECK (advisory_type in ( 'Bug Fix Advisory'= , 'Product Enhancement Advisory' , 'Security Advisory' )), + advisory_name VARCHAR2(32) NOT NULL, + advisory_rel NUMBER NOT NULL, + product VARCHAR2(64) NOT NULL, + description VARCHAR2(4000), + synopsis VARCHAR2(4000) NOT NULL, + topic VARCHAR2(4000), + solution VARCHAR2(4000) NOT NULL, + issue_date DATE + DEFAULT (sysdate) NOT NULL, + update_date DATE + DEFAULT (sysdate) NOT NULL, + refers_to VARCHAR2(4000), + notes VARCHAR2(4000), + org_id NUMBER CONSTRAINT rhn_errata_oid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - locally_modified CHAR(1) = + REFERENCES web_customer (id) + ON DELETE CASCADE, + locally_modified CHAR(1) CONSTRAINT rhn_errata_lm_ck - CHECK (locally_modified in ( 'Y' , 'N' )), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = - DEFAULT (sysdate) NOT NULL, = - last_modified DATE = - DEFAULT (sysdate) NOT NULL, = - severity_id NUMBER = + CHECK (locally_modified in ( 'Y' , 'N' )), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE + DEFAULT (sysdate) NOT NULL, + last_modified DATE + DEFAULT (sysdate) NOT NULL, + severity_id NUMBER CONSTRAINT rhn_errata_sevid_fk REFERENCES rhnErrataSeverity (id) ) diff --git a/schema/spacewalk/common/tables/rhnErrataBuglist.sql b/schema/s= pacewalk/common/tables/rhnErrataBuglist.sql index 306a292..6a7c179 100644 --- a/schema/spacewalk/common/tables/rhnErrataBuglist.sql +++ b/schema/spacewalk/common/tables/rhnErrataBuglist.sql @@ -7,24 +7,24 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnErrataBuglist ( - errata_id NUMBER NOT NULL = + errata_id NUMBER NOT NULL CONSTRAINT rhn_errata_buglist_errata_fk - REFERENCES rhnErrata (id) = - ON DELETE CASCADE, = - bug_id NUMBER NOT NULL, = - summary VARCHAR2(4000), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnErrata (id) + ON DELETE CASCADE, + bug_id NUMBER NOT NULL, + summary VARCHAR2(4000), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnErrataBuglistTmp.sql b/schem= a/spacewalk/common/tables/rhnErrataBuglistTmp.sql index 03630c8..c5a548e 100644 --- a/schema/spacewalk/common/tables/rhnErrataBuglistTmp.sql +++ b/schema/spacewalk/common/tables/rhnErrataBuglistTmp.sql @@ -7,24 +7,24 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnErrataBuglistTmp ( - errata_id NUMBER NOT NULL = + errata_id NUMBER NOT NULL CONSTRAINT rhn_errata_buglisttmp_eid_fk - REFERENCES rhnErrataTmp (id) = - ON DELETE CASCADE, = - bug_id NUMBER NOT NULL, = - summary VARCHAR2(4000), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnErrataTmp (id) + ON DELETE CASCADE, + bug_id NUMBER NOT NULL, + summary VARCHAR2(4000), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnErrataCVE.sql b/schema/space= walk/common/tables/rhnErrataCVE.sql index aadd833..e6bb89d 100644 --- a/schema/spacewalk/common/tables/rhnErrataCVE.sql +++ b/schema/spacewalk/common/tables/rhnErrataCVE.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnErrataCVE ( - errata_id NUMBER NOT NULL = + errata_id NUMBER NOT NULL CONSTRAINT rhn_err_cve_eid_fk - REFERENCES rhnErrata (id) = - ON DELETE CASCADE, = - cve_id NUMBER NOT NULL = + REFERENCES rhnErrata (id) + ON DELETE CASCADE, + cve_id NUMBER NOT NULL CONSTRAINT rhn_err_cve_cid_fk - REFERENCES rhnCVE (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnCVE (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnErrataCloned.sql b/schema/sp= acewalk/common/tables/rhnErrataCloned.sql index 7a1483b..04483e0 100644 --- a/schema/spacewalk/common/tables/rhnErrataCloned.sql +++ b/schema/spacewalk/common/tables/rhnErrataCloned.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnErrataCloned ( - original_id NUMBER NOT NULL = + original_id NUMBER NOT NULL CONSTRAINT rhn_errataclone_feid_fk - REFERENCES rhnErrata (id) = - ON DELETE CASCADE, = - id NUMBER NOT NULL = + REFERENCES rhnErrata (id) + ON DELETE CASCADE, + id NUMBER NOT NULL CONSTRAINT rhn_errataclone_teid_fk - REFERENCES rhnErrata (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnErrata (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnErrataClonedTmp.sql b/schema= /spacewalk/common/tables/rhnErrataClonedTmp.sql index 25ffec1..9b69209 100644 --- a/schema/spacewalk/common/tables/rhnErrataClonedTmp.sql +++ b/schema/spacewalk/common/tables/rhnErrataClonedTmp.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnErrataClonedTmp ( - original_id NUMBER NOT NULL = + original_id NUMBER NOT NULL CONSTRAINT rhn_eclonedtmp_feid_fk - REFERENCES rhnErrata (id) = - ON DELETE CASCADE, = - id NUMBER NOT NULL = + REFERENCES rhnErrata (id) + ON DELETE CASCADE, + id NUMBER NOT NULL CONSTRAINT rhn_eclonedtmp_teid_fk - REFERENCES rhnErrataTmp (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnErrataTmp (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnErrataFile.sql b/schema/spac= ewalk/common/tables/rhnErrataFile.sql index 533816e..780bd7e 100644 --- a/schema/spacewalk/common/tables/rhnErrataFile.sql +++ b/schema/spacewalk/common/tables/rhnErrataFile.sql @@ -7,28 +7,28 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnErrataFile ( - id NUMBER NOT NULL, = - errata_id NUMBER NOT NULL = + id NUMBER NOT NULL, + errata_id NUMBER NOT NULL CONSTRAINT rhn_erratafile_errata_fk - REFERENCES rhnErrata (id) = - ON DELETE CASCADE, = - type NUMBER NOT NULL = + REFERENCES rhnErrata (id) + ON DELETE CASCADE, + type NUMBER NOT NULL CONSTRAINT rhn_erratafile_type_fk - REFERENCES rhnErrataFileType (id), = - md5sum VARCHAR2(64) NOT NULL, = - filename VARCHAR2(1024) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnErrataFileType (id), + md5sum VARCHAR2(64) NOT NULL, + filename VARCHAR2(1024) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnErrataFileChannel.sql b/sche= ma/spacewalk/common/tables/rhnErrataFileChannel.sql index 72ab8c8..f78128d 100644 --- a/schema/spacewalk/common/tables/rhnErrataFileChannel.sql +++ b/schema/spacewalk/common/tables/rhnErrataFileChannel.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnErrataFileChannel ( - channel_id NUMBER NOT NULL = + channel_id NUMBER NOT NULL CONSTRAINT rhn_efilec_cid_fk - REFERENCES rhnChannel (id) = - ON DELETE CASCADE, = - errata_file_id NUMBER NOT NULL = + REFERENCES rhnChannel (id) + ON DELETE CASCADE, + errata_file_id NUMBER NOT NULL CONSTRAINT rhn_efilec_eid_fk - REFERENCES rhnErrataFile (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnErrataFile (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnErrataFileChannelTmp.sql b/s= chema/spacewalk/common/tables/rhnErrataFileChannelTmp.sql index 914e530..85b7062 100644 --- a/schema/spacewalk/common/tables/rhnErrataFileChannelTmp.sql +++ b/schema/spacewalk/common/tables/rhnErrataFileChannelTmp.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnErrataFileChannelTmp ( - channel_id NUMBER NOT NULL = + channel_id NUMBER NOT NULL CONSTRAINT rhn_efilectmp_cid_fk - REFERENCES rhnChannel (id) = - ON DELETE CASCADE, = - errata_file_id NUMBER NOT NULL = + REFERENCES rhnChannel (id) + ON DELETE CASCADE, + errata_file_id NUMBER NOT NULL CONSTRAINT rhn_efilectmp_eid_fk - REFERENCES rhnErrataFileTmp (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnErrataFileTmp (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnErrataFilePackage.sql b/sche= ma/spacewalk/common/tables/rhnErrataFilePackage.sql index b427ba0..f0cb2a9 100644 --- a/schema/spacewalk/common/tables/rhnErrataFilePackage.sql +++ b/schema/spacewalk/common/tables/rhnErrataFilePackage.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnErrataFilePackage ( - package_id NUMBER NOT NULL = + package_id NUMBER NOT NULL CONSTRAINT rhn_efilep_pid_fk - REFERENCES rhnPackage (id) = - ON DELETE CASCADE, = - errata_file_id NUMBER NOT NULL = + REFERENCES rhnPackage (id) + ON DELETE CASCADE, + errata_file_id NUMBER NOT NULL CONSTRAINT rhn_efilep_fileid_fk - REFERENCES rhnErrataFile (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnErrataFile (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnErrataFilePackageSource.sql = b/schema/spacewalk/common/tables/rhnErrataFilePackageSource.sql index 2b2d134..b5e482a 100644 --- a/schema/spacewalk/common/tables/rhnErrataFilePackageSource.sql +++ b/schema/spacewalk/common/tables/rhnErrataFilePackageSource.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnErrataFilePackageSource ( - package_id NUMBER NOT NULL = + package_id NUMBER NOT NULL CONSTRAINT rhn_efileps_pid_fk - REFERENCES rhnPackageSource (id) = - ON DELETE CASCADE, = - errata_file_id NUMBER NOT NULL = + REFERENCES rhnPackageSource (id) + ON DELETE CASCADE, + errata_file_id NUMBER NOT NULL CONSTRAINT rhn_efileps_fileid_fk - REFERENCES rhnErrataFile (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnErrataFile (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnErrataFilePackageTmp.sql b/s= chema/spacewalk/common/tables/rhnErrataFilePackageTmp.sql index 17e8440..bdc68ad 100644 --- a/schema/spacewalk/common/tables/rhnErrataFilePackageTmp.sql +++ b/schema/spacewalk/common/tables/rhnErrataFilePackageTmp.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnErrataFilePackageTmp ( - package_id NUMBER NOT NULL = + package_id NUMBER NOT NULL CONSTRAINT rhn_efileptmp_pid_fk - REFERENCES rhnPackage (id) = - ON DELETE CASCADE, = - errata_file_id NUMBER NOT NULL = + REFERENCES rhnPackage (id) + ON DELETE CASCADE, + errata_file_id NUMBER NOT NULL CONSTRAINT rhn_efileptmp_fileid_fk - REFERENCES rhnErrataFileTmp (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnErrataFileTmp (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnErrataFileTmp.sql b/schema/s= pacewalk/common/tables/rhnErrataFileTmp.sql index eb470a1..dffc00c 100644 --- a/schema/spacewalk/common/tables/rhnErrataFileTmp.sql +++ b/schema/spacewalk/common/tables/rhnErrataFileTmp.sql @@ -7,28 +7,28 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnErrataFileTmp ( - id NUMBER NOT NULL, = - errata_id NUMBER NOT NULL = + id NUMBER NOT NULL, + errata_id NUMBER NOT NULL CONSTRAINT rhn_erratafiletmp_errata_fk - REFERENCES rhnErrataTmp (id) = - ON DELETE CASCADE, = - type NUMBER NOT NULL = + REFERENCES rhnErrataTmp (id) + ON DELETE CASCADE, + type NUMBER NOT NULL CONSTRAINT rhn_erratafiletmp_type_fk - REFERENCES rhnErrataFileType (id), = - md5sum VARCHAR2(64) NOT NULL, = - filename VARCHAR2(128) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnErrataFileType (id), + md5sum VARCHAR2(64) NOT NULL, + filename VARCHAR2(128) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnErrataFileType.sql b/schema/= spacewalk/common/tables/rhnErrataFileType.sql index f294829..dcb62c5 100644 --- a/schema/spacewalk/common/tables/rhnErrataFileType.sql +++ b/schema/spacewalk/common/tables/rhnErrataFileType.sql @@ -7,16 +7,16 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnErrataFileType ( - id NUMBER NOT NULL, = + id NUMBER NOT NULL, label VARCHAR2(128) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnErrataKeyword.sql b/schema/s= pacewalk/common/tables/rhnErrataKeyword.sql index b394f2b..7d68efd 100644 --- a/schema/spacewalk/common/tables/rhnErrataKeyword.sql +++ b/schema/spacewalk/common/tables/rhnErrataKeyword.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnErrataKeyword ( - errata_id NUMBER NOT NULL = + errata_id NUMBER NOT NULL CONSTRAINT rhn_err_keyword_eid_fk - REFERENCES rhnErrata (id) = - ON DELETE CASCADE, = - keyword VARCHAR2(64), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnErrata (id) + ON DELETE CASCADE, + keyword VARCHAR2(64), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnErrataKeywordTmp.sql b/schem= a/spacewalk/common/tables/rhnErrataKeywordTmp.sql index b9aa24b..8c5ff2b 100644 --- a/schema/spacewalk/common/tables/rhnErrataKeywordTmp.sql +++ b/schema/spacewalk/common/tables/rhnErrataKeywordTmp.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnErrataKeywordTmp ( - errata_id NUMBER NOT NULL = + errata_id NUMBER NOT NULL CONSTRAINT rhn_err_keywordtmp_eid_fk - REFERENCES rhnErrataTmp (id) = - ON DELETE CASCADE, = - keyword VARCHAR2(64), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnErrataTmp (id) + ON DELETE CASCADE, + keyword VARCHAR2(64), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnErrataNotificationQueue.sql = b/schema/spacewalk/common/tables/rhnErrataNotificationQueue.sql index fb857ab..07485ca 100644 --- a/schema/spacewalk/common/tables/rhnErrataNotificationQueue.sql +++ b/schema/spacewalk/common/tables/rhnErrataNotificationQueue.sql @@ -7,32 +7,32 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnErrataNotificationQueue ( - errata_id NUMBER NOT NULL = + errata_id NUMBER NOT NULL CONSTRAINT rhn_enqueue_eid_fk - REFERENCES rhnErrata (id) = - ON DELETE CASCADE, = - org_id NUMBER NOT NULL = + REFERENCES rhnErrata (id) + ON DELETE CASCADE, + org_id NUMBER NOT NULL CONSTRAINT rhn_enqueue_oid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - next_action DATE = - DEFAULT (sysdate), = + REFERENCES web_customer (id) + ON DELETE CASCADE, + next_action DATE + DEFAULT (sysdate), channel_id NUMBER NOT NULL CONSTRAINT rhn_enqueue_cid_fk REFERENCES rhnChannel(id) ON DELETE cascade, - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnErrataPackage.sql b/schema/s= pacewalk/common/tables/rhnErrataPackage.sql index e6b4979..7ad2a94 100644 --- a/schema/spacewalk/common/tables/rhnErrataPackage.sql +++ b/schema/spacewalk/common/tables/rhnErrataPackage.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnErrataPackage ( - errata_id NUMBER NOT NULL = + errata_id NUMBER NOT NULL CONSTRAINT rhn_err_pkg_eid_fk - REFERENCES rhnErrata (id) = - ON DELETE CASCADE, = - package_id NUMBER NOT NULL = + REFERENCES rhnErrata (id) + ON DELETE CASCADE, + package_id NUMBER NOT NULL CONSTRAINT rhn_err_pkg_pid_fk - REFERENCES rhnPackage (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnPackage (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnErrataPackageTmp.sql b/schem= a/spacewalk/common/tables/rhnErrataPackageTmp.sql index 2219519..626e1ec 100644 --- a/schema/spacewalk/common/tables/rhnErrataPackageTmp.sql +++ b/schema/spacewalk/common/tables/rhnErrataPackageTmp.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnErrataPackageTmp ( - errata_id NUMBER NOT NULL = + errata_id NUMBER NOT NULL CONSTRAINT rhn_err_pkgtmp_eid_fk - REFERENCES rhnErrataTmp (id) = - ON DELETE CASCADE, = - package_id NUMBER NOT NULL = + REFERENCES rhnErrataTmp (id) + ON DELETE CASCADE, + package_id NUMBER NOT NULL CONSTRAINT rhn_err_pkgtmp_pid_fk - REFERENCES rhnPackage (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnPackage (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnErrataQueue.sql b/schema/spa= cewalk/common/tables/rhnErrataQueue.sql index 5c5f764..15993d0 100644 --- a/schema/spacewalk/common/tables/rhnErrataQueue.sql +++ b/schema/spacewalk/common/tables/rhnErrataQueue.sql @@ -7,27 +7,27 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnErrataQueue ( - errata_id NUMBER NOT NULL = + errata_id NUMBER NOT NULL CONSTRAINT rhn_equeue_eid_fk - REFERENCES rhnErrata (id) = - ON DELETE CASCADE, = + REFERENCES rhnErrata (id) + ON DELETE CASCADE, channel_id NUMBER NOT NULL CONSTRAINT rhn_equeue_cid_fk REFERENCES rhnChannel(id) ON DELETE CASCADE, - next_action DATE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + next_action DATE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnErrataSeverity.sql b/schema/= spacewalk/common/tables/rhnErrataSeverity.sql index 17817c4..8b25904 100644 --- a/schema/spacewalk/common/tables/rhnErrataSeverity.sql +++ b/schema/spacewalk/common/tables/rhnErrataSeverity.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnErrataSeverity ( - id NUMBER NOT NULL = - CONSTRAINT rhn_errata_sev_id_pk PRIMARY KEY, = - rank NUMBER NOT NULL, = + id NUMBER NOT NULL + CONSTRAINT rhn_errata_sev_id_pk PRIMARY KEY, + rank NUMBER NOT NULL, label VARCHAR2(40) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnErrataTmp.sql b/schema/space= walk/common/tables/rhnErrataTmp.sql index 21a8096..56c82ca 100644 --- a/schema/spacewalk/common/tables/rhnErrataTmp.sql +++ b/schema/spacewalk/common/tables/rhnErrataTmp.sql @@ -7,47 +7,47 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnErrataTmp ( - id NUMBER NOT NULL = - CONSTRAINT rhn_erratatmp_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - advisory VARCHAR2(37) NOT NULL, = - advisory_type VARCHAR2(32) NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_erratatmp_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + advisory VARCHAR2(37) NOT NULL, + advisory_type VARCHAR2(32) NOT NULL CONSTRAINT rhn_erratatmp_adv_type_ck - CHECK (advisory_type in ( 'Bug Fix Advisory'= , 'Product Enhancement Advisory' , 'Security Advisory' )), = - advisory_name VARCHAR2(32) NOT NULL, = - advisory_rel NUMBER NOT NULL, = - product VARCHAR2(64), = - description VARCHAR2(4000), = - synopsis VARCHAR2(4000), = - topic VARCHAR2(4000), = - solution VARCHAR2(4000), = - issue_date DATE = - DEFAULT (sysdate) NOT NULL, = - update_date DATE = - DEFAULT (sysdate) NOT NULL, = - refers_to VARCHAR2(4000), = - notes VARCHAR2(4000), = - org_id NUMBER = + CHECK (advisory_type in ( 'Bug Fix Advisory'= , 'Product Enhancement Advisory' , 'Security Advisory' )), + advisory_name VARCHAR2(32) NOT NULL, + advisory_rel NUMBER NOT NULL, + product VARCHAR2(64), + description VARCHAR2(4000), + synopsis VARCHAR2(4000), + topic VARCHAR2(4000), + solution VARCHAR2(4000), + issue_date DATE + DEFAULT (sysdate) NOT NULL, + update_date DATE + DEFAULT (sysdate) NOT NULL, + refers_to VARCHAR2(4000), + notes VARCHAR2(4000), + org_id NUMBER CONSTRAINT rhn_erratatmp_oid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - locally_modified CHAR(1) = + REFERENCES web_customer (id) + ON DELETE CASCADE, + locally_modified CHAR(1) CONSTRAINT rhn_erratatmp_lm_ck - CHECK (locally_modified in ( 'Y' , 'N' )), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = - DEFAULT (sysdate) NOT NULL, = - last_modified DATE = + CHECK (locally_modified in ( 'Y' , 'N' )), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE + DEFAULT (sysdate) NOT NULL, + last_modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnException.sql b/schema/space= walk/common/tables/rhnException.sql index 2fcaf7d..034bd12 100644 --- a/schema/spacewalk/common/tables/rhnException.sql +++ b/schema/spacewalk/common/tables/rhnException.sql @@ -7,19 +7,19 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnException ( - id NUMBER NOT NULL = - CONSTRAINT rhn_exc_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - label VARCHAR2(128) NOT NULL, = + id NUMBER NOT NULL + CONSTRAINT rhn_exc_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + label VARCHAR2(128) NOT NULL, message VARCHAR2(2000) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnFAQ.sql b/schema/spacewalk/c= ommon/tables/rhnFAQ.sql index 58f9641..40b3c39 100644 --- a/schema/spacewalk/common/tables/rhnFAQ.sql +++ b/schema/spacewalk/common/tables/rhnFAQ.sql @@ -7,30 +7,30 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnFAQ ( - id NUMBER NOT NULL = - CONSTRAINT rhn_faq_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - class_id NUMBER = + id NUMBER NOT NULL + CONSTRAINT rhn_faq_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + class_id NUMBER CONSTRAINT rhn_faq_class_fk - REFERENCES rhnFAQClass (id), = - subject VARCHAR2(200), = - details VARCHAR2(4000), = - private NUMBER = - DEFAULT (0) NOT NULL, = - usage_count NUMBER = - DEFAULT (0) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnFAQClass (id), + subject VARCHAR2(200), + details VARCHAR2(4000), + private NUMBER + DEFAULT (0) NOT NULL, + usage_count NUMBER + DEFAULT (0) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnFAQClass.sql b/schema/spacew= alk/common/tables/rhnFAQClass.sql index 513c237..6f3432f 100644 --- a/schema/spacewalk/common/tables/rhnFAQClass.sql +++ b/schema/spacewalk/common/tables/rhnFAQClass.sql @@ -7,20 +7,20 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnFAQClass ( - id NUMBER NOT NULL = - CONSTRAINT rhn_faq_class_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - name VARCHAR2(128), = - label VARCHAR2(32) NOT NULL, = + id NUMBER NOT NULL + CONSTRAINT rhn_faq_class_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + name VARCHAR2(128), + label VARCHAR2(32) NOT NULL, ordering NUMBER NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnFeature.sql b/schema/spacewa= lk/common/tables/rhnFeature.sql index eac39b6..744d9a3 100644 --- a/schema/spacewalk/common/tables/rhnFeature.sql +++ b/schema/spacewalk/common/tables/rhnFeature.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnFeature ( - id NUMBER = - CONSTRAINT rhn_feature_id PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - label VARCHAR2(32) NOT NULL, = - name VARCHAR2(64) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER + CONSTRAINT rhn_feature_id PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + label VARCHAR2(32) NOT NULL, + name VARCHAR2(64) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnFile.sql b/schema/spacewalk/= common/tables/rhnFile.sql index b57827d..e7c9cb0 100644 --- a/schema/spacewalk/common/tables/rhnFile.sql +++ b/schema/spacewalk/common/tables/rhnFile.sql @@ -7,28 +7,28 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnFile ( - id NUMBER NOT NULL = - CONSTRAINT rhn_file_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - org_id NUMBER = + id NUMBER NOT NULL + CONSTRAINT rhn_file_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + org_id NUMBER CONSTRAINT rhn_file_oid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - file_size NUMBER NOT NULL, = - md5sum VARCHAR2(64) NOT NULL, = - path VARCHAR2(1000) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES web_customer (id) + ON DELETE CASCADE, + file_size NUMBER NOT NULL, + md5sum VARCHAR2(64) NOT NULL, + path VARCHAR2(1000) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnFileDownload.sql b/schema/sp= acewalk/common/tables/rhnFileDownload.sql index c0d18bf..c5df780 100644 --- a/schema/spacewalk/common/tables/rhnFileDownload.sql +++ b/schema/spacewalk/common/tables/rhnFileDownload.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnFileDownload ( - file_id NUMBER NOT NULL = + file_id NUMBER NOT NULL CONSTRAINT rhn_filedl_fid_fk - REFERENCES rhnFile (id), = - location VARCHAR2(2000) NOT NULL, = - token VARCHAR2(48), = - requestor_ip VARCHAR2(15) NOT NULL, = - start_time DATE = - DEFAULT (sysdate) NOT NULL, = - user_id NUMBER = + REFERENCES rhnFile (id), + location VARCHAR2(2000) NOT NULL, + token VARCHAR2(48), + requestor_ip VARCHAR2(15) NOT NULL, + start_time DATE + DEFAULT (sysdate) NOT NULL, + user_id NUMBER CONSTRAINT rhn_filedl_uid_fk - REFERENCES web_contact (id) = + REFERENCES web_contact (id) ON DELETE SET NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnFileList.sql b/schema/spacew= alk/common/tables/rhnFileList.sql index 11fc24d..e22fe79 100644 --- a/schema/spacewalk/common/tables/rhnFileList.sql +++ b/schema/spacewalk/common/tables/rhnFileList.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnFileList ( - id NUMBER NOT NULL = - CONSTRAINT rhn_filelist_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[4m_tbs]], = - label VARCHAR2(128) NOT NULL, = - org_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_filelist_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[4m_tbs]], + label VARCHAR2(128) NOT NULL, + org_id NUMBER NOT NULL CONSTRAINT rhn_filelist_oid_fk - REFERENCES web_customer (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES web_customer (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnFileListMembers.sql b/schema= /spacewalk/common/tables/rhnFileListMembers.sql index 02a4e51..0cb3caf 100644 --- a/schema/spacewalk/common/tables/rhnFileListMembers.sql +++ b/schema/spacewalk/common/tables/rhnFileListMembers.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnFileListMembers ( - file_list_id NUMBER NOT NULL = + file_list_id NUMBER NOT NULL CONSTRAINT rhn_flmembers_flid_fk - REFERENCES rhnFileList (id) = - ON DELETE CASCADE, = - config_file_name_id NUMBER NOT NULL = + REFERENCES rhnFileList (id) + ON DELETE CASCADE, + config_file_name_id NUMBER NOT NULL CONSTRAINT rhn_flmembers_cfnid_fk - REFERENCES rhnConfigFileName (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnConfigFileName (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnFileLocation.sql b/schema/sp= acewalk/common/tables/rhnFileLocation.sql index d49c327..3a63ba1 100644 --- a/schema/spacewalk/common/tables/rhnFileLocation.sql +++ b/schema/spacewalk/common/tables/rhnFileLocation.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnFileLocation ( - file_id NUMBER NOT NULL = + file_id NUMBER NOT NULL CONSTRAINT rhn_fileloc_fid_fk - REFERENCES rhnFile (id), = + REFERENCES rhnFile (id), location VARCHAR2(128) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnGrailComponentChoices.sql b/= schema/spacewalk/common/tables/rhnGrailComponentChoices.sql index f8df949..3aa9205 100644 --- a/schema/spacewalk/common/tables/rhnGrailComponentChoices.sql +++ b/schema/spacewalk/common/tables/rhnGrailComponentChoices.sql @@ -7,21 +7,21 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnGrailComponentChoices ( - user_id NUMBER NOT NULL = + user_id NUMBER NOT NULL CONSTRAINT rhn_grail_comp_ch_user_fk - REFERENCES web_contact (id) = - ON DELETE CASCADE, = - ordering NUMBER NOT NULL, = - component_pkg VARCHAR2(64) NOT NULL, = + REFERENCES web_contact (id) + ON DELETE CASCADE, + ordering NUMBER NOT NULL, + component_pkg VARCHAR2(64) NOT NULL, component_mode VARCHAR2(64) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnGrailComponents.sql b/schema= /spacewalk/common/tables/rhnGrailComponents.sql index e278e78..11d108c 100644 --- a/schema/spacewalk/common/tables/rhnGrailComponents.sql +++ b/schema/spacewalk/common/tables/rhnGrailComponents.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnGrailComponents ( - id NUMBER = - CONSTRAINT rhn_grail_comp_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - component_pkg VARCHAR2(64) NOT NULL, = - component_mode VARCHAR2(64) NOT NULL, = - config_mode VARCHAR2(64), = - component_label VARCHAR2(128), = - role_required NUMBER = + id NUMBER + CONSTRAINT rhn_grail_comp_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + component_pkg VARCHAR2(64) NOT NULL, + component_mode VARCHAR2(64) NOT NULL, + config_mode VARCHAR2(64), + component_label VARCHAR2(128), + role_required NUMBER CONSTRAINT rhn_grail_comp_role_type_fk REFERENCES rhnUserGroupType (id) ) diff --git a/schema/spacewalk/common/tables/rhnIndexerWork.sql b/schema/spa= cewalk/common/tables/rhnIndexerWork.sql index 554fae3..4399804 100644 --- a/schema/spacewalk/common/tables/rhnIndexerWork.sql +++ b/schema/spacewalk/common/tables/rhnIndexerWork.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnIndexerWork ( - object_type VARCHAR2(40) NOT NULL, = - last_id NUMBER NOT NULL, = - last_modified DATE = + object_type VARCHAR2(40) NOT NULL, + last_id NUMBER NOT NULL, + last_modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnInfoPane.sql b/schema/spacew= alk/common/tables/rhnInfoPane.sql index 5c34113..c9df191 100644 --- a/schema/spacewalk/common/tables/rhnInfoPane.sql +++ b/schema/spacewalk/common/tables/rhnInfoPane.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnInfoPane ( - id NUMBER = - CONSTRAINT rhn_info_pane_id_pk PRIMARY KEY, = - label VARCHAR2(64) NOT NULL, = + id NUMBER + CONSTRAINT rhn_info_pane_id_pk PRIMARY KEY, + label VARCHAR2(64) NOT NULL, acl VARCHAR2(4000) ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnKSData.sql b/schema/spacewal= k/common/tables/rhnKSData.sql index 94772cc..176519f 100644 --- a/schema/spacewalk/common/tables/rhnKSData.sql +++ b/schema/spacewalk/common/tables/rhnKSData.sql @@ -7,63 +7,63 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnKSData ( - id NUMBER NOT NULL = - CONSTRAINT rhn_ks_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[8m_tbs]], = - ks_type VARCHAR2(8) NOT NULL, = - org_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_ks_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[8m_tbs]], + ks_type VARCHAR2(8) NOT NULL, + org_id NUMBER NOT NULL CONSTRAINT rhn_ks_oid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - is_org_default CHAR(1) = - DEFAULT ('N') NOT NULL = + REFERENCES web_customer (id) + ON DELETE CASCADE, + is_org_default CHAR(1) + DEFAULT ('N') NOT NULL CONSTRAINT rhn_ks_default_ck - CHECK (is_org_default in ( 'Y' , 'N' )), = - label VARCHAR2(64) NOT NULL, = - comments VARCHAR2(4000), = - active CHAR(1) = - DEFAULT ('Y') NOT NULL = + CHECK (is_org_default in ( 'Y' , 'N' )), + label VARCHAR2(64) NOT NULL, + comments VARCHAR2(4000), + active CHAR(1) + DEFAULT ('Y') NOT NULL CONSTRAINT rhn_ks_active_ck - CHECK (active in ( 'Y' , 'N' )), = - postLog CHAR(1) = - DEFAULT ('N') NOT NULL = + CHECK (active in ( 'Y' , 'N' )), + postLog CHAR(1) + DEFAULT ('N') NOT NULL CONSTRAINT rhn_ks_post_log_ck - CHECK (postLog in ( 'Y' , 'N' )), = - preLog CHAR(1) = - DEFAULT ('N') NOT NULL = + CHECK (postLog in ( 'Y' , 'N' )), + preLog CHAR(1) + DEFAULT ('N') NOT NULL CONSTRAINT rhn_ks_pre_log_ck - CHECK (preLog in ( 'Y' , 'N' )), = - kscfg CHAR(1) = - DEFAULT ('N') NOT NULL = + CHECK (preLog in ( 'Y' , 'N' )), + kscfg CHAR(1) + DEFAULT ('N') NOT NULL CONSTRAINT rhn_ks_cfg_save_ck - CHECK (kscfg in ( 'Y' , 'N' )), = - cobbler_id VARCHAR2(64), = - pre BLOB, = - post BLOB, = - nochroot_post BLOB, = - static_device VARCHAR2(32), = - kernel_params VARCHAR2(128), = - verboseup2date CHAR(1) = - DEFAULT ('N') NOT NULL = + CHECK (kscfg in ( 'Y' , 'N' )), + cobbler_id VARCHAR2(64), + pre BLOB, + post BLOB, + nochroot_post BLOB, + static_device VARCHAR2(32), + kernel_params VARCHAR2(128), + verboseup2date CHAR(1) + DEFAULT ('N') NOT NULL CONSTRAINT rhn_ks_verbose_up2date_ck - CHECK (verboseup2date in ( 'Y' , 'N' )), = - nonchrootpost CHAR(1) = - DEFAULT ('N') NOT NULL = + CHECK (verboseup2date in ( 'Y' , 'N' )), + nonchrootpost CHAR(1) + DEFAULT ('N') NOT NULL CONSTRAINT rhn_ks_nonchroot_post_ck - CHECK (nonchrootpost in ( 'Y' , 'N' )), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = - DEFAULT (sysdate) NOT NULL, = + CHECK (nonchrootpost in ( 'Y' , 'N' )), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE + DEFAULT (sysdate) NOT NULL, = CONSTRAINT rhn_ks_type_ck CHECK (ks_type in ( 'wizard' , 'raw' )) diff --git a/schema/spacewalk/common/tables/rhnKSInstallType.sql b/schema/s= pacewalk/common/tables/rhnKSInstallType.sql index f0abf12..f599179 100644 --- a/schema/spacewalk/common/tables/rhnKSInstallType.sql +++ b/schema/spacewalk/common/tables/rhnKSInstallType.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnKSInstallType ( - id NUMBER NOT NULL = - CONSTRAINT rhn_ksinstalltype_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - label VARCHAR2(32) NOT NULL, = - name VARCHAR2(64) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_ksinstalltype_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + label VARCHAR2(32) NOT NULL, + name VARCHAR2(64) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnKSTreeFile.sql b/schema/spac= ewalk/common/tables/rhnKSTreeFile.sql index 8777cee..323269d 100644 --- a/schema/spacewalk/common/tables/rhnKSTreeFile.sql +++ b/schema/spacewalk/common/tables/rhnKSTreeFile.sql @@ -7,27 +7,27 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnKSTreeFile ( - kstree_id NUMBER NOT NULL = + kstree_id NUMBER NOT NULL CONSTRAINT rhn_kstreefile_kid_fk - REFERENCES rhnKickstartableTree (id) = - ON DELETE CASCADE, = - relative_filename VARCHAR2(256) NOT NULL, = - md5sum VARCHAR2(64) NOT NULL, = - file_size NUMBER NOT NULL, = - last_modified DATE = - DEFAULT (sysdate) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnKickstartableTree (id) + ON DELETE CASCADE, + relative_filename VARCHAR2(256) NOT NULL, + md5sum VARCHAR2(64) NOT NULL, + file_size NUMBER NOT NULL, + last_modified DATE + DEFAULT (sysdate) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnKSTreeType.sql b/schema/spac= ewalk/common/tables/rhnKSTreeType.sql index 1475039..296e704 100644 --- a/schema/spacewalk/common/tables/rhnKSTreeType.sql +++ b/schema/spacewalk/common/tables/rhnKSTreeType.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnKSTreeType ( - id NUMBER NOT NULL = - CONSTRAINT rhn_kstreetype_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - label VARCHAR2(32) NOT NULL, = - name VARCHAR2(64) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_kstreetype_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + label VARCHAR2(32) NOT NULL, + name VARCHAR2(64) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnKickstartChildChannel.sql b/= schema/spacewalk/common/tables/rhnKickstartChildChannel.sql index cdc06a2..27d0181 100644 --- a/schema/spacewalk/common/tables/rhnKickstartChildChannel.sql +++ b/schema/spacewalk/common/tables/rhnKickstartChildChannel.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnKickstartChildChannel ( - channel_id NUMBER NOT NULL = + channel_id NUMBER NOT NULL CONSTRAINT rhn_ks_cc_cid_fk - REFERENCES rhnChannel (id) = - ON DELETE CASCADE, = - ksdata_id NUMBER NOT NULL = + REFERENCES rhnChannel (id) + ON DELETE CASCADE, + ksdata_id NUMBER NOT NULL CONSTRAINT rhn_ks_cc_ksd_fk - REFERENCES rhnKSData (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnKSData (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnKickstartCommand.sql b/schem= a/spacewalk/common/tables/rhnKickstartCommand.sql index 2a64cc3..869acf8 100644 --- a/schema/spacewalk/common/tables/rhnKickstartCommand.sql +++ b/schema/spacewalk/common/tables/rhnKickstartCommand.sql @@ -7,29 +7,29 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnKickstartCommand ( - id NUMBER = - CONSTRAINT rhn_kscommand_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[4m_tbs]], = - kickstart_id NUMBER NOT NULL = + id NUMBER + CONSTRAINT rhn_kscommand_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[4m_tbs]], + kickstart_id NUMBER NOT NULL CONSTRAINT rhn_kscommand_ksid_fk - REFERENCES rhnKSData (id) = - ON DELETE CASCADE, = - ks_command_name_id NUMBER NOT NULL = + REFERENCES rhnKSData (id) + ON DELETE CASCADE, + ks_command_name_id NUMBER NOT NULL CONSTRAINT rhn_kscommand_kcnid_fk - REFERENCES rhnKickstartCommandName (id), = - arguments VARCHAR2(2048), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnKickstartCommandName (id), + arguments VARCHAR2(2048), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnKickstartCommandName.sql b/s= chema/spacewalk/common/tables/rhnKickstartCommandName.sql index 51ce9d1..282259a 100644 --- a/schema/spacewalk/common/tables/rhnKickstartCommandName.sql +++ b/schema/spacewalk/common/tables/rhnKickstartCommandName.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnKickstartCommandName ( - id NUMBER NOT NULL = - CONSTRAINT rhn_kscommandname_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]], = - name VARCHAR2(128) NOT NULL, = - uses_arguments CHAR(1) NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_kscommandname_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]], + name VARCHAR2(128) NOT NULL, + uses_arguments CHAR(1) NOT NULL CONSTRAINT rhn_kscommandname_uses_args_ck - CHECK (uses_arguments in ( 'Y' , 'N' )), = - sort_order NUMBER NOT NULL, = - required CHAR(1) = - DEFAULT ('N') NOT NULL = + CHECK (uses_arguments in ( 'Y' , 'N' )), + sort_order NUMBER NOT NULL, + required CHAR(1) + DEFAULT ('N') NOT NULL CONSTRAINT rhn_kscommandname_reqrd_ck CHECK (required in ( 'Y' , 'N' )) ) diff --git a/schema/spacewalk/common/tables/rhnKickstartDefaultRegToken.sql= b/schema/spacewalk/common/tables/rhnKickstartDefaultRegToken.sql index 43bcb94..9836517 100644 --- a/schema/spacewalk/common/tables/rhnKickstartDefaultRegToken.sql +++ b/schema/spacewalk/common/tables/rhnKickstartDefaultRegToken.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnKickstartDefaultRegToken ( - kickstart_id NUMBER NOT NULL = + kickstart_id NUMBER NOT NULL CONSTRAINT rhn_ksdrt_ksid_fk - REFERENCES rhnKSData (id) = - ON DELETE CASCADE, = - regtoken_id NUMBER NOT NULL = + REFERENCES rhnKSData (id) + ON DELETE CASCADE, + regtoken_id NUMBER NOT NULL CONSTRAINT rhn_ksdrt_rtid_fk - REFERENCES rhnRegToken (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnRegToken (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnKickstartDefaults.sql b/sche= ma/spacewalk/common/tables/rhnKickstartDefaults.sql index d6ccadb..a395645 100644 --- a/schema/spacewalk/common/tables/rhnKickstartDefaults.sql +++ b/schema/spacewalk/common/tables/rhnKickstartDefaults.sql @@ -7,43 +7,43 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnKickstartDefaults ( - kickstart_id NUMBER NOT NULL = - CONSTRAINT rhn_ksd_ksid_uq UNIQUE = + kickstart_id NUMBER NOT NULL + CONSTRAINT rhn_ksd_ksid_uq UNIQUE CONSTRAINT rhn_ksd_ksid_fk - REFERENCES rhnKSData (id) = - ON DELETE CASCADE, = - kstree_id NUMBER NOT NULL = + REFERENCES rhnKSData (id) + ON DELETE CASCADE, + kstree_id NUMBER NOT NULL CONSTRAINT rhn_ksd_kstid_fk - REFERENCES rhnKickstartableTree (id) = - ON DELETE CASCADE, = - server_profile_id NUMBER = + REFERENCES rhnKickstartableTree (id) + ON DELETE CASCADE, + server_profile_id NUMBER CONSTRAINT rhn_ksd_spid_fk - REFERENCES rhnServerProfile (id) = - ON DELETE SET NULL, = - cfg_management_flag CHAR(1) = - DEFAULT ('Y') NOT NULL = + REFERENCES rhnServerProfile (id) + ON DELETE SET NULL, + cfg_management_flag CHAR(1) + DEFAULT ('Y') NOT NULL CONSTRAINT rhn_ksd_cmf_ck - CHECK (cfg_management_flag in ( 'Y' , 'N'= )), = - remote_command_flag CHAR(1) = - DEFAULT ('N') NOT NULL = + CHECK (cfg_management_flag in ( 'Y' , 'N'= )), + remote_command_flag CHAR(1) + DEFAULT ('N') NOT NULL CONSTRAINT rhn_ksd_rmf_ck - CHECK (remote_command_flag in ( 'Y' , 'N'= )), = - virtualization_type NUMBER NOT NULL = + CHECK (remote_command_flag in ( 'Y' , 'N'= )), + virtualization_type NUMBER NOT NULL CONSTRAINT rhn_ksd_kvt_fk - REFERENCES rhnKickstartVirtualizationType= (id) = - ON DELETE SET NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnKickstartVirtualizationType= (id) + ON DELETE SET NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnKickstartIPRange.sql b/schem= a/spacewalk/common/tables/rhnKickstartIPRange.sql index 8d57146..73a332c 100644 --- a/schema/spacewalk/common/tables/rhnKickstartIPRange.sql +++ b/schema/spacewalk/common/tables/rhnKickstartIPRange.sql @@ -7,28 +7,28 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnKickstartIPRange ( - kickstart_id NUMBER NOT NULL = + kickstart_id NUMBER NOT NULL CONSTRAINT rhn_ksip_ksid_fk - REFERENCES rhnKSData (id) = - ON DELETE CASCADE, = - org_id NUMBER NOT NULL = + REFERENCES rhnKSData (id) + ON DELETE CASCADE, + org_id NUMBER NOT NULL CONSTRAINT rhn_ksip_oid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - min NUMBER NOT NULL, = - max NUMBER NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES web_customer (id) + ON DELETE CASCADE, + min NUMBER NOT NULL, + max NUMBER NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnKickstartPackage.sql b/schem= a/spacewalk/common/tables/rhnKickstartPackage.sql index 2cc24d1..5b1f516 100644 --- a/schema/spacewalk/common/tables/rhnKickstartPackage.sql +++ b/schema/spacewalk/common/tables/rhnKickstartPackage.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnKickstartPackage ( - kickstart_id NUMBER NOT NULL = + kickstart_id NUMBER NOT NULL CONSTRAINT rhn_kspackage_ksid_fk - REFERENCES rhnKSData (id) = - ON DELETE CASCADE, = - package_name_id NUMBER NOT NULL = + REFERENCES rhnKSData (id) + ON DELETE CASCADE, + package_name_id NUMBER NOT NULL CONSTRAINT rhn_kspackage_pnid_fk - REFERENCES rhnPackageName (id), = - position NUMBER NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnPackageName (id), + position NUMBER NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnKickstartPreserveFileList.sq= l b/schema/spacewalk/common/tables/rhnKickstartPreserveFileList.sql index 94ef6a4..513c87e 100644 --- a/schema/spacewalk/common/tables/rhnKickstartPreserveFileList.sql +++ b/schema/spacewalk/common/tables/rhnKickstartPreserveFileList.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnKickstartPreserveFileList ( - kickstart_id NUMBER NOT NULL = + kickstart_id NUMBER NOT NULL CONSTRAINT rhn_kspreservefl_ksid_fk - REFERENCES rhnKSData (id) = - ON DELETE CASCADE, = - file_list_id NUMBER NOT NULL = + REFERENCES rhnKSData (id) + ON DELETE CASCADE, + file_list_id NUMBER NOT NULL CONSTRAINT rhn_kspreservefl_flid_fk - REFERENCES rhnFileList (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnFileList (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnKickstartScript.sql b/schema= /spacewalk/common/tables/rhnKickstartScript.sql index 5cbb2de..d12cecb 100644 --- a/schema/spacewalk/common/tables/rhnKickstartScript.sql +++ b/schema/spacewalk/common/tables/rhnKickstartScript.sql @@ -7,37 +7,37 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnKickstartScript ( - id NUMBER NOT NULL, = - kickstart_id NUMBER NOT NULL = + id NUMBER NOT NULL, + kickstart_id NUMBER NOT NULL CONSTRAINT rhn_ksscript_ksid_fk - REFERENCES rhnKSData (id) = - ON DELETE CASCADE, = - position NUMBER NOT NULL, = - script_type VARCHAR2(4) NOT NULL = + REFERENCES rhnKSData (id) + ON DELETE CASCADE, + position NUMBER NOT NULL, + script_type VARCHAR2(4) NOT NULL CONSTRAINT rhn_ksscript_st_ck - CHECK (script_type in ( 'pre' , 'post' )), = - chroot CHAR(1) = - DEFAULT ('Y') NOT NULL = + CHECK (script_type in ( 'pre' , 'post' )), + chroot CHAR(1) + DEFAULT ('Y') NOT NULL CONSTRAINT rhn_ksscript_chroot_ck - CHECK (chroot in ( 'Y' , 'N' )), = + CHECK (chroot in ( 'Y' , 'N' )), raw_script CHAR(1) DEFAULT ('Y') NOT NULL CONSTRAINT rhn_ksscript_rawscript_ck CHECK (raw_script in ('Y','N')), - interpreter VARCHAR2(80), = - data BLOB, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + interpreter VARCHAR2(80), + data BLOB, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnKickstartSession.sql b/schem= a/spacewalk/common/tables/rhnKickstartSession.sql index 6112a5e..f8a748d 100644 --- a/schema/spacewalk/common/tables/rhnKickstartSession.sql +++ b/schema/spacewalk/common/tables/rhnKickstartSession.sql @@ -7,73 +7,73 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnKickstartSession ( - id NUMBER NOT NULL = - CONSTRAINT rhn_ks_session_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[8m_tbs]], = - kickstart_id NUMBER = + id NUMBER NOT NULL + CONSTRAINT rhn_ks_session_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[8m_tbs]], + kickstart_id NUMBER CONSTRAINT rhn_ks_session_ksid_fk - REFERENCES rhnKSData (id) = - ON DELETE CASCADE, = - kickstart_mode VARCHAR2(32), = - kstree_id NUMBER = + REFERENCES rhnKSData (id) + ON DELETE CASCADE, + kickstart_mode VARCHAR2(32), + kstree_id NUMBER CONSTRAINT rhn_ks_session_kstid_fk - REFERENCES rhnKickstartableTree (id) = - ON DELETE SET NULL, = - org_id NUMBER NOT NULL = + REFERENCES rhnKickstartableTree (id) + ON DELETE SET NULL, + org_id NUMBER NOT NULL CONSTRAINT rhn_ks_session_oid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - scheduler NUMBER = + REFERENCES web_customer (id) + ON DELETE CASCADE, + scheduler NUMBER CONSTRAINT rhn_ks_session_sched_fk - REFERENCES web_contact (id) = - ON DELETE SET NULL, = - old_server_id NUMBER = + REFERENCES web_contact (id) + ON DELETE SET NULL, + old_server_id NUMBER CONSTRAINT rhn_ks_session_osid_fk - REFERENCES rhnServer (id), = - new_server_id NUMBER = + REFERENCES rhnServer (id), + new_server_id NUMBER CONSTRAINT rhn_ks_session_nsid_fk - REFERENCES rhnServer (id), = - host_server_id NUMBER = + REFERENCES rhnServer (id), + host_server_id NUMBER CONSTRAINT rhn_ks_session_hsid_fk - REFERENCES rhnServer (id) = - ON DELETE CASCADE, = - action_id NUMBER = + REFERENCES rhnServer (id) + ON DELETE CASCADE, + action_id NUMBER CONSTRAINT rhn_ks_session_aid_fk - REFERENCES rhnAction (id) = - ON DELETE SET NULL, = - state_id NUMBER NOT NULL = + REFERENCES rhnAction (id) + ON DELETE SET NULL, + state_id NUMBER NOT NULL CONSTRAINT rhn_ks_session_ksssid_fk - REFERENCES rhnKickstartSessionState (id), = - server_profile_id NUMBER = + REFERENCES rhnKickstartSessionState (id), + server_profile_id NUMBER CONSTRAINT rhn_ks_session_spid_fk - REFERENCES rhnServerProfile (id) = - ON DELETE SET NULL, = - last_action DATE = - DEFAULT (sysdate) NOT NULL, = - package_fetch_count NUMBER = - DEFAULT (0) NOT NULL, = - last_file_request VARCHAR2(2048), = - system_rhn_host VARCHAR2(256), = - kickstart_from_host VARCHAR2(256), = - deploy_configs CHAR(1) = - DEFAULT ('N') NOT NULL, = - virtualization_type NUMBER NOT NULL = + REFERENCES rhnServerProfile (id) + ON DELETE SET NULL, + last_action DATE + DEFAULT (sysdate) NOT NULL, + package_fetch_count NUMBER + DEFAULT (0) NOT NULL, + last_file_request VARCHAR2(2048), + system_rhn_host VARCHAR2(256), + kickstart_from_host VARCHAR2(256), + deploy_configs CHAR(1) + DEFAULT ('N') NOT NULL, + virtualization_type NUMBER NOT NULL CONSTRAINT rhn_kss_kvt_fk - REFERENCES rhnKickstartVirtualizationType= (id) = - ON DELETE SET NULL, = - client_ip VARCHAR2(15), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnKickstartVirtualizationType= (id) + ON DELETE SET NULL, + client_ip VARCHAR2(15), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnKickstartSessionHistory.sql = b/schema/spacewalk/common/tables/rhnKickstartSessionHistory.sql index fd06837..316f33b 100644 --- a/schema/spacewalk/common/tables/rhnKickstartSessionHistory.sql +++ b/schema/spacewalk/common/tables/rhnKickstartSessionHistory.sql @@ -7,35 +7,35 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnKickstartSessionHistory ( - id NUMBER NOT NULL = - CONSTRAINT rhn_ks_sessionhist_id_pk PRIMARY = KEY = - USING INDEX TABLESPACE [[8m_tbs]], = - kickstart_session_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_ks_sessionhist_id_pk PRIMARY = KEY + USING INDEX TABLESPACE [[8m_tbs]], + kickstart_session_id NUMBER NOT NULL CONSTRAINT rhn_ks_sessionhist_ksid_fk - REFERENCES rhnKickstartSession (id) = - ON DELETE CASCADE, = - action_id NUMBER = + REFERENCES rhnKickstartSession (id) + ON DELETE CASCADE, + action_id NUMBER CONSTRAINT rhn_ks_sessionhist_aid_fk - REFERENCES rhnAction (id) = - ON DELETE SET NULL, = - state_id NUMBER NOT NULL = + REFERENCES rhnAction (id) + ON DELETE SET NULL, + state_id NUMBER NOT NULL CONSTRAINT rhn_ks_sessionhist_stat_fk - REFERENCES rhnKickstartSessionState (id)= , = - time DATE = - DEFAULT (sysdate) NOT NULL, = - message VARCHAR2(4000), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnKickstartSessionState (id), + time DATE + DEFAULT (sysdate) NOT NULL, + message VARCHAR2(4000), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnKickstartSessionState.sql b/= schema/spacewalk/common/tables/rhnKickstartSessionState.sql index 9c60516..d8102c9 100644 --- a/schema/spacewalk/common/tables/rhnKickstartSessionState.sql +++ b/schema/spacewalk/common/tables/rhnKickstartSessionState.sql @@ -7,24 +7,24 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnKickstartSessionState ( - id NUMBER NOT NULL = - CONSTRAINT rhn_ks_session_state_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - label VARCHAR2(64) NOT NULL, = - name VARCHAR2(128) NOT NULL, = - description VARCHAR2(1024) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_ks_session_state_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + label VARCHAR2(64) NOT NULL, + name VARCHAR2(128) NOT NULL, + description VARCHAR2(1024) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnKickstartTimezone.sql b/sche= ma/spacewalk/common/tables/rhnKickstartTimezone.sql index 8cc8a78..7fcacd3 100644 --- a/schema/spacewalk/common/tables/rhnKickstartTimezone.sql +++ b/schema/spacewalk/common/tables/rhnKickstartTimezone.sql @@ -7,21 +7,21 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnKickstartTimezone ( - id NUMBER NOT NULL = - CONSTRAINT rhn_ks_timezone_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - label VARCHAR2(128) NOT NULL, = - name VARCHAR2(128) NOT NULL, = - install_type NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_ks_timezone_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + label VARCHAR2(128) NOT NULL, + name VARCHAR2(128) NOT NULL, + install_type NUMBER NOT NULL CONSTRAINT rhn_ks_timezone_it_fk REFERENCES rhnKSInstallType (id) ) diff --git a/schema/spacewalk/common/tables/rhnKickstartVirtualizationType.= sql b/schema/spacewalk/common/tables/rhnKickstartVirtualizationType.sql index 7f11c2a..6be9795 100644 --- a/schema/spacewalk/common/tables/rhnKickstartVirtualizationType.sql +++ b/schema/spacewalk/common/tables/rhnKickstartVirtualizationType.sql @@ -7,24 +7,24 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnKickstartVirtualizationType ( - id NUMBER NOT NULL = - CONSTRAINT rhn_kvt_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[8m_tbs]], = - name VARCHAR2(128) NOT NULL, = - label VARCHAR2(128) NOT NULL = - CONSTRAINT rhn_kvt_label_unq UNIQUE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_kvt_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[8m_tbs]], + name VARCHAR2(128) NOT NULL, + label VARCHAR2(128) NOT NULL + CONSTRAINT rhn_kvt_label_unq UNIQUE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnKickstartableTree.sql b/sche= ma/spacewalk/common/tables/rhnKickstartableTree.sql index ccee34b..27cf5ca 100644 --- a/schema/spacewalk/common/tables/rhnKickstartableTree.sql +++ b/schema/spacewalk/common/tables/rhnKickstartableTree.sql @@ -7,40 +7,40 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnKickstartableTree ( - id NUMBER NOT NULL, = - org_id NUMBER = + id NUMBER NOT NULL, + org_id NUMBER CONSTRAINT rhn_kstree_oid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - label VARCHAR2(64) NOT NULL, = - base_path VARCHAR2(256) NOT NULL, = - channel_id NUMBER NOT NULL = + REFERENCES web_customer (id) + ON DELETE CASCADE, + label VARCHAR2(64) NOT NULL, + base_path VARCHAR2(256) NOT NULL, + channel_id NUMBER NOT NULL CONSTRAINT rhn_kstree_cid_fk - REFERENCES rhnChannel (id), = - cobbler_id VARCHAR2(64), = - cobbler_xen_id VARCHAR2(64), = - boot_image VARCHAR2(128) = - DEFAULT ('spacewalk-koan'), = - kstree_type NUMBER NOT NULL = + REFERENCES rhnChannel (id), + cobbler_id VARCHAR2(64), + cobbler_xen_id VARCHAR2(64), + boot_image VARCHAR2(128) + DEFAULT ('spacewalk-koan'), + kstree_type NUMBER NOT NULL CONSTRAINT rhn_kstree_kstreetype_fk - REFERENCES rhnKSTreeType (id), = - install_type NUMBER NOT NULL = + REFERENCES rhnKSTreeType (id), + install_type NUMBER NOT NULL CONSTRAINT rhn_kstree_it_fk - REFERENCES rhnKSInstallType (id), = - last_modified DATE = - DEFAULT (sysdate) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnKSInstallType (id), + last_modified DATE + DEFAULT (sysdate) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnMessage.sql b/schema/spacewa= lk/common/tables/rhnMessage.sql index b289c11..e8c9247 100644 --- a/schema/spacewalk/common/tables/rhnMessage.sql +++ b/schema/spacewalk/common/tables/rhnMessage.sql @@ -7,28 +7,28 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnMessage ( - id NUMBER NOT NULL = - CONSTRAINT rhn_m_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - message_type NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_m_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + message_type NUMBER NOT NULL CONSTRAINT rhn_m_mt_fk - REFERENCES rhnMessageType (id), = - priority NUMBER = - DEFAULT (0) NOT NULL = + REFERENCES rhnMessageType (id), + priority NUMBER + DEFAULT (0) NOT NULL CONSTRAINT rhn_m_priority_fk - REFERENCES rhnMessagePriority (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnMessagePriority (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnMessagePriority.sql b/schema= /spacewalk/common/tables/rhnMessagePriority.sql index 1175b3e..c808905 100644 --- a/schema/spacewalk/common/tables/rhnMessagePriority.sql +++ b/schema/spacewalk/common/tables/rhnMessagePriority.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnMessagePriority ( - id NUMBER NOT NULL = - CONSTRAINT rhn_m_priority_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = + id NUMBER NOT NULL + CONSTRAINT rhn_m_priority_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], label VARCHAR2(48) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnMessageType.sql b/schema/spa= cewalk/common/tables/rhnMessageType.sql index db7b812..f6fb74c 100644 --- a/schema/spacewalk/common/tables/rhnMessageType.sql +++ b/schema/spacewalk/common/tables/rhnMessageType.sql @@ -7,19 +7,19 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnMessageType ( - id NUMBER NOT NULL = - CONSTRAINT rhn_m_type_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - label VARCHAR2(48) NOT NULL, = + id NUMBER NOT NULL + CONSTRAINT rhn_m_type_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + label VARCHAR2(48) NOT NULL, name VARCHAR2(96) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnMonitor.sql b/schema/spacewa= lk/common/tables/rhnMonitor.sql index 1bf5fdf..d01f6dc 100644 --- a/schema/spacewalk/common/tables/rhnMonitor.sql +++ b/schema/spacewalk/common/tables/rhnMonitor.sql @@ -7,27 +7,27 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnMonitor ( - batch_id NUMBER NOT NULL, = - server_id NUMBER NOT NULL = + batch_id NUMBER NOT NULL, + server_id NUMBER NOT NULL CONSTRAINT rhn_monitor_sid_fk - REFERENCES rhnServer (id) = - ON DELETE CASCADE, = - probe_id NUMBER NOT NULL, = - component VARCHAR2(128), = - field VARCHAR2(128), = - timestamp DATE NOT NULL, = - granularity NUMBER NOT NULL = + REFERENCES rhnServer (id) + ON DELETE CASCADE, + probe_id NUMBER NOT NULL, + component VARCHAR2(128), + field VARCHAR2(128), + timestamp DATE NOT NULL, + granularity NUMBER NOT NULL CONSTRAINT rhn_monitor_granularity_fk - REFERENCES rhnMonitorGranularity (id), = + REFERENCES rhnMonitorGranularity (id), value VARCHAR2(4000) ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnMonitorGranularity.sql b/sch= ema/spacewalk/common/tables/rhnMonitorGranularity.sql index 7cf4c09..ab12f84 100644 --- a/schema/spacewalk/common/tables/rhnMonitorGranularity.sql +++ b/schema/spacewalk/common/tables/rhnMonitorGranularity.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnMonitorGranularity ( - id NUMBER NOT NULL = - CONSTRAINT rhn_monitorgran_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[4m_tbs]], = + id NUMBER NOT NULL + CONSTRAINT rhn_monitorgran_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[4m_tbs]], label VARCHAR2(16) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnOrgChannelSettings.sql b/sch= ema/spacewalk/common/tables/rhnOrgChannelSettings.sql index 92636a7..c6a934b 100644 --- a/schema/spacewalk/common/tables/rhnOrgChannelSettings.sql +++ b/schema/spacewalk/common/tables/rhnOrgChannelSettings.sql @@ -7,29 +7,29 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnOrgChannelSettings ( - org_id NUMBER NOT NULL = + org_id NUMBER NOT NULL CONSTRAINT rhn_orgcsettings_oid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - channel_id NUMBER NOT NULL = + REFERENCES web_customer (id) + ON DELETE CASCADE, + channel_id NUMBER NOT NULL CONSTRAINT rhn_orgcsettings_cid_fk - REFERENCES rhnChannel (id) = - ON DELETE CASCADE, = - setting_id NUMBER NOT NULL = + REFERENCES rhnChannel (id) + ON DELETE CASCADE, + setting_id NUMBER NOT NULL CONSTRAINT rhn_orgcsettings_sid_fk - REFERENCES rhnOrgChannelSettingsType (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnOrgChannelSettingsType (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnOrgChannelSettingsType.sql b= /schema/spacewalk/common/tables/rhnOrgChannelSettingsType.sql index 42f910b..82937bb 100644 --- a/schema/spacewalk/common/tables/rhnOrgChannelSettingsType.sql +++ b/schema/spacewalk/common/tables/rhnOrgChannelSettingsType.sql @@ -7,21 +7,21 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnOrgChannelSettingsType ( - id NUMBER NOT NULL = - CONSTRAINT rhn_ocstngs_type_id_pk PRIMARY KEY, = - label VARCHAR2(32) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_ocstngs_type_id_pk PRIMARY KEY, + label VARCHAR2(32) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnOrgEntitlementType.sql b/sch= ema/spacewalk/common/tables/rhnOrgEntitlementType.sql index f8cb0d9..8c23b75 100644 --- a/schema/spacewalk/common/tables/rhnOrgEntitlementType.sql +++ b/schema/spacewalk/common/tables/rhnOrgEntitlementType.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnOrgEntitlementType ( - id NUMBER NOT NULL = - CONSTRAINT rhn_org_ent_type_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - label VARCHAR2(32) NOT NULL, = - name VARCHAR2(64) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_org_ent_type_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + label VARCHAR2(32) NOT NULL, + name VARCHAR2(64) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnOrgEntitlements.sql b/schema= /spacewalk/common/tables/rhnOrgEntitlements.sql index 1ebf231..2ee99e2 100644 --- a/schema/spacewalk/common/tables/rhnOrgEntitlements.sql +++ b/schema/spacewalk/common/tables/rhnOrgEntitlements.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnOrgEntitlements ( - org_id NUMBER NOT NULL = + org_id NUMBER NOT NULL CONSTRAINT rhn_org_ent_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - entitlement_id NUMBER NOT NULL = + REFERENCES web_customer (id) + ON DELETE CASCADE, + entitlement_id NUMBER NOT NULL CONSTRAINT rhn_org_ent_eid_fk - REFERENCES rhnOrgEntitlementType (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnOrgEntitlementType (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnOrgErrataCacheQueue.sql b/sc= hema/spacewalk/common/tables/rhnOrgErrataCacheQueue.sql index a756450..3f19373 100644 --- a/schema/spacewalk/common/tables/rhnOrgErrataCacheQueue.sql +++ b/schema/spacewalk/common/tables/rhnOrgErrataCacheQueue.sql @@ -7,21 +7,21 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnOrgErrataCacheQueue ( - org_id NUMBER NOT NULL = + org_id NUMBER NOT NULL CONSTRAINT rhn_oecq_oid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - server_count NUMBER NOT NULL, = - processed NUMBER = + REFERENCES web_customer (id) + ON DELETE CASCADE, + server_count NUMBER NOT NULL, + processed NUMBER DEFAULT (0) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnOrgInfo.sql b/schema/spacewa= lk/common/tables/rhnOrgInfo.sql index 84862fb..dbc774b 100644 --- a/schema/spacewalk/common/tables/rhnOrgInfo.sql +++ b/schema/spacewalk/common/tables/rhnOrgInfo.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnOrgInfo ( - org_id NUMBER NOT NULL = + org_id NUMBER NOT NULL CONSTRAINT rhn_orginfo_oid_fk - REFERENCES web_customer (id), = - default_group_type NUMBER = - DEFAULT (2) NOT NULL = + REFERENCES web_customer (id), + default_group_type NUMBER + DEFAULT (2) NOT NULL CONSTRAINT rhn_orginfo_dgt_fk - REFERENCES rhnServerGroupType (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnServerGroupType (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnOrgQuota.sql b/schema/spacew= alk/common/tables/rhnOrgQuota.sql index 0b309a1..30de386 100644 --- a/schema/spacewalk/common/tables/rhnOrgQuota.sql +++ b/schema/spacewalk/common/tables/rhnOrgQuota.sql @@ -7,27 +7,27 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnOrgQuota ( - org_id NUMBER NOT NULL = + org_id NUMBER NOT NULL CONSTRAINT rhn_orgquota_oid_fk - REFERENCES web_customer (id), = - total NUMBER = - DEFAULT (0) NOT NULL, = - bonus NUMBER = - DEFAULT (0) NOT NULL, = - used NUMBER = - DEFAULT (0) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES web_customer (id), + total NUMBER + DEFAULT (0) NOT NULL, + bonus NUMBER + DEFAULT (0) NOT NULL, + used NUMBER + DEFAULT (0) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnPackage.sql b/schema/spacewa= lk/common/tables/rhnPackage.sql index 1ecfb64..0388466 100644 --- a/schema/spacewalk/common/tables/rhnPackage.sql +++ b/schema/spacewalk/common/tables/rhnPackage.sql @@ -7,64 +7,64 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPackage ( - id NUMBER NOT NULL = - CONSTRAINT rhn_package_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[4m_tbs]], = - org_id NUMBER = + id NUMBER NOT NULL + CONSTRAINT rhn_package_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[4m_tbs]], + org_id NUMBER CONSTRAINT rhn_package_oid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - name_id NUMBER NOT NULL = + REFERENCES web_customer (id) + ON DELETE CASCADE, + name_id NUMBER NOT NULL CONSTRAINT rhn_package_nid_fk - REFERENCES rhnPackageName (id), = - evr_id NUMBER NOT NULL = + REFERENCES rhnPackageName (id), + evr_id NUMBER NOT NULL CONSTRAINT rhn_package_eid_fk - REFERENCES rhnPackageEvr (id), = - package_arch_id NUMBER NOT NULL = + REFERENCES rhnPackageEvr (id), + package_arch_id NUMBER NOT NULL CONSTRAINT rhn_package_paid_fk - REFERENCES rhnPackageArch (id), = - package_group NUMBER = + REFERENCES rhnPackageArch (id), + package_group NUMBER CONSTRAINT rhn_package_group_fk - REFERENCES rhnPackageGroup (id), = - rpm_version VARCHAR2(16), = - description VARCHAR2(4000), = - summary VARCHAR2(4000), = - package_size NUMBER NOT NULL, = - payload_size NUMBER, = - build_host VARCHAR2(256), = - build_time DATE, = - source_rpm_id NUMBER = + REFERENCES rhnPackageGroup (id), + rpm_version VARCHAR2(16), + description VARCHAR2(4000), + summary VARCHAR2(4000), + package_size NUMBER NOT NULL, + payload_size NUMBER, + build_host VARCHAR2(256), + build_time DATE, + source_rpm_id NUMBER CONSTRAINT rhn_package_srcrpmid_fk - REFERENCES rhnSourceRPM (id), = - md5sum VARCHAR2(64) NOT NULL, = - vendor VARCHAR2(64) NOT NULL, = - payload_format VARCHAR2(32), = - compat NUMBER = - DEFAULT (0) = + REFERENCES rhnSourceRPM (id), + md5sum VARCHAR2(64) NOT NULL, + vendor VARCHAR2(64) NOT NULL, + payload_format VARCHAR2(32), + compat NUMBER + DEFAULT (0) CONSTRAINT rhn_package_compat_check - CHECK (compat in ( 1 , 0 )), = - path VARCHAR2(1000), = - header_sig VARCHAR2(64), = - copyright VARCHAR2(128), = - cookie VARCHAR2(128), = - last_modified DATE = - DEFAULT (sysdate) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = - DEFAULT (sysdate) NOT NULL, = - header_start NUMBER = - DEFAULT (-1) NOT NULL, = - header_end NUMBER = + CHECK (compat in ( 1 , 0 )), + path VARCHAR2(1000), + header_sig VARCHAR2(64), + copyright VARCHAR2(128), + cookie VARCHAR2(128), + last_modified DATE + DEFAULT (sysdate) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE + DEFAULT (sysdate) NOT NULL, + header_start NUMBER + DEFAULT (-1) NOT NULL, + header_end NUMBER DEFAULT (-1) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnPackageArch.sql b/schema/spa= cewalk/common/tables/rhnPackageArch.sql index a1d4fa2..bae67b5 100644 --- a/schema/spacewalk/common/tables/rhnPackageArch.sql +++ b/schema/spacewalk/common/tables/rhnPackageArch.sql @@ -7,24 +7,24 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPackageArch ( - id NUMBER NOT NULL, = - label VARCHAR2(64) NOT NULL, = - name VARCHAR2(64) NOT NULL, = - arch_type_id NUMBER NOT NULL = + id NUMBER NOT NULL, + label VARCHAR2(64) NOT NULL, + name VARCHAR2(64) NOT NULL, + arch_type_id NUMBER NOT NULL CONSTRAINT rhn_parch_atid_fk - REFERENCES rhnArchType (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnArchType (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnPackageCapability.sql b/sche= ma/spacewalk/common/tables/rhnPackageCapability.sql index e6b1c0b..f947dfb 100644 --- a/schema/spacewalk/common/tables/rhnPackageCapability.sql +++ b/schema/spacewalk/common/tables/rhnPackageCapability.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPackageCapability ( - id NUMBER NOT NULL = - CONSTRAINT rhn_pkg_capability_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[4m_tbs]], = - name VARCHAR2(4000) NOT NULL, = - version VARCHAR2(64), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_pkg_capability_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[4m_tbs]], + name VARCHAR2(4000) NOT NULL, + version VARCHAR2(64), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnPackageChangeLog.sql b/schem= a/spacewalk/common/tables/rhnPackageChangeLog.sql index adb8515..37b112b 100644 --- a/schema/spacewalk/common/tables/rhnPackageChangeLog.sql +++ b/schema/spacewalk/common/tables/rhnPackageChangeLog.sql @@ -7,28 +7,28 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPackageChangelog ( - id NUMBER NOT NULL = - CONSTRAINT rhn_pkg_cl_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - package_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_pkg_cl_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + package_id NUMBER NOT NULL CONSTRAINT rhn_pkg_changelog_pid_fk - REFERENCES rhnPackage (id) = - ON DELETE CASCADE, = - name VARCHAR2(128) NOT NULL, = - text VARCHAR2(3000) NOT NULL, = - time DATE NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnPackage (id) + ON DELETE CASCADE, + name VARCHAR2(128) NOT NULL, + text VARCHAR2(3000) NOT NULL, + time DATE NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnPackageConflicts.sql b/schem= a/spacewalk/common/tables/rhnPackageConflicts.sql index c76ddde..5840323 100644 --- a/schema/spacewalk/common/tables/rhnPackageConflicts.sql +++ b/schema/spacewalk/common/tables/rhnPackageConflicts.sql @@ -7,27 +7,27 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPackageConflicts ( - package_id NUMBER NOT NULL = + package_id NUMBER NOT NULL CONSTRAINT rhn_pkg_conflicts_package_fk - REFERENCES rhnPackage (id) = - ON DELETE CASCADE, = - capability_id NUMBER NOT NULL = + REFERENCES rhnPackage (id) + ON DELETE CASCADE, + capability_id NUMBER NOT NULL CONSTRAINT rhn_pkg_conflicts_cap_fk - REFERENCES rhnPackageCapability (id), = - sense NUMBER = - DEFAULT (0) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnPackageCapability (id), + sense NUMBER + DEFAULT (0) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnPackageDelta.sql b/schema/sp= acewalk/common/tables/rhnPackageDelta.sql index 5c94199..af30476 100644 --- a/schema/spacewalk/common/tables/rhnPackageDelta.sql +++ b/schema/spacewalk/common/tables/rhnPackageDelta.sql @@ -7,20 +7,20 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPackageDelta ( - id NUMBER NOT NULL, = - label VARCHAR2(32) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL, + label VARCHAR2(32) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT @@ -33,6 +33,6 @@ CREATE INDEX rhn_packagedelta_label_id_idx CREATE SEQUENCE rhn_packagedelta_id_seq; = ALTER TABLE rhnPackageDelta - ADD CONSTRAINT rhn_packagedelta_id_pk PRIMARY KEY (id) = + ADD CONSTRAINT rhn_packagedelta_id_pk PRIMARY KEY (id) USING INDEX TABLESPACE [[4m_tbs]]; = diff --git a/schema/spacewalk/common/tables/rhnPackageDeltaElement.sql b/sc= hema/spacewalk/common/tables/rhnPackageDeltaElement.sql index fd5ed27..516229e 100644 --- a/schema/spacewalk/common/tables/rhnPackageDeltaElement.sql +++ b/schema/spacewalk/common/tables/rhnPackageDeltaElement.sql @@ -7,20 +7,20 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPackageDeltaElement ( - package_delta_id NUMBER NOT NULL = + package_delta_id NUMBER NOT NULL CONSTRAINT rhn_pdelement_pdid_fk - REFERENCES rhnPackageDelta (id) = - ON DELETE CASCADE, = - transaction_package_id NUMBER NOT NULL = + REFERENCES rhnPackageDelta (id) + ON DELETE CASCADE, + transaction_package_id NUMBER NOT NULL CONSTRAINT rhn_pdelement_tpid_fk REFERENCES rhnTransactionPackage (id) ) diff --git a/schema/spacewalk/common/tables/rhnPackageEVR.sql b/schema/spac= ewalk/common/tables/rhnPackageEVR.sql index 6406fa9..d347485 100644 --- a/schema/spacewalk/common/tables/rhnPackageEVR.sql +++ b/schema/spacewalk/common/tables/rhnPackageEVR.sql @@ -7,20 +7,20 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPackageEVR ( - id NUMBER NOT NULL = - CONSTRAINT rhn_pe_id_pk PRIMARY KEY, = - epoch VARCHAR2(16), = - version VARCHAR2(512) NOT NULL, = - release VARCHAR2(512) NOT NULL, = + id NUMBER NOT NULL + CONSTRAINT rhn_pe_id_pk PRIMARY KEY, + epoch VARCHAR2(16), + version VARCHAR2(512) NOT NULL, + release VARCHAR2(512) NOT NULL, evr EVR_T NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnPackageFile.sql b/schema/spa= cewalk/common/tables/rhnPackageFile.sql index bafff33..b60cf3f 100644 --- a/schema/spacewalk/common/tables/rhnPackageFile.sql +++ b/schema/spacewalk/common/tables/rhnPackageFile.sql @@ -7,38 +7,38 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPackageFile ( - package_id NUMBER NOT NULL = + package_id NUMBER NOT NULL CONSTRAINT rhn_package_file_pid_fk - REFERENCES rhnPackage (id) = - ON DELETE CASCADE, = - capability_id NUMBER NOT NULL = + REFERENCES rhnPackage (id) + ON DELETE CASCADE, + capability_id NUMBER NOT NULL CONSTRAINT rhn_package_file_cid_fk - REFERENCES rhnPackageCapability (id), = - device NUMBER NOT NULL, = - inode NUMBER NOT NULL, = - file_mode NUMBER NOT NULL, = - username VARCHAR2(32) NOT NULL, = - groupname VARCHAR2(32) NOT NULL, = - rdev NUMBER NOT NULL, = - file_size NUMBER NOT NULL, = - mtime DATE NOT NULL, = - md5 VARCHAR2(32), = - linkto VARCHAR2(256), = - flags NUMBER NOT NULL, = - verifyflags NUMBER NOT NULL, = - lang VARCHAR2(32), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnPackageCapability (id), + device NUMBER NOT NULL, + inode NUMBER NOT NULL, + file_mode NUMBER NOT NULL, + username VARCHAR2(32) NOT NULL, + groupname VARCHAR2(32) NOT NULL, + rdev NUMBER NOT NULL, + file_size NUMBER NOT NULL, + mtime DATE NOT NULL, + md5 VARCHAR2(32), + linkto VARCHAR2(256), + flags NUMBER NOT NULL, + verifyflags NUMBER NOT NULL, + lang VARCHAR2(32), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnPackageFileDeleteQueue.sql b= /schema/spacewalk/common/tables/rhnPackageFileDeleteQueue.sql index 346288d..03330e7 100644 --- a/schema/spacewalk/common/tables/rhnPackageFileDeleteQueue.sql +++ b/schema/spacewalk/common/tables/rhnPackageFileDeleteQueue.sql @@ -7,17 +7,17 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPackageFileDeleteQueue ( - path VARCHAR2(1000), = - created DATE = + path VARCHAR2(1000), + created DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnPackageGroup.sql b/schema/sp= acewalk/common/tables/rhnPackageGroup.sql index 0bf6842..a579872 100644 --- a/schema/spacewalk/common/tables/rhnPackageGroup.sql +++ b/schema/spacewalk/common/tables/rhnPackageGroup.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPackageGroup ( - id NUMBER NOT NULL = - CONSTRAINT rhn_package_group_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]], = - name VARCHAR2(100) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_package_group_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]], + name VARCHAR2(100) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnPackageKey.sql b/schema/spac= ewalk/common/tables/rhnPackageKey.sql index a7e3a12..f820761 100644 --- a/schema/spacewalk/common/tables/rhnPackageKey.sql +++ b/schema/spacewalk/common/tables/rhnPackageKey.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPackageKey ( - id NUMBER NOT NULL, = - key_id VARCHAR2(64) NOT NULL, = - key_type_id NUMBER NOT NULL = + id NUMBER NOT NULL, + key_id VARCHAR2(64) NOT NULL, + key_type_id NUMBER NOT NULL CONSTRAINT rhn_pkey_type_id_prid_fk - REFERENCES rhnPackageKeyType (id), = - provider_id NUMBER = + REFERENCES rhnPackageKeyType (id), + provider_id NUMBER CONSTRAINT rhn_pkey_prid_fk - REFERENCES rhnPackageProvider (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnPackageProvider (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ; diff --git a/schema/spacewalk/common/tables/rhnPackageKeyAssociation.sql b/= schema/spacewalk/common/tables/rhnPackageKeyAssociation.sql index 203cfe1..c3841b2 100644 --- a/schema/spacewalk/common/tables/rhnPackageKeyAssociation.sql +++ b/schema/spacewalk/common/tables/rhnPackageKeyAssociation.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPackageKeyAssociation ( - package_id NUMBER NOT NULL = + package_id NUMBER NOT NULL CONSTRAINT rhn_pkeya_pid_fk - REFERENCES rhnPackage (id) = - ON DELETE CASCADE, = - key_id NUMBER NOT NULL = + REFERENCES rhnPackage (id) + ON DELETE CASCADE, + key_id NUMBER NOT NULL CONSTRAINT rhn_pkeya_kid_fk - REFERENCES rhnPackageKey (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnPackageKey (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ; diff --git a/schema/spacewalk/common/tables/rhnPackageKeyType.sql b/schema/= spacewalk/common/tables/rhnPackageKeyType.sql index 635d4a8..d00b70a 100644 --- a/schema/spacewalk/common/tables/rhnPackageKeyType.sql +++ b/schema/spacewalk/common/tables/rhnPackageKeyType.sql @@ -7,20 +7,20 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPackageKeyType ( - id NUMBER NOT NULL, = - label VARCHAR2(64) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL, + label VARCHAR2(64) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ; diff --git a/schema/spacewalk/common/tables/rhnPackageNEVRA.sql b/schema/sp= acewalk/common/tables/rhnPackageNEVRA.sql index f2e52ad..f82707e 100644 --- a/schema/spacewalk/common/tables/rhnPackageNEVRA.sql +++ b/schema/spacewalk/common/tables/rhnPackageNEVRA.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPackageNEVRA ( - id NUMBER NOT NULL = - CONSTRAINT rhn_pkgnevra_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[8m_tbs]], = - name_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_pkgnevra_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[8m_tbs]], + name_id NUMBER NOT NULL CONSTRAINT rhn_pkgnevra_nid_fk - REFERENCES rhnPackageName (id), = - evr_id NUMBER NOT NULL = + REFERENCES rhnPackageName (id), + evr_id NUMBER NOT NULL CONSTRAINT rhn_pkgnevra_eid_fk - REFERENCES rhnPackageEVR (id), = - package_arch_id NUMBER = + REFERENCES rhnPackageEVR (id), + package_arch_id NUMBER CONSTRAINT rhn_pkgnevra_paid_fk REFERENCES rhnPackageArch (id) ) diff --git a/schema/spacewalk/common/tables/rhnPackageName.sql b/schema/spa= cewalk/common/tables/rhnPackageName.sql index 75620b1..b6b30a8 100644 --- a/schema/spacewalk/common/tables/rhnPackageName.sql +++ b/schema/spacewalk/common/tables/rhnPackageName.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPackageName ( - id NUMBER NOT NULL = - CONSTRAINT rhn_pn_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]], = + id NUMBER NOT NULL + CONSTRAINT rhn_pn_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]], name VARCHAR2(256) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnPackageObsoletes.sql b/schem= a/spacewalk/common/tables/rhnPackageObsoletes.sql index 5207eb4..0029dfc 100644 --- a/schema/spacewalk/common/tables/rhnPackageObsoletes.sql +++ b/schema/spacewalk/common/tables/rhnPackageObsoletes.sql @@ -7,27 +7,27 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPackageObsoletes ( - package_id NUMBER NOT NULL = + package_id NUMBER NOT NULL CONSTRAINT rhn_pkg_obsoletes_package_fk - REFERENCES rhnPackage (id) = - ON DELETE CASCADE, = - capability_id NUMBER NOT NULL = + REFERENCES rhnPackage (id) + ON DELETE CASCADE, + capability_id NUMBER NOT NULL CONSTRAINT rhn_pkg_obsoletes_cap_fk - REFERENCES rhnPackageCapability (id), = - sense NUMBER = - DEFAULT (0) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnPackageCapability (id), + sense NUMBER + DEFAULT (0) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnPackageProvider.sql b/schema= /spacewalk/common/tables/rhnPackageProvider.sql index 0f55087..4a74b5b 100644 --- a/schema/spacewalk/common/tables/rhnPackageProvider.sql +++ b/schema/spacewalk/common/tables/rhnPackageProvider.sql @@ -7,20 +7,20 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPackageProvider ( - id NUMBER NOT NULL, = - name VARCHAR2(64) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL, + name VARCHAR2(64) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ; diff --git a/schema/spacewalk/common/tables/rhnPackageProvides.sql b/schema= /spacewalk/common/tables/rhnPackageProvides.sql index b6bb58c..56abdd5 100644 --- a/schema/spacewalk/common/tables/rhnPackageProvides.sql +++ b/schema/spacewalk/common/tables/rhnPackageProvides.sql @@ -7,27 +7,27 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPackageProvides ( - package_id NUMBER NOT NULL = + package_id NUMBER NOT NULL CONSTRAINT rhn_pkg_provides_package_fk - REFERENCES rhnPackage (id) = - ON DELETE CASCADE, = - capability_id NUMBER NOT NULL = + REFERENCES rhnPackage (id) + ON DELETE CASCADE, + capability_id NUMBER NOT NULL CONSTRAINT rhn_pkg_provides_capability_fk - REFERENCES rhnPackageCapability (id), = - sense NUMBER = - DEFAULT (0) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnPackageCapability (id), + sense NUMBER + DEFAULT (0) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnPackageRequires.sql b/schema= /spacewalk/common/tables/rhnPackageRequires.sql index a806cdd..af34e7e 100644 --- a/schema/spacewalk/common/tables/rhnPackageRequires.sql +++ b/schema/spacewalk/common/tables/rhnPackageRequires.sql @@ -7,27 +7,27 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPackageRequires ( - package_id NUMBER NOT NULL = + package_id NUMBER NOT NULL CONSTRAINT rhn_pkg_requires_package_fk - REFERENCES rhnPackage (id) = - ON DELETE CASCADE, = - capability_id NUMBER NOT NULL = + REFERENCES rhnPackage (id) + ON DELETE CASCADE, + capability_id NUMBER NOT NULL CONSTRAINT rhn_pkg_requires_capability_fk - REFERENCES rhnPackageCapability (id), = - sense NUMBER = - DEFAULT (0) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnPackageCapability (id), + sense NUMBER + DEFAULT (0) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnPackageSense.sql b/schema/sp= acewalk/common/tables/rhnPackageSense.sql index d02629c..8ef7b71 100644 --- a/schema/spacewalk/common/tables/rhnPackageSense.sql +++ b/schema/spacewalk/common/tables/rhnPackageSense.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPackageSense ( - id NUMBER NOT NULL = - CONSTRAINT rhn_pkg_sense_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = + id NUMBER NOT NULL + CONSTRAINT rhn_pkg_sense_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], label VARCHAR2(32) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnPackageSenseMap.sql b/schema= /spacewalk/common/tables/rhnPackageSenseMap.sql index 8cc2c99..0d4b567 100644 --- a/schema/spacewalk/common/tables/rhnPackageSenseMap.sql +++ b/schema/spacewalk/common/tables/rhnPackageSenseMap.sql @@ -7,17 +7,17 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPackageSenseMap ( - sense NUMBER NOT NULL, = - sense_id NUMBER NOT NULL = + sense NUMBER NOT NULL, + sense_id NUMBER NOT NULL CONSTRAINT rhn_pkg_sensemap_sid_fk REFERENCES rhnPackageSense (id) ) diff --git a/schema/spacewalk/common/tables/rhnPackageSource.sql b/schema/s= pacewalk/common/tables/rhnPackageSource.sql index 51cdd7b..8727c74 100644 --- a/schema/spacewalk/common/tables/rhnPackageSource.sql +++ b/schema/spacewalk/common/tables/rhnPackageSource.sql @@ -7,43 +7,43 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPackageSource ( - id NUMBER NOT NULL = - CONSTRAINT rhn_pkgsrc_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - org_id NUMBER = + id NUMBER NOT NULL + CONSTRAINT rhn_pkgsrc_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + org_id NUMBER CONSTRAINT rhn_pkgsrc_oid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - source_rpm_id NUMBER NOT NULL = + REFERENCES web_customer (id) + ON DELETE CASCADE, + source_rpm_id NUMBER NOT NULL CONSTRAINT rhn_pkgsrc_srid_fk - REFERENCES rhnSourceRPM (id), = - package_group NUMBER NOT NULL = + REFERENCES rhnSourceRPM (id), + package_group NUMBER NOT NULL CONSTRAINT rhn_pkgsrc_group_fk - REFERENCES rhnPackageGroup (id), = - rpm_version VARCHAR2(16) NOT NULL, = - payload_size NUMBER NOT NULL, = - build_host VARCHAR2(256) NOT NULL, = - build_time DATE NOT NULL, = - sigmd5 VARCHAR2(64) NOT NULL, = - vendor VARCHAR2(64) NOT NULL, = - cookie VARCHAR2(128) NOT NULL, = - path VARCHAR2(1000), = - md5sum VARCHAR2(64) NOT NULL, = - package_size NUMBER NOT NULL, = - last_modified DATE = - DEFAULT (sysdate) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnPackageGroup (id), + rpm_version VARCHAR2(16) NOT NULL, + payload_size NUMBER NOT NULL, + build_host VARCHAR2(256) NOT NULL, + build_time DATE NOT NULL, + sigmd5 VARCHAR2(64) NOT NULL, + vendor VARCHAR2(64) NOT NULL, + cookie VARCHAR2(128) NOT NULL, + path VARCHAR2(1000), + md5sum VARCHAR2(64) NOT NULL, + package_size NUMBER NOT NULL, + last_modified DATE + DEFAULT (sysdate) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnPackageSyncBlacklist.sql b/s= chema/spacewalk/common/tables/rhnPackageSyncBlacklist.sql index 4c88301..63b524f 100644 --- a/schema/spacewalk/common/tables/rhnPackageSyncBlacklist.sql +++ b/schema/spacewalk/common/tables/rhnPackageSyncBlacklist.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPackageSyncBlacklist ( - package_name_id NUMBER NOT NULL = + package_name_id NUMBER NOT NULL CONSTRAINT rhn_packagesyncbl_pnid_fk - REFERENCES rhnPackageName (id), = - org_id NUMBER = + REFERENCES rhnPackageName (id), + org_id NUMBER CONSTRAINT rhn_packagesyncbl_oid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES web_customer (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnPaidErrataTempCache.sql b/sc= hema/spacewalk/common/tables/rhnPaidErrataTempCache.sql index 7af31c7..dba8f00 100644 --- a/schema/spacewalk/common/tables/rhnPaidErrataTempCache.sql +++ b/schema/spacewalk/common/tables/rhnPaidErrataTempCache.sql @@ -7,17 +7,17 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE GLOBAL TEMPORARY TABLE rhnPaidErrataTempCache ( - errata_id NUMBER, = - user_id NUMBER, = + errata_id NUMBER, + user_id NUMBER, server_id NUMBER ) ON COMMIT DELETE ROWS diff --git a/schema/spacewalk/common/tables/rhnPathChannelMap.sql b/schema/= spacewalk/common/tables/rhnPathChannelMap.sql index 63751e2..50ad0aa 100644 --- a/schema/spacewalk/common/tables/rhnPathChannelMap.sql +++ b/schema/spacewalk/common/tables/rhnPathChannelMap.sql @@ -7,24 +7,24 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPathChannelMap ( - path VARCHAR2(128) NOT NULL, = - channel_id NUMBER NOT NULL = + path VARCHAR2(128) NOT NULL, + channel_id NUMBER NOT NULL CONSTRAINT rhn_path_channel_map_cid_fk - REFERENCES rhnChannel (id) = - ON DELETE CASCADE, = - is_source VARCHAR2(1), = - created DATE = - DEFAULT (SYSDATE), = - modified DATE = + REFERENCES rhnChannel (id) + ON DELETE CASCADE, + is_source VARCHAR2(1), + created DATE + DEFAULT (SYSDATE), + modified DATE DEFAULT (SYSDATE) ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnPrivateChannelFamily.sql b/s= chema/spacewalk/common/tables/rhnPrivateChannelFamily.sql index b5e147b..1efbbbf 100644 --- a/schema/spacewalk/common/tables/rhnPrivateChannelFamily.sql +++ b/schema/spacewalk/common/tables/rhnPrivateChannelFamily.sql @@ -7,28 +7,28 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPrivateChannelFamily ( - channel_family_id NUMBER NOT NULL = + channel_family_id NUMBER NOT NULL CONSTRAINT rhn_privcf_cfid_fk - REFERENCES rhnChannelFamily (id), = - org_id NUMBER NOT NULL = + REFERENCES rhnChannelFamily (id), + org_id NUMBER NOT NULL CONSTRAINT rhn_privcf_oid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - max_members NUMBER, = - current_members NUMBER = - DEFAULT (0) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES web_customer (id) + ON DELETE CASCADE, + max_members NUMBER, + current_members NUMBER + DEFAULT (0) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnProduct.sql b/schema/spacewa= lk/common/tables/rhnProduct.sql index 6ffaed3..6e80d3c 100644 --- a/schema/spacewalk/common/tables/rhnProduct.sql +++ b/schema/spacewalk/common/tables/rhnProduct.sql @@ -7,27 +7,27 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnProduct ( - id NUMBER NOT NULL, = - label VARCHAR2(128) NOT NULL, = - name VARCHAR2(128) NOT NULL, = - product_line_id NUMBER NOT NULL = + id NUMBER NOT NULL, + label VARCHAR2(128) NOT NULL, + name VARCHAR2(128) NOT NULL, + product_line_id NUMBER NOT NULL CONSTRAINT rhn_product_cat_fk - REFERENCES rhnProductLine (id) = - ON DELETE CASCADE, = - last_modified DATE = - DEFAULT (sysdate) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnProductLine (id) + ON DELETE CASCADE, + last_modified DATE + DEFAULT (sysdate) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnProductChannel.sql b/schema/= spacewalk/common/tables/rhnProductChannel.sql index 7ca4bc7..261b14f 100644 --- a/schema/spacewalk/common/tables/rhnProductChannel.sql +++ b/schema/spacewalk/common/tables/rhnProductChannel.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnProductChannel ( - channel_id NUMBER NOT NULL = + channel_id NUMBER NOT NULL CONSTRAINT rhn_pc_cid_fk - REFERENCES rhnChannel (id) = - ON DELETE CASCADE, = - product_id NUMBER NOT NULL = + REFERENCES rhnChannel (id) + ON DELETE CASCADE, + product_id NUMBER NOT NULL CONSTRAINT rhn_pc_pid_fk - REFERENCES rhnProduct (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnProduct (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnProductLine.sql b/schema/spa= cewalk/common/tables/rhnProductLine.sql index 2f8a89d..2a6d7c5 100644 --- a/schema/spacewalk/common/tables/rhnProductLine.sql +++ b/schema/spacewalk/common/tables/rhnProductLine.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnProductLine ( - id NUMBER NOT NULL, = - label VARCHAR2(128) NOT NULL, = - name VARCHAR2(128) NOT NULL, = - last_modified DATE = - DEFAULT (sysdate) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL, + label VARCHAR2(128) NOT NULL, + name VARCHAR2(128) NOT NULL, + last_modified DATE + DEFAULT (sysdate) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnProductName.sql b/schema/spa= cewalk/common/tables/rhnProductName.sql index 42a1e54..8cc5042 100644 --- a/schema/spacewalk/common/tables/rhnProductName.sql +++ b/schema/spacewalk/common/tables/rhnProductName.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnProductName ( - id NUMBER NOT NULL = - CONSTRAINT rhn_productname_id_pk PRIMARY KEY, = - label VARCHAR2(128) NOT NULL, = - name VARCHAR2(128) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_productname_id_pk PRIMARY KEY, + label VARCHAR2(128) NOT NULL, + name VARCHAR2(128) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnProvisionState.sql b/schema/= spacewalk/common/tables/rhnProvisionState.sql index 89110f2..92b2909 100644 --- a/schema/spacewalk/common/tables/rhnProvisionState.sql +++ b/schema/spacewalk/common/tables/rhnProvisionState.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnProvisionState ( - id NUMBER NOT NULL = - CONSTRAINT rhn_provstate_id_pk PRIMARY KEY, = - label VARCHAR2(32) NOT NULL, = - description VARCHAR2(256) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_provstate_id_pk PRIMARY KEY, + label VARCHAR2(32) NOT NULL, + description VARCHAR2(256) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnProxyInfo.sql b/schema/space= walk/common/tables/rhnProxyInfo.sql index d970387..45bca1b 100644 --- a/schema/spacewalk/common/tables/rhnProxyInfo.sql +++ b/schema/spacewalk/common/tables/rhnProxyInfo.sql @@ -7,19 +7,19 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnProxyInfo ( - server_id NUMBER NOT NULL = + server_id NUMBER NOT NULL CONSTRAINT rhn_proxy_info_sid_fk - REFERENCES rhnServer (id), = - proxy_evr_id NUMBER = + REFERENCES rhnServer (id), + proxy_evr_id NUMBER CONSTRAINT rhn_proxy_info_peid_fk REFERENCES rhnPackageEVR (id) ) diff --git a/schema/spacewalk/common/tables/rhnPublicChannelFamily.sql b/sc= hema/spacewalk/common/tables/rhnPublicChannelFamily.sql index 492bd74..3f9a45e 100644 --- a/schema/spacewalk/common/tables/rhnPublicChannelFamily.sql +++ b/schema/spacewalk/common/tables/rhnPublicChannelFamily.sql @@ -7,21 +7,21 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPublicChannelFamily ( - channel_family_id NUMBER NOT NULL = + channel_family_id NUMBER NOT NULL CONSTRAINT rhn_pubcf_cfid_fk - REFERENCES rhnChannelFamily (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnChannelFamily (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnPushClient.sql b/schema/spac= ewalk/common/tables/rhnPushClient.sql index 401c22e..9693c43 100644 --- a/schema/spacewalk/common/tables/rhnPushClient.sql +++ b/schema/spacewalk/common/tables/rhnPushClient.sql @@ -7,30 +7,30 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPushClient ( - id NUMBER NOT NULL = - CONSTRAINT rhn_pclient_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[4m_tbs]], = - name VARCHAR2(64) NOT NULL, = - server_id NUMBER NOT NULL, = - jabber_id VARCHAR2(128), = - shared_key VARCHAR2(64) NOT NULL, = - state_id NUMBER NOT NULL = - REFERENCES rhnPushClientState (id), = - next_action_time DATE, = - last_message_time DATE, = - last_ping_time DATE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_pclient_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[4m_tbs]], + name VARCHAR2(64) NOT NULL, + server_id NUMBER NOT NULL, + jabber_id VARCHAR2(128), + shared_key VARCHAR2(64) NOT NULL, + state_id NUMBER NOT NULL + REFERENCES rhnPushClientState (id), + next_action_time DATE, + last_message_time DATE, + last_ping_time DATE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnPushClientState.sql b/schema= /spacewalk/common/tables/rhnPushClientState.sql index 26e93dd..c7c14a0 100644 --- a/schema/spacewalk/common/tables/rhnPushClientState.sql +++ b/schema/spacewalk/common/tables/rhnPushClientState.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPushClientState ( - id NUMBER NOT NULL = - CONSTRAINT rhn_pclient_state_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[4m_tbs]], = - label VARCHAR2(64) NOT NULL, = - name VARCHAR2(256) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_pclient_state_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[4m_tbs]], + label VARCHAR2(64) NOT NULL, + name VARCHAR2(256) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnPushDispatcher.sql b/schema/= spacewalk/common/tables/rhnPushDispatcher.sql index 1b2bf2e..ea938c9 100644 --- a/schema/spacewalk/common/tables/rhnPushDispatcher.sql +++ b/schema/spacewalk/common/tables/rhnPushDispatcher.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnPushDispatcher ( - id NUMBER NOT NULL = - CONSTRAINT rhn_pushdispatch_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[8m_tbs]], = - jabber_id VARCHAR2(128) NOT NULL, = - last_checkin DATE = - DEFAULT (sysdate) NOT NULL, = - hostname VARCHAR2(256) NOT NULL, = - port NUMBER NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_pushdispatch_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[8m_tbs]], + jabber_id VARCHAR2(128) NOT NULL, + last_checkin DATE + DEFAULT (sysdate) NOT NULL, + hostname VARCHAR2(256) NOT NULL, + port NUMBER NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnRam.sql b/schema/spacewalk/c= ommon/tables/rhnRam.sql index 459c1cc..84dfb71 100644 --- a/schema/spacewalk/common/tables/rhnRam.sql +++ b/schema/spacewalk/common/tables/rhnRam.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnRam ( - id NUMBER NOT NULL = - CONSTRAINT rhn_ram_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[4m_tbs]], = - server_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_ram_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[4m_tbs]], + server_id NUMBER NOT NULL CONSTRAINT rhn_ram_server_fk - REFERENCES rhnServer (id), = - ram NUMBER NOT NULL, = - swap NUMBER NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnServer (id), + ram NUMBER NOT NULL, + swap NUMBER NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnRedHatCanonVersion.sql b/sch= ema/spacewalk/common/tables/rhnRedHatCanonVersion.sql index 50de15f..2874e7e 100644 --- a/schema/spacewalk/common/tables/rhnRedHatCanonVersion.sql +++ b/schema/spacewalk/common/tables/rhnRedHatCanonVersion.sql @@ -7,21 +7,21 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnRedHatCanonVersion ( - version VARCHAR2(32) NOT NULL = - CONSTRAINT rhn_rh_canon_ver_v_pk PRIMARY KEY, = - canon_version VARCHAR2(32) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + version VARCHAR2(32) NOT NULL + CONSTRAINT rhn_rh_canon_ver_v_pk PRIMARY KEY, + canon_version VARCHAR2(32) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnRegToken.sql b/schema/spacew= alk/common/tables/rhnRegToken.sql index e2068cb..ceb37d7 100644 --- a/schema/spacewalk/common/tables/rhnRegToken.sql +++ b/schema/spacewalk/common/tables/rhnRegToken.sql @@ -7,35 +7,35 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnRegToken ( - id NUMBER NOT NULL = - CONSTRAINT rhn_reg_token_pk PRIMARY KEY, = - org_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_reg_token_pk PRIMARY KEY, + org_id NUMBER NOT NULL CONSTRAINT rhn_reg_token_oid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - user_id NUMBER = + REFERENCES web_customer (id) + ON DELETE CASCADE, + user_id NUMBER CONSTRAINT rhn_reg_token_uid_fk - REFERENCES web_contact (id) = - ON DELETE SET NULL, = - server_id NUMBER = + REFERENCES web_contact (id) + ON DELETE SET NULL, + server_id NUMBER CONSTRAINT rhn_reg_token_sid_fk - REFERENCES rhnServer (id), = - note VARCHAR2(2048) NOT NULL, = - usage_limit NUMBER = - DEFAULT (0), = - disabled NUMBER = - DEFAULT (0) NOT NULL, = - deploy_configs CHAR(1) = - DEFAULT ('Y') NOT NULL = + REFERENCES rhnServer (id), + note VARCHAR2(2048) NOT NULL, + usage_limit NUMBER + DEFAULT (0), + disabled NUMBER + DEFAULT (0) NOT NULL, + deploy_configs CHAR(1) + DEFAULT ('Y') NOT NULL CONSTRAINT rhn_reg_token_deployconfs_ck CHECK (deploy_configs in ( 'Y' , 'N' )) ) diff --git a/schema/spacewalk/common/tables/rhnRegTokenChannels.sql b/schem= a/spacewalk/common/tables/rhnRegTokenChannels.sql index 20eee3d..abe506d 100644 --- a/schema/spacewalk/common/tables/rhnRegTokenChannels.sql +++ b/schema/spacewalk/common/tables/rhnRegTokenChannels.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnRegTokenChannels ( - token_id NUMBER NOT NULL = + token_id NUMBER NOT NULL CONSTRAINT rhn_reg_tok_chn_id_fk - REFERENCES rhnRegToken (id) = - ON DELETE CASCADE, = - channel_id NUMBER NOT NULL = + REFERENCES rhnRegToken (id) + ON DELETE CASCADE, + channel_id NUMBER NOT NULL CONSTRAINT rhn_reg_tok_chn_sgs_fk - REFERENCES rhnChannel (id) = + REFERENCES rhnChannel (id) ON DELETE CASCADE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnRegTokenConfigChannels.sql b= /schema/spacewalk/common/tables/rhnRegTokenConfigChannels.sql index c08fde1..448cb8f 100644 --- a/schema/spacewalk/common/tables/rhnRegTokenConfigChannels.sql +++ b/schema/spacewalk/common/tables/rhnRegTokenConfigChannels.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnRegTokenConfigChannels ( - token_id NUMBER NOT NULL = + token_id NUMBER NOT NULL CONSTRAINT rhn_regtok_confchan_tid_fk - REFERENCES rhnRegToken (id) = - ON DELETE CASCADE, = - config_channel_id NUMBER NOT NULL = + REFERENCES rhnRegToken (id) + ON DELETE CASCADE, + config_channel_id NUMBER NOT NULL CONSTRAINT rhn_regtok_confchan_ccid_fk - REFERENCES rhnConfigChannel (id) = - ON DELETE CASCADE, = + REFERENCES rhnConfigChannel (id) + ON DELETE CASCADE, position NUMBER NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnRegTokenEntitlement.sql b/sc= hema/spacewalk/common/tables/rhnRegTokenEntitlement.sql index c21c3fb..f25963b 100644 --- a/schema/spacewalk/common/tables/rhnRegTokenEntitlement.sql +++ b/schema/spacewalk/common/tables/rhnRegTokenEntitlement.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnRegTokenEntitlement ( - reg_token_id NUMBER NOT NULL = + reg_token_id NUMBER NOT NULL CONSTRAINT rhn_reg_tok_ent_rtid_fk - REFERENCES rhnRegToken (id) = - ON DELETE CASCADE, = - server_group_type_id NUMBER NOT NULL = + REFERENCES rhnRegToken (id) + ON DELETE CASCADE, + server_group_type_id NUMBER NOT NULL CONSTRAINT rhn_reg_tok_ent_sgtid_fk - REFERENCES rhnServerGroupType (id) = + REFERENCES rhnServerGroupType (id) ON DELETE CASCADE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnRegTokenGroups.sql b/schema/= spacewalk/common/tables/rhnRegTokenGroups.sql index 193ed1f..5bd0ac4 100644 --- a/schema/spacewalk/common/tables/rhnRegTokenGroups.sql +++ b/schema/spacewalk/common/tables/rhnRegTokenGroups.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnRegTokenGroups ( - token_id NUMBER NOT NULL = + token_id NUMBER NOT NULL CONSTRAINT rhn_reg_tok_grp_id_fk - REFERENCES rhnRegToken (id) = - ON DELETE CASCADE, = - server_group_id NUMBER NOT NULL = + REFERENCES rhnRegToken (id) + ON DELETE CASCADE, + server_group_id NUMBER NOT NULL CONSTRAINT rhn_reg_tok_grp_sgs_fk - REFERENCES rhnServerGroup (id) = + REFERENCES rhnServerGroup (id) ON DELETE CASCADE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnRegTokenOrgDefault.sql b/sch= ema/spacewalk/common/tables/rhnRegTokenOrgDefault.sql index 2a7110d..5cc09e5 100644 --- a/schema/spacewalk/common/tables/rhnRegTokenOrgDefault.sql +++ b/schema/spacewalk/common/tables/rhnRegTokenOrgDefault.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnRegTokenOrgDefault ( - org_id NUMBER NOT NULL = + org_id NUMBER NOT NULL CONSTRAINT rhn_reg_token_def_oid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - reg_token_id NUMBER = + REFERENCES web_customer (id) + ON DELETE CASCADE, + reg_token_id NUMBER CONSTRAINT rhn_reg_token_def_tokid_fk - REFERENCES rhnRegToken (id) = + REFERENCES rhnRegToken (id) ON DELETE CASCADE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnRegTokenPackages.sql b/schem= a/spacewalk/common/tables/rhnRegTokenPackages.sql index 9c5b707..8a8a440 100644 --- a/schema/spacewalk/common/tables/rhnRegTokenPackages.sql +++ b/schema/spacewalk/common/tables/rhnRegTokenPackages.sql @@ -7,28 +7,28 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnRegTokenPackages ( - id NUMBER NOT NULL = - CONSTRAINT rhn_reg_tok_pkg_id_pk PRIMARY KEY, = - token_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_reg_tok_pkg_id_pk PRIMARY KEY, + token_id NUMBER NOT NULL CONSTRAINT rhn_reg_tok_pkg_id_fk - REFERENCES rhnRegToken (id) = - ON DELETE CASCADE, = - name_id NUMBER NOT NULL = + REFERENCES rhnRegToken (id) + ON DELETE CASCADE, + name_id NUMBER NOT NULL CONSTRAINT rhn_reg_tok_pkg_sgs_fk - REFERENCES rhnPackageName (id) = - ON DELETE CASCADE, = - arch_id NUMBER = + REFERENCES rhnPackageName (id) + ON DELETE CASCADE, + arch_id NUMBER CONSTRAINT rhn_reg_tok_pkg_aid_fk - REFERENCES rhnPackageArch (id) = + REFERENCES rhnPackageArch (id) ON DELETE CASCADE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnRelationshipType.sql b/schem= a/spacewalk/common/tables/rhnRelationshipType.sql index 7e76d4a..ca689db 100644 --- a/schema/spacewalk/common/tables/rhnRelationshipType.sql +++ b/schema/spacewalk/common/tables/rhnRelationshipType.sql @@ -7,21 +7,21 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnRelationshipType ( - id NUMBER NOT NULL, = - label VARCHAR2(32) NOT NULL, = - description VARCHAR2(256), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL, + label VARCHAR2(32) NOT NULL, + description VARCHAR2(256), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnReleaseChannelMap.sql b/sche= ma/spacewalk/common/tables/rhnReleaseChannelMap.sql index 4ec5062..9eb9b59 100644 --- a/schema/spacewalk/common/tables/rhnReleaseChannelMap.sql +++ b/schema/spacewalk/common/tables/rhnReleaseChannelMap.sql @@ -7,20 +7,20 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnReleaseChannelMap ( - product VARCHAR2(64) NOT NULL, = - version VARCHAR2(64) NOT NULL, = - release VARCHAR2(64) NOT NULL, = - channel_arch_id NUMBER NOT NULL, = - channel_id NUMBER NOT NULL, = + product VARCHAR2(64) NOT NULL, + version VARCHAR2(64) NOT NULL, + release VARCHAR2(64) NOT NULL, + channel_arch_id NUMBER NOT NULL, + channel_id NUMBER NOT NULL, = CONSTRAINT rhn_rcm_pva_def_uniq UNIQUE (product, version, channel_arch_id) diff --git a/schema/spacewalk/common/tables/rhnRepoRegenQueue.sql b/schema/= spacewalk/common/tables/rhnRepoRegenQueue.sql index b0a30fb..e3c00e8 100644 --- a/schema/spacewalk/common/tables/rhnRepoRegenQueue.sql +++ b/schema/spacewalk/common/tables/rhnRepoRegenQueue.sql @@ -7,27 +7,27 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnRepoRegenQueue ( - id NUMBER = - CONSTRAINT rhn_reporegenq_id_pk PRIMARY KEY, = - channel_label VARCHAR2(128) NOT NULL, = - client VARCHAR2(128), = - reason VARCHAR2(128), = - force CHAR(1), = - bypass_filters CHAR(1), = - next_action DATE = - DEFAULT (sysdate), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER + CONSTRAINT rhn_reporegenq_id_pk PRIMARY KEY, + channel_label VARCHAR2(128) NOT NULL, + client VARCHAR2(128), + reason VARCHAR2(128), + force CHAR(1), + bypass_filters CHAR(1), + next_action DATE + DEFAULT (sysdate), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ; diff --git a/schema/spacewalk/common/tables/rhnSGTypeBaseAddonCompat.sql b/= schema/spacewalk/common/tables/rhnSGTypeBaseAddonCompat.sql index 02c03b9..580b0e4 100644 --- a/schema/spacewalk/common/tables/rhnSGTypeBaseAddonCompat.sql +++ b/schema/spacewalk/common/tables/rhnSGTypeBaseAddonCompat.sql @@ -7,19 +7,19 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSGTypeBaseAddonCompat ( - base_id NUMBER NOT NULL = + base_id NUMBER NOT NULL CONSTRAINT rhn_sgt_bac_bid_fk - REFERENCES rhnServerGroupType (id), = - addon_id NUMBER NOT NULL = + REFERENCES rhnServerGroupType (id), + addon_id NUMBER NOT NULL CONSTRAINT rhn_sgt_bac_aid_fk REFERENCES rhnServerGroupType (id) ) diff --git a/schema/spacewalk/common/tables/rhnSGTypeVirtSubLevel.sql b/sch= ema/spacewalk/common/tables/rhnSGTypeVirtSubLevel.sql index 14e1dc1..9c49f26 100644 --- a/schema/spacewalk/common/tables/rhnSGTypeVirtSubLevel.sql +++ b/schema/spacewalk/common/tables/rhnSGTypeVirtSubLevel.sql @@ -7,24 +7,24 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSGTypeVirtSubLevel ( - server_group_type_id NUMBER NOT NULL = + server_group_type_id NUMBER NOT NULL CONSTRAINT rhn_sgtvsl_sgtid_fk - REFERENCES rhnServerGroupType (id), = - virt_sub_level_id NUMBER NOT NULL = + REFERENCES rhnServerGroupType (id), + virt_sub_level_id NUMBER NOT NULL CONSTRAINT rhn_sgtvsl_vslid_fk - REFERENCES rhnVirtSubLevel (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnVirtSubLevel (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnSNPErrataQueue.sql b/schema/= spacewalk/common/tables/rhnSNPErrataQueue.sql index 7fda139..830f3aa 100644 --- a/schema/spacewalk/common/tables/rhnSNPErrataQueue.sql +++ b/schema/spacewalk/common/tables/rhnSNPErrataQueue.sql @@ -7,20 +7,20 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSNPErrataQueue ( - errata_id NUMBER NOT NULL = + errata_id NUMBER NOT NULL CONSTRAINT rhn_snpErrQueue_eid_fk - REFERENCES rhnErrata (id) = - ON DELETE CASCADE, = - processed NUMBER = + REFERENCES rhnErrata (id) + ON DELETE CASCADE, + processed NUMBER DEFAULT (0) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnSNPServerQueue.sql b/schema/= spacewalk/common/tables/rhnSNPServerQueue.sql index 8d51249..b5ba23f 100644 --- a/schema/spacewalk/common/tables/rhnSNPServerQueue.sql +++ b/schema/spacewalk/common/tables/rhnSNPServerQueue.sql @@ -7,19 +7,19 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSNPServerQueue ( - server_id NUMBER NOT NULL = + server_id NUMBER NOT NULL CONSTRAINT rhn_sec_np_sid_fk - REFERENCES rhnServer (id), = - processed NUMBER = + REFERENCES rhnServer (id), + processed NUMBER DEFAULT (0) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnSatelliteCert.sql b/schema/s= pacewalk/common/tables/rhnSatelliteCert.sql index a84ade5..5c3d457 100644 --- a/schema/spacewalk/common/tables/rhnSatelliteCert.sql +++ b/schema/spacewalk/common/tables/rhnSatelliteCert.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSatelliteCert ( - label VARCHAR2(64) NOT NULL, = - version NUMBER, = - cert BLOB NOT NULL, = - issued DATE = - DEFAULT (sysdate), = - expires DATE = - DEFAULT (sysdate), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + label VARCHAR2(64) NOT NULL, + version NUMBER, + cert BLOB NOT NULL, + issued DATE + DEFAULT (sysdate), + expires DATE + DEFAULT (sysdate), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnSatelliteChannelFamily.sql b= /schema/spacewalk/common/tables/rhnSatelliteChannelFamily.sql index ab0c714..a47247e 100644 --- a/schema/spacewalk/common/tables/rhnSatelliteChannelFamily.sql +++ b/schema/spacewalk/common/tables/rhnSatelliteChannelFamily.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSatelliteChannelFamily ( - server_id NUMBER NOT NULL = + server_id NUMBER NOT NULL CONSTRAINT rhn_sat_cf_sid_fk - REFERENCES rhnServer (id), = - channel_family_id NUMBER NOT NULL = + REFERENCES rhnServer (id), + channel_family_id NUMBER NOT NULL CONSTRAINT rhn_sat_cf_cfid_fk - REFERENCES rhnChannelFamily (id) = - ON DELETE CASCADE, = - quantity NUMBER, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnChannelFamily (id) + ON DELETE CASCADE, + quantity NUMBER, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnSatelliteInfo.sql b/schema/s= pacewalk/common/tables/rhnSatelliteInfo.sql index 30cd4e3..625703d 100644 --- a/schema/spacewalk/common/tables/rhnSatelliteInfo.sql +++ b/schema/spacewalk/common/tables/rhnSatelliteInfo.sql @@ -7,29 +7,29 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSatelliteInfo ( - server_id NUMBER NOT NULL = + server_id NUMBER NOT NULL CONSTRAINT rhn_satellite_info_sid_fk - REFERENCES rhnServer (id), = - evr_id NUMBER = + REFERENCES rhnServer (id), + evr_id NUMBER CONSTRAINT rhn_satellite_info_eid_fk - REFERENCES rhnPackageEVR (id), = - cert BLOB NOT NULL, = - product VARCHAR2(256) NOT NULL, = - owner VARCHAR2(256) NOT NULL, = - issued_string VARCHAR2(256), = - expiration_string VARCHAR2(256), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnPackageEVR (id), + cert BLOB NOT NULL, + product VARCHAR2(256) NOT NULL, + owner VARCHAR2(256) NOT NULL, + issued_string VARCHAR2(256), + expiration_string VARCHAR2(256), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnSatelliteServerGroup.sql b/s= chema/spacewalk/common/tables/rhnSatelliteServerGroup.sql index 1f442d8..49509bc 100644 --- a/schema/spacewalk/common/tables/rhnSatelliteServerGroup.sql +++ b/schema/spacewalk/common/tables/rhnSatelliteServerGroup.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSatelliteServerGroup ( - server_id NUMBER NOT NULL = + server_id NUMBER NOT NULL CONSTRAINT rhn_satsg_sid_fk - REFERENCES rhnSatelliteInfo (server_id) = - ON DELETE CASCADE, = - server_group_type NUMBER NOT NULL = + REFERENCES rhnSatelliteInfo (server_id) + ON DELETE CASCADE, + server_group_type NUMBER NOT NULL CONSTRAINT rhn_satsg_sgtype_fk - REFERENCES rhnServerGroupType (id), = - max_members NUMBER, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnServerGroupType (id), + max_members NUMBER, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnSavedSearch.sql b/schema/spa= cewalk/common/tables/rhnSavedSearch.sql index 7dfbe01..309c8ed 100644 --- a/schema/spacewalk/common/tables/rhnSavedSearch.sql +++ b/schema/spacewalk/common/tables/rhnSavedSearch.sql @@ -7,31 +7,31 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSavedSearch ( - id NUMBER NOT NULL, = - web_contact_id NUMBER NOT NULL = + id NUMBER NOT NULL, + web_contact_id NUMBER NOT NULL CONSTRAINT rhn_savedsearch_wcid_fk - REFERENCES web_contact (id) = - ON DELETE CASCADE, = - name VARCHAR2(16) NOT NULL, = - type NUMBER NOT NULL = + REFERENCES web_contact (id) + ON DELETE CASCADE, + name VARCHAR2(16) NOT NULL, + type NUMBER NOT NULL CONSTRAINT rhn_savedsearch_type_fk - REFERENCES rhnSavedSearchType (id), = - search_string VARCHAR2(4000) NOT NULL, = - search_set VARCHAR2(16) NOT NULL = + REFERENCES rhnSavedSearchType (id), + search_string VARCHAR2(4000) NOT NULL, + search_set VARCHAR2(16) NOT NULL CONSTRAINT rhn_savedsearch_sset_ck - CHECK (search_set in ( 'all' , 'system_list' )= ), = - search_field VARCHAR2(128) NOT NULL, = - invert CHAR = - DEFAULT ('N') NOT NULL = + CHECK (search_set in ( 'all' , 'system_list' )= ), + search_field VARCHAR2(128) NOT NULL, + invert CHAR + DEFAULT ('N') NOT NULL CONSTRAINT rhn_savedsearch_invert_ck CHECK (invert in ( 'Y' , 'N' )) ) diff --git a/schema/spacewalk/common/tables/rhnSavedSearchType.sql b/schema= /spacewalk/common/tables/rhnSavedSearchType.sql index 74a9835..768e4a0 100644 --- a/schema/spacewalk/common/tables/rhnSavedSearchType.sql +++ b/schema/spacewalk/common/tables/rhnSavedSearchType.sql @@ -7,20 +7,20 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSavedSearchType ( - id NUMBER NOT NULL, = - label VARCHAR2(8) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL, + label VARCHAR2(8) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServer.sql b/schema/spacewal= k/common/tables/rhnServer.sql index 5f54171..ee3cb96 100644 --- a/schema/spacewalk/common/tables/rhnServer.sql +++ b/schema/spacewalk/common/tables/rhnServer.sql @@ -7,55 +7,55 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServer ( - id NUMBER NOT NULL = - CONSTRAINT rhn_server_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[4m_tbs]], = - org_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_server_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[4m_tbs]], + org_id NUMBER NOT NULL CONSTRAINT rhn_server_oid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - digital_server_id VARCHAR2(64) NOT NULL, = - server_arch_id NUMBER NOT NULL = + REFERENCES web_customer (id) + ON DELETE CASCADE, + digital_server_id VARCHAR2(64) NOT NULL, + server_arch_id NUMBER NOT NULL CONSTRAINT rhn_server_said_fk - REFERENCES rhnServerArch (id), = - os VARCHAR2(64) NOT NULL, = - release VARCHAR2(64) NOT NULL, = - name VARCHAR2(128), = - description VARCHAR2(256), = - info VARCHAR2(128), = - secret VARCHAR2(32) NOT NULL, = - creator_id NUMBER = + REFERENCES rhnServerArch (id), + os VARCHAR2(64) NOT NULL, + release VARCHAR2(64) NOT NULL, + name VARCHAR2(128), + description VARCHAR2(256), + info VARCHAR2(128), + secret VARCHAR2(32) NOT NULL, + creator_id NUMBER CONSTRAINT rhn_server_creator_fk - REFERENCES web_contact (id) = - ON DELETE SET NULL, = - auto_deliver CHAR(1) = - DEFAULT ('N') NOT NULL = + REFERENCES web_contact (id) + ON DELETE SET NULL, + auto_deliver CHAR(1) + DEFAULT ('N') NOT NULL CONSTRAINT rhn_server_deliver_ck - CHECK (auto_deliver in ( 'Y' , 'N' )), = - auto_update CHAR(1) = - DEFAULT ('N') NOT NULL = + CHECK (auto_deliver in ( 'Y' , 'N' )), + auto_update CHAR(1) + DEFAULT ('N') NOT NULL CONSTRAINT rhn_server_update_ck - CHECK (auto_update in ( 'Y' , 'N' )), = - running_kernel VARCHAR2(64), = - last_boot NUMBER = - DEFAULT (0) NOT NULL, = - provision_state_id NUMBER = + CHECK (auto_update in ( 'Y' , 'N' )), + running_kernel VARCHAR2(64), + last_boot NUMBER + DEFAULT (0) NOT NULL, + provision_state_id NUMBER CONSTRAINT rhn_server_psid_fk - REFERENCES rhnProvisionState (id), = - channels_changed DATE, = - cobbler_id VARCHAR2(64), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnProvisionState (id), + channels_changed DATE, + cobbler_id VARCHAR2(64), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerAction.sql b/schema/sp= acewalk/common/tables/rhnServerAction.sql index 7e79e6d..55ca121 100644 --- a/schema/spacewalk/common/tables/rhnServerAction.sql +++ b/schema/spacewalk/common/tables/rhnServerAction.sql @@ -7,34 +7,34 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerAction ( - server_id NUMBER NOT NULL = + server_id NUMBER NOT NULL CONSTRAINT rhn_server_action_sid_fk - REFERENCES rhnServer (id), = - action_id NUMBER NOT NULL = + REFERENCES rhnServer (id), + action_id NUMBER NOT NULL CONSTRAINT rhn_server_action_aid_fk - REFERENCES rhnAction (id) = - ON DELETE CASCADE, = - status NUMBER NOT NULL = + REFERENCES rhnAction (id) + ON DELETE CASCADE, + status NUMBER NOT NULL CONSTRAINT rhn_server_action_status_fk - REFERENCES rhnActionStatus (id), = - result_code NUMBER, = - result_msg VARCHAR2(1024), = - pickup_time DATE, = - remaining_tries NUMBER = - DEFAULT (5) NOT NULL, = - completion_time DATE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnActionStatus (id), + result_code NUMBER, + result_msg VARCHAR2(1024), + pickup_time DATE, + remaining_tries NUMBER + DEFAULT (5) NOT NULL, + completion_time DATE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerActionPackageResult.sq= l b/schema/spacewalk/common/tables/rhnServerActionPackageResult.sql index 7867d2c..73ad569 100644 --- a/schema/spacewalk/common/tables/rhnServerActionPackageResult.sql +++ b/schema/spacewalk/common/tables/rhnServerActionPackageResult.sql @@ -7,28 +7,28 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerActionPackageResult ( - server_id NUMBER NOT NULL = + server_id NUMBER NOT NULL CONSTRAINT rhn_sap_result_sid_fk - REFERENCES rhnServer (id), = - action_package_id NUMBER NOT NULL = + REFERENCES rhnServer (id), + action_package_id NUMBER NOT NULL CONSTRAINT rhn_sap_result_apid_fk - REFERENCES rhnActionPackage (id) = - ON DELETE CASCADE, = - result_code NUMBER NOT NULL, = - stdout BLOB, = - stderr BLOB, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnActionPackage (id) + ON DELETE CASCADE, + result_code NUMBER NOT NULL, + stdout BLOB, + stderr BLOB, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) TABLESPACE [[blob]] diff --git a/schema/spacewalk/common/tables/rhnServerActionScriptResult.sql= b/schema/spacewalk/common/tables/rhnServerActionScriptResult.sql index 0324a4b..e6c662e 100644 --- a/schema/spacewalk/common/tables/rhnServerActionScriptResult.sql +++ b/schema/spacewalk/common/tables/rhnServerActionScriptResult.sql @@ -7,29 +7,29 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerActionScriptResult ( - server_id NUMBER NOT NULL = + server_id NUMBER NOT NULL CONSTRAINT rhn_serveras_result_sid_fk - REFERENCES rhnServer (id), = - action_script_id NUMBER NOT NULL = + REFERENCES rhnServer (id), + action_script_id NUMBER NOT NULL CONSTRAINT rhn_serveras_result_asid_fk - REFERENCES rhnActionScript (id) = - ON DELETE CASCADE, = - output BLOB, = - start_date DATE NOT NULL, = - stop_date DATE NOT NULL, = - return_code NUMBER NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnActionScript (id) + ON DELETE CASCADE, + output BLOB, + start_date DATE NOT NULL, + stop_date DATE NOT NULL, + return_code NUMBER NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) TABLESPACE [[blob]] diff --git a/schema/spacewalk/common/tables/rhnServerActionVerifyMissing.sq= l b/schema/spacewalk/common/tables/rhnServerActionVerifyMissing.sql index 0eefbaf..4fc6e53 100644 --- a/schema/spacewalk/common/tables/rhnServerActionVerifyMissing.sql +++ b/schema/spacewalk/common/tables/rhnServerActionVerifyMissing.sql @@ -7,37 +7,37 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerActionVerifyMissing ( - server_id NUMBER NOT NULL = + server_id NUMBER NOT NULL CONSTRAINT rhn_sactionvm_sid_fk - REFERENCES rhnServer (id), = - action_id NUMBER NOT NULL = + REFERENCES rhnServer (id), + action_id NUMBER NOT NULL CONSTRAINT rhn_sactionvm_aid_fk - REFERENCES rhnAction (id) = - ON DELETE CASCADE, = - package_name_id NUMBER NOT NULL = + REFERENCES rhnAction (id) + ON DELETE CASCADE, + package_name_id NUMBER NOT NULL CONSTRAINT rhn_sactionvm_pnid_fk - REFERENCES rhnPackageName (id), = - package_evr_id NUMBER NOT NULL = + REFERENCES rhnPackageName (id), + package_evr_id NUMBER NOT NULL CONSTRAINT rhn_sactionvm_peid_fk - REFERENCES rhnPackageevr (id), = - package_arch_id NUMBER NOT NULL = + REFERENCES rhnPackageevr (id), + package_arch_id NUMBER NOT NULL CONSTRAINT rhn_sactionvm_paid_fk - REFERENCES rhnPackageArch (id), = - package_capability_id NUMBER NOT NULL = + REFERENCES rhnPackageArch (id), + package_capability_id NUMBER NOT NULL CONSTRAINT rhn_sactionvm_pcid_fk - REFERENCES rhnPackageCapability (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnPackageCapability (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerActionVerifyResult.sql= b/schema/spacewalk/common/tables/rhnServerActionVerifyResult.sql index c369f99..2e773a6 100644 --- a/schema/spacewalk/common/tables/rhnServerActionVerifyResult.sql +++ b/schema/spacewalk/common/tables/rhnServerActionVerifyResult.sql @@ -7,64 +7,64 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerActionVerifyResult ( - server_id NUMBER NOT NULL = + server_id NUMBER NOT NULL CONSTRAINT rhn_sactionvr_sid_fk - REFERENCES rhnServer (id), = - action_id NUMBER NOT NULL = + REFERENCES rhnServer (id), + action_id NUMBER NOT NULL CONSTRAINT rhn_sactionvr_aid_fk - REFERENCES rhnAction (id) = - ON DELETE CASCADE, = - package_name_id NUMBER NOT NULL = + REFERENCES rhnAction (id) + ON DELETE CASCADE, + package_name_id NUMBER NOT NULL CONSTRAINT rhn_sactionvr_pnid_fk - REFERENCES rhnPackageName (id), = - package_evr_id NUMBER NOT NULL = + REFERENCES rhnPackageName (id), + package_evr_id NUMBER NOT NULL CONSTRAINT rhn_sactionvr_peid_fk - REFERENCES rhnPackageEVR (id), = - package_arch_id NUMBER NOT NULL = + REFERENCES rhnPackageEVR (id), + package_arch_id NUMBER NOT NULL CONSTRAINT rhn_sactionvr_paid_fk - REFERENCES rhnPackageArch (id), = - package_capability_id NUMBER NOT NULL = + REFERENCES rhnPackageArch (id), + package_capability_id NUMBER NOT NULL CONSTRAINT rhn_sactionvr_pcid_fk - REFERENCES rhnPackageCapability (id), = - attribute CHAR(1) = + REFERENCES rhnPackageCapability (id), + attribute CHAR(1) CONSTRAINT rhn_sactionvr_attr_ck - CHECK (attribute in ( 'c' , 'd' , 'g' ,= 'l' , 'r' )), = - size_differs CHAR(1) NOT NULL = + CHECK (attribute in ( 'c' , 'd' , 'g' ,= 'l' , 'r' )), + size_differs CHAR(1) NOT NULL CONSTRAINT rhn_sactionvr_size_ck - CHECK (size_differs in ( 'Y' , 'N' , '?= ' )), = - mode_differs CHAR(1) NOT NULL = + CHECK (size_differs in ( 'Y' , 'N' , '?= ' )), + mode_differs CHAR(1) NOT NULL CONSTRAINT rhn_sactionvr_mode_ck - CHECK (mode_differs in ( 'Y' , 'N' , '?= ' )), = - md5_differs CHAR(1) NOT NULL = + CHECK (mode_differs in ( 'Y' , 'N' , '?= ' )), + md5_differs CHAR(1) NOT NULL CONSTRAINT rhn_sactionvr_md5_ck - CHECK (md5_differs in ( 'Y' , 'N' , '?'= )), = - devnum_differs CHAR(1) NOT NULL = + CHECK (md5_differs in ( 'Y' , 'N' , '?'= )), + devnum_differs CHAR(1) NOT NULL CONSTRAINT rhn_sactionvr_devnum_ck - CHECK (devnum_differs in ( 'Y' , 'N' , = '?' )), = - readlink_differs CHAR(1) NOT NULL = + CHECK (devnum_differs in ( 'Y' , 'N' , = '?' )), + readlink_differs CHAR(1) NOT NULL CONSTRAINT rhn_sactionvr_readlink_ck - CHECK (readlink_differs in ( 'Y' , 'N' = , '?' )), = - uid_differs CHAR(1) NOT NULL = + CHECK (readlink_differs in ( 'Y' , 'N' = , '?' )), + uid_differs CHAR(1) NOT NULL CONSTRAINT rhn_sactionvr_uid_ck - CHECK (uid_differs in ( 'Y' , 'N' , '?'= )), = - gid_differs CHAR(1) NOT NULL = + CHECK (uid_differs in ( 'Y' , 'N' , '?'= )), + gid_differs CHAR(1) NOT NULL CONSTRAINT rhn_sactionvr_gid_ck - CHECK (gid_differs in ( 'Y' , 'N' , '?'= )), = - mtime_differs CHAR(1) NOT NULL = + CHECK (gid_differs in ( 'Y' , 'N' , '?'= )), + mtime_differs CHAR(1) NOT NULL CONSTRAINT rhn_sactionvr_mtime_ck - CHECK (mtime_differs in ( 'Y' , 'N' , '= ?' )), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + CHECK (mtime_differs in ( 'Y' , 'N' , '= ?' )), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerArch.sql b/schema/spac= ewalk/common/tables/rhnServerArch.sql index dd335cf..efcb0f6 100644 --- a/schema/spacewalk/common/tables/rhnServerArch.sql +++ b/schema/spacewalk/common/tables/rhnServerArch.sql @@ -7,24 +7,24 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerArch ( - id NUMBER NOT NULL, = - label VARCHAR2(64) NOT NULL, = - name VARCHAR2(64) NOT NULL, = - arch_type_id NUMBER NOT NULL = + id NUMBER NOT NULL, + label VARCHAR2(64) NOT NULL, + name VARCHAR2(64) NOT NULL, + arch_type_id NUMBER NOT NULL CONSTRAINT rhn_sarch_atid_fk - REFERENCES rhnArchType (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnArchType (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerCacheInfo.sql b/schema= /spacewalk/common/tables/rhnServerCacheInfo.sql index 56ca517..628703b 100644 --- a/schema/spacewalk/common/tables/rhnServerCacheInfo.sql +++ b/schema/spacewalk/common/tables/rhnServerCacheInfo.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerCacheInfo ( - server_id NUMBER NOT NULL = + server_id NUMBER NOT NULL CONSTRAINT rhn_server_cache_info_sid_fk - REFERENCES rhnServer (id), = + REFERENCES rhnServer (id), update_time DATE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerChannel.sql b/schema/s= pacewalk/common/tables/rhnServerChannel.sql index 3b50bbb..efc48b1 100644 --- a/schema/spacewalk/common/tables/rhnServerChannel.sql +++ b/schema/spacewalk/common/tables/rhnServerChannel.sql @@ -7,24 +7,24 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerChannel ( - server_id NUMBER NOT NULL = + server_id NUMBER NOT NULL CONSTRAINT rhn_sc_sid_fk - REFERENCES rhnServer (id), = - channel_id NUMBER NOT NULL = + REFERENCES rhnServer (id), + channel_id NUMBER NOT NULL CONSTRAINT rhn_sc_cid_fk - REFERENCES rhnChannel (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnChannel (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerChannelArchCompat.sql = b/schema/spacewalk/common/tables/rhnServerChannelArchCompat.sql index 48105ed..9ad524e 100644 --- a/schema/spacewalk/common/tables/rhnServerChannelArchCompat.sql +++ b/schema/spacewalk/common/tables/rhnServerChannelArchCompat.sql @@ -7,24 +7,24 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerChannelArchCompat ( - server_arch_id NUMBER NOT NULL = + server_arch_id NUMBER NOT NULL CONSTRAINT rhn_sc_ac_said_fk - REFERENCES rhnServerArch (id), = - channel_arch_id NUMBER NOT NULL = + REFERENCES rhnServerArch (id), + channel_arch_id NUMBER NOT NULL CONSTRAINT rhn_sc_ac_caid_fk - REFERENCES rhnChannelArch (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnChannelArch (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerConfigChannel.sql b/sc= hema/spacewalk/common/tables/rhnServerConfigChannel.sql index d18ab01..717a9b1 100644 --- a/schema/spacewalk/common/tables/rhnServerConfigChannel.sql +++ b/schema/spacewalk/common/tables/rhnServerConfigChannel.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerConfigChannel ( - server_id NUMBER NOT NULL = + server_id NUMBER NOT NULL CONSTRAINT rhn_servercc_sid_fk - REFERENCES rhnServer (id), = - config_channel_id NUMBER NOT NULL = + REFERENCES rhnServer (id), + config_channel_id NUMBER NOT NULL CONSTRAINT rhn_servercc_ccid_fk - REFERENCES rhnConfigChannel (id) = - ON DELETE CASCADE, = - position NUMBER, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnConfigChannel (id) + ON DELETE CASCADE, + position NUMBER, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerCustomDataValue.sql b/= schema/spacewalk/common/tables/rhnServerCustomDataValue.sql index df5dadd..50e6b4d 100644 --- a/schema/spacewalk/common/tables/rhnServerCustomDataValue.sql +++ b/schema/spacewalk/common/tables/rhnServerCustomDataValue.sql @@ -7,33 +7,33 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerCustomDataValue ( - server_id NUMBER NOT NULL = + server_id NUMBER NOT NULL CONSTRAINT rhn_scdv_sid_fk - REFERENCES rhnServer (id), = - key_id NUMBER NOT NULL = + REFERENCES rhnServer (id), + key_id NUMBER NOT NULL CONSTRAINT rhn_scdv_kid_fk - REFERENCES rhnCustomDataKey (id), = - value VARCHAR2(4000), = - created_by NUMBER = + REFERENCES rhnCustomDataKey (id), + value VARCHAR2(4000), + created_by NUMBER CONSTRAINT rhn_scdv_cb_fk - REFERENCES web_contact (id) = - ON DELETE SET NULL, = - last_modified_by NUMBER = + REFERENCES web_contact (id) + ON DELETE SET NULL, + last_modified_by NUMBER CONSTRAINT rhn_scdv_lmb_fk - REFERENCES web_contact (id) = - ON DELETE SET NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES web_contact (id) + ON DELETE SET NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerDMI.sql b/schema/space= walk/common/tables/rhnServerDMI.sql index 6c3e760..2e5e786 100644 --- a/schema/spacewalk/common/tables/rhnServerDMI.sql +++ b/schema/spacewalk/common/tables/rhnServerDMI.sql @@ -7,32 +7,32 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerDMI ( - id NUMBER NOT NULL = - CONSTRAINT rhn_server_dmi_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]], = - server_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_server_dmi_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]], + server_id NUMBER NOT NULL CONSTRAINT rhn_server_dmi_sid_fk - REFERENCES rhnServer (id), = - vendor VARCHAR2(256), = - system VARCHAR2(256), = - product VARCHAR2(256), = - bios_vendor VARCHAR2(256), = - bios_version VARCHAR2(256), = - bios_release VARCHAR2(256), = - asset VARCHAR2(256), = - board VARCHAR2(256), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnServer (id), + vendor VARCHAR2(256), + system VARCHAR2(256), + product VARCHAR2(256), + bios_vendor VARCHAR2(256), + bios_version VARCHAR2(256), + bios_release VARCHAR2(256), + asset VARCHAR2(256), + board VARCHAR2(256), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerEvent.sql b/schema/spa= cewalk/common/tables/rhnServerEvent.sql index 9945174..6fa8226 100644 --- a/schema/spacewalk/common/tables/rhnServerEvent.sql +++ b/schema/spacewalk/common/tables/rhnServerEvent.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerEvent ( - id NUMBER NOT NULL = - CONSTRAINT rhn_se_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - server_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_se_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + server_id NUMBER NOT NULL CONSTRAINT rhn_se_server_id_fk - REFERENCES rhnServer (id), = - details VARCHAR2(4000) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnServer (id), + details VARCHAR2(4000) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerGroup.sql b/schema/spa= cewalk/common/tables/rhnServerGroup.sql index 80bc222..98d87d2 100644 --- a/schema/spacewalk/common/tables/rhnServerGroup.sql +++ b/schema/spacewalk/common/tables/rhnServerGroup.sql @@ -7,33 +7,33 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerGroup ( - id NUMBER NOT NULL = - CONSTRAINT rhn_servergroup_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[4m_tbs]], = - name VARCHAR2(64) NOT NULL, = - description VARCHAR2(1024) NOT NULL, = - max_members NUMBER, = - current_members NUMBER = - DEFAULT (0) NOT NULL, = - group_type NUMBER = + id NUMBER NOT NULL + CONSTRAINT rhn_servergroup_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[4m_tbs]], + name VARCHAR2(64) NOT NULL, + description VARCHAR2(1024) NOT NULL, + max_members NUMBER, + current_members NUMBER + DEFAULT (0) NOT NULL, + group_type NUMBER CONSTRAINT rhn_servergroup_type_fk - REFERENCES rhnServerGroupType (id), = - org_id NUMBER NOT NULL = + REFERENCES rhnServerGroupType (id), + org_id NUMBER NOT NULL CONSTRAINT rhn_servergroup_oid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES web_customer (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerGroupMembers.sql b/sch= ema/spacewalk/common/tables/rhnServerGroupMembers.sql index feeb631..c3845ef 100644 --- a/schema/spacewalk/common/tables/rhnServerGroupMembers.sql +++ b/schema/spacewalk/common/tables/rhnServerGroupMembers.sql @@ -7,24 +7,24 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerGroupMembers ( - server_id NUMBER NOT NULL = + server_id NUMBER NOT NULL CONSTRAINT rhn_sg_members_fk - REFERENCES rhnServer (id), = - server_group_id NUMBER NOT NULL = + REFERENCES rhnServer (id), + server_group_id NUMBER NOT NULL CONSTRAINT rhn_sg_groups_fk - REFERENCES rhnServerGroup (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnServerGroup (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerGroupNotes.sql b/schem= a/spacewalk/common/tables/rhnServerGroupNotes.sql index 0f9555c..4774da3 100644 --- a/schema/spacewalk/common/tables/rhnServerGroupNotes.sql +++ b/schema/spacewalk/common/tables/rhnServerGroupNotes.sql @@ -7,31 +7,31 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerGroupNotes ( - id NUMBER NOT NULL = - CONSTRAINT rhn_servergrp_note_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - creator NUMBER = + id NUMBER NOT NULL + CONSTRAINT rhn_servergrp_note_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + creator NUMBER CONSTRAINT rhn_servergrp_note_creator_fk - REFERENCES web_contact (id) = - ON DELETE SET NULL, = - server_group_id NUMBER NOT NULL = + REFERENCES web_contact (id) + ON DELETE SET NULL, + server_group_id NUMBER NOT NULL CONSTRAINT rhn_servergrp_note_fk - REFERENCES rhnServerGroup (id) = - ON DELETE CASCADE, = - subject VARCHAR2(80) NOT NULL, = - note VARCHAR2(4000) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnServerGroup (id) + ON DELETE CASCADE, + subject VARCHAR2(80) NOT NULL, + note VARCHAR2(4000) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerGroupType.sql b/schema= /spacewalk/common/tables/rhnServerGroupType.sql index 1fcb317..2b84277 100644 --- a/schema/spacewalk/common/tables/rhnServerGroupType.sql +++ b/schema/spacewalk/common/tables/rhnServerGroupType.sql @@ -7,30 +7,30 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerGroupType ( - id NUMBER NOT NULL = - CONSTRAINT rhn_servergrouptype_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - label VARCHAR2(32) NOT NULL, = - name VARCHAR2(64) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = - DEFAULT (sysdate) NOT NULL, = - permanent CHAR = - DEFAULT ('Y') NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_servergrouptype_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + label VARCHAR2(32) NOT NULL, + name VARCHAR2(64) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE + DEFAULT (sysdate) NOT NULL, + permanent CHAR + DEFAULT ('Y') NOT NULL CONSTRAINT rhn_servergrouptype_perm_ck - CHECK (permanent in ( 'Y' , 'N' )), = - is_base CHAR = - DEFAULT ('Y') NOT NULL = + CHECK (permanent in ( 'Y' , 'N' )), + is_base CHAR + DEFAULT ('Y') NOT NULL CONSTRAINT rhn_servergrouptype_isbase_ck CHECK (is_base in ( 'Y' , 'N' )) ) diff --git a/schema/spacewalk/common/tables/rhnServerGroupTypeFeature.sql b= /schema/spacewalk/common/tables/rhnServerGroupTypeFeature.sql index 5c86d77..a2b93a7 100644 --- a/schema/spacewalk/common/tables/rhnServerGroupTypeFeature.sql +++ b/schema/spacewalk/common/tables/rhnServerGroupTypeFeature.sql @@ -7,24 +7,24 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerGroupTypeFeature ( - server_group_type_id NUMBER NOT NULL = + server_group_type_id NUMBER NOT NULL CONSTRAINT rhn_sgt_sgid_fk - REFERENCES rhnServerGroupType (id), = - feature_id NUMBER NOT NULL = + REFERENCES rhnServerGroupType (id), + feature_id NUMBER NOT NULL CONSTRAINT rhn_sgt_fid_fk - REFERENCES rhnFeature (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnFeature (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerHistory.sql b/schema/s= pacewalk/common/tables/rhnServerHistory.sql index a51246d..1dc3379 100644 --- a/schema/spacewalk/common/tables/rhnServerHistory.sql +++ b/schema/spacewalk/common/tables/rhnServerHistory.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerHistory ( - id NUMBER NOT NULL = - CONSTRAINT rhn_serverhistory_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]], = - server_Id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_serverhistory_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]], + server_Id NUMBER NOT NULL CONSTRAINT rhn_serverhistory_sid_fk - REFERENCES rhnServer (id), = - summary VARCHAR2(256) NOT NULL, = - details VARCHAR2(4000), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnServer (id), + summary VARCHAR2(256) NOT NULL, + details VARCHAR2(4000), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerInfo.sql b/schema/spac= ewalk/common/tables/rhnServerInfo.sql index 8f55844..4940625 100644 --- a/schema/spacewalk/common/tables/rhnServerInfo.sql +++ b/schema/spacewalk/common/tables/rhnServerInfo.sql @@ -7,21 +7,21 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerInfo ( - server_id NUMBER NOT NULL = + server_id NUMBER NOT NULL CONSTRAINT rhn_server_info_sid_fk - REFERENCES rhnServer (id), = - checkin DATE = - DEFAULT (sysdate), = - checkin_counter NUMBER = + REFERENCES rhnServer (id), + checkin DATE + DEFAULT (sysdate), + checkin_counter NUMBER DEFAULT (0) ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerInstallInfo.sql b/sche= ma/spacewalk/common/tables/rhnServerInstallInfo.sql index 65035be..ca91b89 100644 --- a/schema/spacewalk/common/tables/rhnServerInstallInfo.sql +++ b/schema/spacewalk/common/tables/rhnServerInstallInfo.sql @@ -7,27 +7,27 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerInstallInfo ( - id NUMBER NOT NULL = - CONSTRAINT rhn_server_install_info_id_pk PRIMARY K= EY = - USING INDEX TABLESPACE [[2m_tbs]], = - server_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_server_install_info_id_pk PRIMARY K= EY + USING INDEX TABLESPACE [[2m_tbs]], + server_id NUMBER NOT NULL CONSTRAINT rhn_server_install_info_sid_fk - REFERENCES rhnServer (id), = - install_method VARCHAR2(32) NOT NULL, = - iso_status NUMBER, = - mediasum VARCHAR2(64), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnServer (id), + install_method VARCHAR2(32) NOT NULL, + iso_status NUMBER, + mediasum VARCHAR2(64), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerLocation.sql b/schema/= spacewalk/common/tables/rhnServerLocation.sql index 3fbc336..f8afedf 100644 --- a/schema/spacewalk/common/tables/rhnServerLocation.sql +++ b/schema/spacewalk/common/tables/rhnServerLocation.sql @@ -7,33 +7,33 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerLocation ( - id NUMBER NOT NULL = - CONSTRAINT rhn_serverlocation_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - server_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_serverlocation_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + server_id NUMBER NOT NULL CONSTRAINT rhn_serverlocation_sid_fk - REFERENCES rhnServer (id), = - machine VARCHAR2(64), = - rack VARCHAR2(64), = - room VARCHAR2(32), = - building VARCHAR2(128), = - address1 VARCHAR2(128), = - address2 VARCHAR2(128), = - city VARCHAR2(128), = - state VARCHAR2(60), = - country CHAR(2), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnServer (id), + machine VARCHAR2(64), + rack VARCHAR2(64), + room VARCHAR2(32), + building VARCHAR2(128), + address1 VARCHAR2(128), + address2 VARCHAR2(128), + city VARCHAR2(128), + state VARCHAR2(60), + country CHAR(2), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerLock.sql b/schema/spac= ewalk/common/tables/rhnServerLock.sql index 708965d..b9690d8 100644 --- a/schema/spacewalk/common/tables/rhnServerLock.sql +++ b/schema/spacewalk/common/tables/rhnServerLock.sql @@ -7,24 +7,24 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerLock ( - server_id NUMBER NOT NULL = + server_id NUMBER NOT NULL CONSTRAINT rhn_server_lock_sid_fk - REFERENCES rhnServer (id), = - locker_id NUMBER = + REFERENCES rhnServer (id), + locker_id NUMBER CONSTRAINT rhn_server_lock_lid_fk - REFERENCES web_contact (id) = - ON DELETE SET NULL, = - reason VARCHAR2(4000), = - created DATE = + REFERENCES web_contact (id) + ON DELETE SET NULL, + reason VARCHAR2(4000), + created DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerMessage.sql b/schema/s= pacewalk/common/tables/rhnServerMessage.sql index d47a251..5ae9fcf 100644 --- a/schema/spacewalk/common/tables/rhnServerMessage.sql +++ b/schema/spacewalk/common/tables/rhnServerMessage.sql @@ -7,29 +7,29 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerMessage ( - server_id NUMBER NOT NULL = + server_id NUMBER NOT NULL CONSTRAINT rhn_sm_server_id_fk - REFERENCES rhnServer (id), = - message_id NUMBER NOT NULL = + REFERENCES rhnServer (id), + message_id NUMBER NOT NULL CONSTRAINT rhn_sm_message_id_fk - REFERENCES rhnMessage (id) = - ON DELETE CASCADE, = - server_event NUMBER = + REFERENCES rhnMessage (id) + ON DELETE CASCADE, + server_event NUMBER CONSTRAINT rhn_sm_se_fk - REFERENCES rhnServerEvent (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnServerEvent (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerNeededCache.sql b/sche= ma/spacewalk/common/tables/rhnServerNeededCache.sql index 03e94f1..07a7395 100644 --- a/schema/spacewalk/common/tables/rhnServerNeededCache.sql +++ b/schema/spacewalk/common/tables/rhnServerNeededCache.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerNeededCache ( - server_id NUMBER NOT NULL = + server_id NUMBER NOT NULL CONSTRAINT rhn_sncp_sid_fk - REFERENCES rhnServer (id) = - ON DELETE CASCADE, = - errata_id NUMBER = + REFERENCES rhnServer (id) + ON DELETE CASCADE, + errata_id NUMBER CONSTRAINT rhn_sncp_eid_fk - REFERENCES rhnErrata (id) = - ON DELETE CASCADE, = - package_id NUMBER NOT NULL = + REFERENCES rhnErrata (id) + ON DELETE CASCADE, + package_id NUMBER NOT NULL CONSTRAINT rhn_sncp_pid_fk - REFERENCES rhnPackage (id) = + REFERENCES rhnPackage (id) ON DELETE CASCADE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerNetInterface.sql b/sch= ema/spacewalk/common/tables/rhnServerNetInterface.sql index 55476d0..f115885 100644 --- a/schema/spacewalk/common/tables/rhnServerNetInterface.sql +++ b/schema/spacewalk/common/tables/rhnServerNetInterface.sql @@ -7,27 +7,27 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerNetInterface ( - server_id NUMBER NOT NULL = + server_id NUMBER NOT NULL CONSTRAINT rhn_srv_net_iface_sid_fk - REFERENCES rhnServer (id), = - name VARCHAR2(32) NOT NULL, = - ip_addr VARCHAR2(64), = - netmask VARCHAR2(64), = - broadcast VARCHAR2(64), = - hw_addr VARCHAR2(18), = - module VARCHAR2(128), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnServer (id), + name VARCHAR2(32) NOT NULL, + ip_addr VARCHAR2(64), + netmask VARCHAR2(64), + broadcast VARCHAR2(64), + hw_addr VARCHAR2(18), + module VARCHAR2(128), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerNetwork.sql b/schema/s= pacewalk/common/tables/rhnServerNetwork.sql index 246c77b..63ef3e4 100644 --- a/schema/spacewalk/common/tables/rhnServerNetwork.sql +++ b/schema/spacewalk/common/tables/rhnServerNetwork.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerNetwork ( - id NUMBER NOT NULL = - CONSTRAINT rhn_servernetwork_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[4m_tbs]], = - server_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_servernetwork_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[4m_tbs]], + server_id NUMBER NOT NULL CONSTRAINT rhn_servernetwork_sid_fk - REFERENCES rhnServer (id), = - hostname VARCHAR2(128), = - ipaddr CHAR(16), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnServer (id), + hostname VARCHAR2(128), + ipaddr CHAR(16), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerNotes.sql b/schema/spa= cewalk/common/tables/rhnServerNotes.sql index c999f54..be61206 100644 --- a/schema/spacewalk/common/tables/rhnServerNotes.sql +++ b/schema/spacewalk/common/tables/rhnServerNotes.sql @@ -7,30 +7,30 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerNotes ( - id NUMBER NOT NULL = - CONSTRAINT rhn_servernotes_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - creator NUMBER = + id NUMBER NOT NULL + CONSTRAINT rhn_servernotes_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + creator NUMBER CONSTRAINT rhn_servernotes_creator_fk - REFERENCES web_contact (id) = - ON DELETE SET NULL, = - server_id NUMBER NOT NULL = + REFERENCES web_contact (id) + ON DELETE SET NULL, + server_id NUMBER NOT NULL CONSTRAINT rhn_servernotes_sid_fk - REFERENCES rhnServer (id), = - subject VARCHAR2(80) NOT NULL, = - note VARCHAR2(4000), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnServer (id), + subject VARCHAR2(80) NOT NULL, + note VARCHAR2(4000), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerPackage.sql b/schema/s= pacewalk/common/tables/rhnServerPackage.sql index 44eef84..6b9b091 100644 --- a/schema/spacewalk/common/tables/rhnServerPackage.sql +++ b/schema/spacewalk/common/tables/rhnServerPackage.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerPackage ( - server_id NUMBER NOT NULL = - REFERENCES rhnServer (id) = - ON DELETE CASCADE, = - name_id NUMBER NOT NULL = - REFERENCES rhnPackageName (id), = - evr_id NUMBER NOT NULL = - REFERENCES rhnPackageEVR (id), = - package_arch_id NUMBER = + server_id NUMBER NOT NULL + REFERENCES rhnServer (id) + ON DELETE CASCADE, + name_id NUMBER NOT NULL + REFERENCES rhnPackageName (id), + evr_id NUMBER NOT NULL + REFERENCES rhnPackageEVR (id), + package_arch_id NUMBER REFERENCES rhnPackageArch (id) ) TABLESPACE [[server_package_tablespace]] diff --git a/schema/spacewalk/common/tables/rhnServerPackageArchCompat.sql = b/schema/spacewalk/common/tables/rhnServerPackageArchCompat.sql index 03829d5..d117df5 100644 --- a/schema/spacewalk/common/tables/rhnServerPackageArchCompat.sql +++ b/schema/spacewalk/common/tables/rhnServerPackageArchCompat.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerPackageArchCompat ( - server_arch_id NUMBER NOT NULL = + server_arch_id NUMBER NOT NULL CONSTRAINT rhn_sp_ac_said_fk - REFERENCES rhnServerArch (id), = - package_arch_id NUMBER NOT NULL = + REFERENCES rhnServerArch (id), + package_arch_id NUMBER NOT NULL CONSTRAINT rhn_sp_ac_paid_fk - REFERENCES rhnPackageArch (id), = - preference NUMBER NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnPackageArch (id), + preference NUMBER NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT @@ -43,6 +43,6 @@ ALTER TABLE rhnServerPackageArchCompat ADD CONSTRAINT rhn_sp_ac_said_paid_uq UNIQUE (server_arch_id, package_= arch_id); = ALTER TABLE rhnServerPackageArchCompat - ADD CONSTRAINT rhn_sp_ac_pref_said_uq UNIQUE (preference, server_arch_= id) = + ADD CONSTRAINT rhn_sp_ac_pref_said_uq UNIQUE (preference, server_arch_= id) USING INDEX TABLESPACE [[64k_tbs]]; = diff --git a/schema/spacewalk/common/tables/rhnServerPath.sql b/schema/spac= ewalk/common/tables/rhnServerPath.sql index 7be1503..b6c0315 100644 --- a/schema/spacewalk/common/tables/rhnServerPath.sql +++ b/schema/spacewalk/common/tables/rhnServerPath.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerPath ( - server_id NUMBER NOT NULL = + server_id NUMBER NOT NULL CONSTRAINT rhn_serverpath_sid_fk - REFERENCES rhnServer (id), = - proxy_server_id NUMBER NOT NULL = + REFERENCES rhnServer (id), + proxy_server_id NUMBER NOT NULL CONSTRAINT rhn_serverpath_psid_fk - REFERENCES rhnServer (id), = - position NUMBER NOT NULL, = - hostname VARCHAR2(256) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnServer (id), + position NUMBER NOT NULL, + hostname VARCHAR2(256) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerPreserveFileList.sql b= /schema/spacewalk/common/tables/rhnServerPreserveFileList.sql index 015cd48..6e2505c 100644 --- a/schema/spacewalk/common/tables/rhnServerPreserveFileList.sql +++ b/schema/spacewalk/common/tables/rhnServerPreserveFileList.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerPreserveFileList ( - server_id NUMBER NOT NULL = + server_id NUMBER NOT NULL CONSTRAINT rhn_serverpfl_ksid_fk - REFERENCES rhnServer (id), = - file_list_id NUMBER NOT NULL = + REFERENCES rhnServer (id), + file_list_id NUMBER NOT NULL CONSTRAINT rhn_serverpfl_flid_fk - REFERENCES rhnFileList (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnFileList (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerProfile.sql b/schema/s= pacewalk/common/tables/rhnServerProfile.sql index 67cc5bc..b1b737e 100644 --- a/schema/spacewalk/common/tables/rhnServerProfile.sql +++ b/schema/spacewalk/common/tables/rhnServerProfile.sql @@ -7,32 +7,32 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerProfile ( - id NUMBER NOT NULL, = - org_id NUMBER NOT NULL = + id NUMBER NOT NULL, + org_id NUMBER NOT NULL CONSTRAINT rhn_server_profile_oid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - base_channel NUMBER NOT NULL = + REFERENCES web_customer (id) + ON DELETE CASCADE, + base_channel NUMBER NOT NULL CONSTRAINT rhn_server_profile_bcid_fk - REFERENCES rhnChannel (id), = - name VARCHAR2(128), = - description VARCHAR2(256), = - info VARCHAR2(128), = - profile_type_id NUMBER NOT NULL = + REFERENCES rhnChannel (id), + name VARCHAR2(128), + description VARCHAR2(256), + info VARCHAR2(128), + profile_type_id NUMBER NOT NULL CONSTRAINT rhn_server_profile_ptype_fk - REFERENCES rhnServerProfileType (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnServerProfileType (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerProfilePackage.sql b/s= chema/spacewalk/common/tables/rhnServerProfilePackage.sql index ebe5f7e..b55fcb3 100644 --- a/schema/spacewalk/common/tables/rhnServerProfilePackage.sql +++ b/schema/spacewalk/common/tables/rhnServerProfilePackage.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerProfilePackage ( - server_profile_id NUMBER NOT NULL = + server_profile_id NUMBER NOT NULL CONSTRAINT rhn_sprofile_spid_fk - REFERENCES rhnServerProfile (id) = - ON DELETE CASCADE, = - name_id NUMBER NOT NULL = + REFERENCES rhnServerProfile (id) + ON DELETE CASCADE, + name_id NUMBER NOT NULL CONSTRAINT rhn_sprofile_nid_fk - REFERENCES rhnPackageName (id), = - evr_id NUMBER NOT NULL = + REFERENCES rhnPackageName (id), + evr_id NUMBER NOT NULL CONSTRAINT rhn_sprofile_evrid_fk - REFERENCES rhnPackageEvr (id), = - package_arch_id NUMBER = + REFERENCES rhnPackageEvr (id), + package_arch_id NUMBER CONSTRAINT rhn_sprofile_package_fk REFERENCES rhnPackageArch (id) ) diff --git a/schema/spacewalk/common/tables/rhnServerProfileType.sql b/sche= ma/spacewalk/common/tables/rhnServerProfileType.sql index 83a46e2..c166ea0 100644 --- a/schema/spacewalk/common/tables/rhnServerProfileType.sql +++ b/schema/spacewalk/common/tables/rhnServerProfileType.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerProfileType ( - id NUMBER NOT NULL = - CONSTRAINT rhn_sproftype_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - label VARCHAR2(64) NOT NULL, = - name VARCHAR2(64) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_sproftype_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + label VARCHAR2(64) NOT NULL, + name VARCHAR2(64) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerServerGroupArchCompat.= sql b/schema/spacewalk/common/tables/rhnServerServerGroupArchCompat.sql index c8c552e..1f8e77b 100644 --- a/schema/spacewalk/common/tables/rhnServerServerGroupArchCompat.sql +++ b/schema/spacewalk/common/tables/rhnServerServerGroupArchCompat.sql @@ -7,24 +7,24 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerServerGroupArchCompat ( - server_arch_id NUMBER NOT NULL = + server_arch_id NUMBER NOT NULL CONSTRAINT rhn_ssg_ac_said_fk - REFERENCES rhnServerArch (id), = - server_group_type NUMBER NOT NULL = + REFERENCES rhnServerArch (id), + server_group_type NUMBER NOT NULL CONSTRAINT rhn_ssg_ac_sgt_fk - REFERENCES rhnServerGroupType (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnServerGroupType (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnServerTokenRegs.sql b/schema= /spacewalk/common/tables/rhnServerTokenRegs.sql index 714ab7b..d896873 100644 --- a/schema/spacewalk/common/tables/rhnServerTokenRegs.sql +++ b/schema/spacewalk/common/tables/rhnServerTokenRegs.sql @@ -7,20 +7,20 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerTokenRegs ( - token_id NUMBER NOT NULL = + token_id NUMBER NOT NULL CONSTRAINT rhn_srv_reg_tok_tid_fk - REFERENCES rhnRegToken (id) = - ON DELETE CASCADE, = - server_id NUMBER NOT NULL = + REFERENCES rhnRegToken (id) + ON DELETE CASCADE, + server_id NUMBER NOT NULL CONSTRAINT rhn_srv_reg_tok_sid_fk REFERENCES rhnServer (id) ) diff --git a/schema/spacewalk/common/tables/rhnServerUuid.sql b/schema/spac= ewalk/common/tables/rhnServerUuid.sql index 658dcf3..120fbeb 100644 --- a/schema/spacewalk/common/tables/rhnServerUuid.sql +++ b/schema/spacewalk/common/tables/rhnServerUuid.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnServerUuid ( - server_id NUMBER NOT NULL = + server_id NUMBER NOT NULL CONSTRAINT rhn_server_uuid_sid_fk - REFERENCES rhnServer (id), = + REFERENCES rhnServer (id), uuid VARCHAR2(36) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnSet.sql b/schema/spacewalk/c= ommon/tables/rhnSet.sql index 00c4816..78105d0 100644 --- a/schema/spacewalk/common/tables/rhnSet.sql +++ b/schema/spacewalk/common/tables/rhnSet.sql @@ -7,24 +7,24 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSet ( - user_id NUMBER NOT NULL = + user_id NUMBER NOT NULL CONSTRAINT rhn_set_user_fk - REFERENCES web_contact (id) = - ON DELETE CASCADE, = - label VARCHAR2(32) NOT NULL, = - element NUMBER NOT NULL, = - element_two NUMBER, = - element_three NUMBER, = - CONSTRAINT rhn_set_user_label_elem_unq UNIQUE (user_id, label, element= , element_two, element_three) = + REFERENCES web_contact (id) + ON DELETE CASCADE, + label VARCHAR2(32) NOT NULL, + element NUMBER NOT NULL, + element_two NUMBER, + element_three NUMBER, + CONSTRAINT rhn_set_user_label_elem_unq UNIQUE (user_id, label, element= , element_two, element_three) USING INDEX TABLESPACE [[8m_tbs]] ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnSnapshot.sql b/schema/spacew= alk/common/tables/rhnSnapshot.sql index 611d446..5126105 100644 --- a/schema/spacewalk/common/tables/rhnSnapshot.sql +++ b/schema/spacewalk/common/tables/rhnSnapshot.sql @@ -7,31 +7,31 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSnapshot ( - id NUMBER NOT NULL = - CONSTRAINT rhn_snapshot_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[8m_tbs]], = - org_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_snapshot_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[8m_tbs]], + org_id NUMBER NOT NULL CONSTRAINT rhn_snapshot_oid_fk - REFERENCES web_customer (id), = - invalid NUMBER = + REFERENCES web_customer (id), + invalid NUMBER CONSTRAINT rhn_snapshot_invalid_fk - REFERENCES rhnSnapshotInvalidReason (id), = - reason VARCHAR2(4000) NOT NULL, = - server_id NUMBER NOT NULL = + REFERENCES rhnSnapshotInvalidReason (id), + reason VARCHAR2(4000) NOT NULL, + server_id NUMBER NOT NULL CONSTRAINT rhn_snapshot_sid_fk - REFERENCES rhnServer (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnServer (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnSnapshotChannel.sql b/schema= /spacewalk/common/tables/rhnSnapshotChannel.sql index 9fb04d8..09f934b 100644 --- a/schema/spacewalk/common/tables/rhnSnapshotChannel.sql +++ b/schema/spacewalk/common/tables/rhnSnapshotChannel.sql @@ -7,20 +7,20 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSnapshotChannel ( - snapshot_id NUMBER NOT NULL = + snapshot_id NUMBER NOT NULL CONSTRAINT rhn_snapchan_sid_fk - REFERENCES rhnSnapshot (id) = - ON DELETE CASCADE, = - channel_id NUMBER NOT NULL = + REFERENCES rhnSnapshot (id) + ON DELETE CASCADE, + channel_id NUMBER NOT NULL CONSTRAINT rhn_snapchan_cid_fk REFERENCES rhnChannel (id) ) diff --git a/schema/spacewalk/common/tables/rhnSnapshotConfigChannel.sql b/= schema/spacewalk/common/tables/rhnSnapshotConfigChannel.sql index 74ffd36..ee3a700 100644 --- a/schema/spacewalk/common/tables/rhnSnapshotConfigChannel.sql +++ b/schema/spacewalk/common/tables/rhnSnapshotConfigChannel.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSnapshotConfigChannel ( - snapshot_id NUMBER NOT NULL = + snapshot_id NUMBER NOT NULL CONSTRAINT rhn_snapshotcc_sid_fk - REFERENCES rhnSnapshot (id) = - ON DELETE CASCADE, = - config_channel_id NUMBER NOT NULL = + REFERENCES rhnSnapshot (id) + ON DELETE CASCADE, + config_channel_id NUMBER NOT NULL CONSTRAINT rhn_snapshotcc_ccid_fk - REFERENCES rhnConfigChannel (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnConfigChannel (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnSnapshotConfigRevision.sql b= /schema/spacewalk/common/tables/rhnSnapshotConfigRevision.sql index d8b5dd6..7be859c 100644 --- a/schema/spacewalk/common/tables/rhnSnapshotConfigRevision.sql +++ b/schema/spacewalk/common/tables/rhnSnapshotConfigRevision.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSnapshotConfigRevision ( - snapshot_id NUMBER NOT NULL = + snapshot_id NUMBER NOT NULL CONSTRAINT rhn_snapshotcr_sid_fk - REFERENCES rhnSnapshot (id) = - ON DELETE CASCADE, = - config_revision_id NUMBER NOT NULL = + REFERENCES rhnSnapshot (id) + ON DELETE CASCADE, + config_revision_id NUMBER NOT NULL CONSTRAINT rhn_snapshotcr_crid_fk - REFERENCES rhnConfigRevision (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnConfigRevision (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnSnapshotInvalidReason.sql b/= schema/spacewalk/common/tables/rhnSnapshotInvalidReason.sql index 9bbbe77..c988678 100644 --- a/schema/spacewalk/common/tables/rhnSnapshotInvalidReason.sql +++ b/schema/spacewalk/common/tables/rhnSnapshotInvalidReason.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSnapshotInvalidReason ( - id NUMBER NOT NULL = - CONSTRAINT rhn_ssinvalid_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - label VARCHAR2(32) NOT NULL, = - name VARCHAR2(128) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_ssinvalid_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + label VARCHAR2(32) NOT NULL, + name VARCHAR2(128) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnSnapshotPackage.sql b/schema= /spacewalk/common/tables/rhnSnapshotPackage.sql index 2a20db3..b3d491c 100644 --- a/schema/spacewalk/common/tables/rhnSnapshotPackage.sql +++ b/schema/spacewalk/common/tables/rhnSnapshotPackage.sql @@ -7,20 +7,20 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSnapshotPackage ( - snapshot_id NUMBER NOT NULL = + snapshot_id NUMBER NOT NULL CONSTRAINT rhn_snapshotpkg_sid_fk - REFERENCES rhnSnapshot (id) = - ON DELETE CASCADE, = - nevra_id NUMBER NOT NULL = + REFERENCES rhnSnapshot (id) + ON DELETE CASCADE, + nevra_id NUMBER NOT NULL CONSTRAINT rhn_snapshotpkg_nid_fk REFERENCES rhnPackageNevra (id) ) diff --git a/schema/spacewalk/common/tables/rhnSnapshotServerGroup.sql b/sc= hema/spacewalk/common/tables/rhnSnapshotServerGroup.sql index 7076f48..6eaf4bb 100644 --- a/schema/spacewalk/common/tables/rhnSnapshotServerGroup.sql +++ b/schema/spacewalk/common/tables/rhnSnapshotServerGroup.sql @@ -7,20 +7,20 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSnapshotServerGroup ( - snapshot_id NUMBER NOT NULL = + snapshot_id NUMBER NOT NULL CONSTRAINT rhn_snapshotsg_sid_fk - REFERENCES rhnSnapshot (id) = - ON DELETE CASCADE, = - server_group_id NUMBER NOT NULL = + REFERENCES rhnSnapshot (id) + ON DELETE CASCADE, + server_group_id NUMBER NOT NULL CONSTRAINT rhn_snapshotsg_sgid_fk REFERENCES rhnServerGroup (id) ) diff --git a/schema/spacewalk/common/tables/rhnSnapshotTag.sql b/schema/spa= cewalk/common/tables/rhnSnapshotTag.sql index 4b103ac..1cbb94b 100644 --- a/schema/spacewalk/common/tables/rhnSnapshotTag.sql +++ b/schema/spacewalk/common/tables/rhnSnapshotTag.sql @@ -7,28 +7,28 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSnapshotTag ( - snapshot_id NUMBER NOT NULL = + snapshot_id NUMBER NOT NULL CONSTRAINT rhn_st_ssid_fk - REFERENCES rhnSnapshot (id) = - ON DELETE CASCADE, = - tag_id NUMBER NOT NULL = + REFERENCES rhnSnapshot (id) + ON DELETE CASCADE, + tag_id NUMBER NOT NULL CONSTRAINT rhn_st_tid_fk - REFERENCES rhnTag (id), = - server_id NUMBER = + REFERENCES rhnTag (id), + server_id NUMBER CONSTRAINT rhn_st_sid_fk - REFERENCES rhnServer (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnServer (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnSolarisPackage.sql b/schema/= spacewalk/common/tables/rhnSolarisPackage.sql index 5ac978a..ccd8857 100644 --- a/schema/spacewalk/common/tables/rhnSolarisPackage.sql +++ b/schema/spacewalk/common/tables/rhnSolarisPackage.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSolarisPackage ( - package_id NUMBER = - CONSTRAINT rhn_solaris_pkg_pid_pk PRIMARY KEY = + package_id NUMBER + CONSTRAINT rhn_solaris_pkg_pid_pk PRIMARY KEY CONSTRAINT rhn_solaris_pkg_pid_fk - REFERENCES rhnPackage (id) = - ON DELETE CASCADE, = - category VARCHAR2(2048) NOT NULL, = - pkginfo VARCHAR2(4000), = - pkgmap BLOB, = - intonly CHAR(1) = - DEFAULT ('N') = + REFERENCES rhnPackage (id) + ON DELETE CASCADE, + category VARCHAR2(2048) NOT NULL, + pkginfo VARCHAR2(4000), + pkgmap BLOB, + intonly CHAR(1) + DEFAULT ('N') CONSTRAINT rhn_solaris_pkg_io_ck CHECK (intonly in ( 'Y' , 'N' )) ) diff --git a/schema/spacewalk/common/tables/rhnSolarisPatch.sql b/schema/sp= acewalk/common/tables/rhnSolarisPatch.sql index 5e9381a..57f12c3 100644 --- a/schema/spacewalk/common/tables/rhnSolarisPatch.sql +++ b/schema/spacewalk/common/tables/rhnSolarisPatch.sql @@ -7,31 +7,31 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSolarisPatch ( - package_id NUMBER = - CONSTRAINT rhn_solaris_p_pk PRIMARY KEY = + package_id NUMBER + CONSTRAINT rhn_solaris_p_pk PRIMARY KEY CONSTRAINT rhn_solaris_p_fk - REFERENCES rhnPackage (id) = - ON DELETE CASCADE, = - solaris_release VARCHAR2(64), = - sunos_release VARCHAR2(64), = - patch_type NUMBER NOT NULL = + REFERENCES rhnPackage (id) + ON DELETE CASCADE, + solaris_release VARCHAR2(64), + sunos_release VARCHAR2(64), + patch_type NUMBER NOT NULL CONSTRAINT rhn_solaris_p_pt_fk - REFERENCES rhnSolarisPatchType (id) = - ON DELETE SET NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = - DEFAULT (sysdate) NOT NULL, = - readme BLOB NOT NULL, = + REFERENCES rhnSolarisPatchType (id) + ON DELETE SET NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE + DEFAULT (sysdate) NOT NULL, + readme BLOB NOT NULL, patchinfo VARCHAR2(4000) ) TABLESPACE [[8m_data_tbs]] diff --git a/schema/spacewalk/common/tables/rhnSolarisPatchPackages.sql b/s= chema/spacewalk/common/tables/rhnSolarisPatchPackages.sql index 1a55c4a..2d45684 100644 --- a/schema/spacewalk/common/tables/rhnSolarisPatchPackages.sql +++ b/schema/spacewalk/common/tables/rhnSolarisPatchPackages.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSolarisPatchPackages ( - patch_id NUMBER NOT NULL = + patch_id NUMBER NOT NULL CONSTRAINT rhn_solaris_pp_fk - REFERENCES rhnPackage (id) = - ON DELETE CASCADE, = - package_nevra_id NUMBER NOT NULL = + REFERENCES rhnPackage (id) + ON DELETE CASCADE, + package_nevra_id NUMBER NOT NULL CONSTRAINT rhn_solaris_pnid_fk - REFERENCES rhnPackageNEVRA (id) = + REFERENCES rhnPackageNEVRA (id) ON DELETE CASCADE ) TABLESPACE [[8m_data_tbs]] diff --git a/schema/spacewalk/common/tables/rhnSolarisPatchSet.sql b/schema= /spacewalk/common/tables/rhnSolarisPatchSet.sql index 3038d36..fd02013 100644 --- a/schema/spacewalk/common/tables/rhnSolarisPatchSet.sql +++ b/schema/spacewalk/common/tables/rhnSolarisPatchSet.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSolarisPatchSet ( - package_id NUMBER = - CONSTRAINT rhn_solaris_ps_pid_pk PRIMARY KEY = + package_id NUMBER + CONSTRAINT rhn_solaris_ps_pid_pk PRIMARY KEY CONSTRAINT rhn_solaris_ps_pid_fk - REFERENCES rhnPackage (id) = - ON DELETE CASCADE, = - readme BLOB, = - set_date DATE = - DEFAULT (sysdate) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnPackage (id) + ON DELETE CASCADE, + readme BLOB, + set_date DATE + DEFAULT (sysdate) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) TABLESPACE [[8m_data_tbs]] diff --git a/schema/spacewalk/common/tables/rhnSolarisPatchSetMembers.sql b= /schema/spacewalk/common/tables/rhnSolarisPatchSetMembers.sql index 3a34ef0..3f30e0d 100644 --- a/schema/spacewalk/common/tables/rhnSolarisPatchSetMembers.sql +++ b/schema/spacewalk/common/tables/rhnSolarisPatchSetMembers.sql @@ -7,27 +7,27 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSolarisPatchSetMembers ( - patch_id NUMBER NOT NULL = + patch_id NUMBER NOT NULL CONSTRAINT rhn_solaris_psm_pid_fk - REFERENCES rhnPackage (id) = - ON DELETE CASCADE, = - patch_set_id NUMBER NOT NULL = + REFERENCES rhnPackage (id) + ON DELETE CASCADE, + patch_set_id NUMBER NOT NULL CONSTRAINT rhn_solaris_psm_psid_fk - REFERENCES rhnPackage (id) = - ON DELETE CASCADE, = - patch_order NUMBER, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnPackage (id) + ON DELETE CASCADE, + patch_order NUMBER, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) TABLESPACE [[8m_data_tbs]] diff --git a/schema/spacewalk/common/tables/rhnSolarisPatchType.sql b/schem= a/spacewalk/common/tables/rhnSolarisPatchType.sql index 11ae658..8083ddd 100644 --- a/schema/spacewalk/common/tables/rhnSolarisPatchType.sql +++ b/schema/spacewalk/common/tables/rhnSolarisPatchType.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSolarisPatchType ( - id NUMBER = - CONSTRAINT rhn_solaris_pt_pk PRIMARY KEY, = - name VARCHAR2(32) NOT NULL, = + id NUMBER + CONSTRAINT rhn_solaris_pt_pk PRIMARY KEY, + name VARCHAR2(32) NOT NULL, label VARCHAR2(32) NOT NULL ) TABLESPACE [[8m_data_tbs]] diff --git a/schema/spacewalk/common/tables/rhnSolarisPatchedPackage.sql b/= schema/spacewalk/common/tables/rhnSolarisPatchedPackage.sql index 5b2435a..71f6506 100644 --- a/schema/spacewalk/common/tables/rhnSolarisPatchedPackage.sql +++ b/schema/spacewalk/common/tables/rhnSolarisPatchedPackage.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSolarisPatchedPackage ( - server_id NUMBER NOT NULL = + server_id NUMBER NOT NULL CONSTRAINT rhn_solaris_patchedp_sid_fk - REFERENCES rhnServer (id) = - ON DELETE CASCADE, = - patch_id NUMBER NOT NULL = + REFERENCES rhnServer (id) + ON DELETE CASCADE, + patch_id NUMBER NOT NULL CONSTRAINT rhn_solaris_patchedp_pid_fk - REFERENCES rhnPackage (id) = - ON DELETE CASCADE, = - package_nevra_id NUMBER NOT NULL = + REFERENCES rhnPackage (id) + ON DELETE CASCADE, + package_nevra_id NUMBER NOT NULL CONSTRAINT rhn_solaris_patchedp_pnid_fk - REFERENCES rhnPackageNEVRA (id) = + REFERENCES rhnPackageNEVRA (id) ON DELETE CASCADE ) TABLESPACE [[8m_data_tbs]] diff --git a/schema/spacewalk/common/tables/rhnSourceRPM.sql b/schema/space= walk/common/tables/rhnSourceRPM.sql index 1d1fbfb..5a90f34 100644 --- a/schema/spacewalk/common/tables/rhnSourceRPM.sql +++ b/schema/spacewalk/common/tables/rhnSourceRPM.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSourceRPM ( - id NUMBER NOT NULL = - CONSTRAINT rhn_sourceRPM_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = + id NUMBER NOT NULL + CONSTRAINT rhn_sourceRPM_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], name VARCHAR2(256) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnSsmOperation.sql b/schema/sp= acewalk/common/tables/rhnSsmOperation.sql index 8d1318b..1941e1e 100644 --- a/schema/spacewalk/common/tables/rhnSsmOperation.sql +++ b/schema/spacewalk/common/tables/rhnSsmOperation.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSsmOperation ( - id NUMBER NOT NULL = - CONSTRAINT rhn_ssmop_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[4m_tbs]], = - user_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_ssmop_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[4m_tbs]], + user_id NUMBER NOT NULL CONSTRAINT rhn_ssmop_user_fk - REFERENCES web_contact (id) = - ON DELETE CASCADE, = - description VARCHAR2(256) NOT NULL, = - status VARCHAR2(32) NOT NULL, = - started DATE NOT NULL, = - modified DATE = + REFERENCES web_contact (id) + ON DELETE CASCADE, + description VARCHAR2(256) NOT NULL, + status VARCHAR2(32) NOT NULL, + started DATE NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ; diff --git a/schema/spacewalk/common/tables/rhnSsmOperationServer.sql b/sch= ema/spacewalk/common/tables/rhnSsmOperationServer.sql index cc32204..a969c59 100644 --- a/schema/spacewalk/common/tables/rhnSsmOperationServer.sql +++ b/schema/spacewalk/common/tables/rhnSsmOperationServer.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnSsmOperationServer ( - operation_id NUMBER = + operation_id NUMBER CONSTRAINT rhn_ssmops_ssmop_fk - REFERENCES rhnSsmOperation (id) = - ON DELETE CASCADE, = - server_id NUMBER = + REFERENCES rhnSsmOperation (id) + ON DELETE CASCADE, + server_id NUMBER CONSTRAINT rhn_ssmops_ser_fk - REFERENCES rhnServer (id) = + REFERENCES rhnServer (id) ON DELETE CASCADE ) ; diff --git a/schema/spacewalk/common/tables/rhnSystemMigrations.sql b/schem= a/spacewalk/common/tables/rhnSystemMigrations.sql index 7fd2f90..b5c8d74 100644 --- a/schema/spacewalk/common/tables/rhnSystemMigrations.sql +++ b/schema/spacewalk/common/tables/rhnSystemMigrations.sql @@ -7,10 +7,10 @@ -- 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. = +-- in this software or its documentation. -- = = @@ -18,17 +18,17 @@ CREATE TABLE rhnSystemMigrations ( org_id_to NUMBER CONSTRAINT rhn_sys_mig_oidto_fk - REFERENCES web_customer (id) = - ON DELETE SET NULL, = + REFERENCES web_customer (id) + ON DELETE SET NULL, org_id_from NUMBER CONSTRAINT rhn_sys_mig_oidfrm_fk - REFERENCES web_customer (id) = - ON DELETE SET NULL, = - server_id NUMBER NOT NULL = + REFERENCES web_customer (id) + ON DELETE SET NULL, + server_id NUMBER NOT NULL CONSTRAINT rhn_sys_mig_sid_fk - REFERENCES rhnServer (id) = - ON DELETE CASCADE, = - migrated DATE = + REFERENCES rhnServer (id) + ON DELETE CASCADE, + migrated DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnTag.sql b/schema/spacewalk/c= ommon/tables/rhnTag.sql index 0642f23..a4e0856 100644 --- a/schema/spacewalk/common/tables/rhnTag.sql +++ b/schema/spacewalk/common/tables/rhnTag.sql @@ -7,27 +7,27 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnTag ( - id NUMBER NOT NULL = - CONSTRAINT rhn_tag_id_pk PRIMARY KEY, = - name_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_tag_id_pk PRIMARY KEY, + name_id NUMBER NOT NULL CONSTRAINT rhn_tag_nid_fk - REFERENCES rhnTagName (id), = - org_id NUMBER NOT NULL = + REFERENCES rhnTagName (id), + org_id NUMBER NOT NULL CONSTRAINT rhn_tag_oid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES web_customer (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnTagName.sql b/schema/spacewa= lk/common/tables/rhnTagName.sql index 2eb6fff..0d20cc4 100644 --- a/schema/spacewalk/common/tables/rhnTagName.sql +++ b/schema/spacewalk/common/tables/rhnTagName.sql @@ -7,21 +7,21 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnTagName ( - id NUMBER NOT NULL = - CONSTRAINT rhn_tn_id_pk PRIMARY KEY, = - name VARCHAR2(128) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_tn_id_pk PRIMARY KEY, + name VARCHAR2(128) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnTaskQueue.sql b/schema/space= walk/common/tables/rhnTaskQueue.sql index a9324ff..696bab2 100644 --- a/schema/spacewalk/common/tables/rhnTaskQueue.sql +++ b/schema/spacewalk/common/tables/rhnTaskQueue.sql @@ -7,24 +7,24 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnTaskQueue ( - org_id NUMBER NOT NULL = + org_id NUMBER NOT NULL CONSTRAINT rhn_task_queue_org_id_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - task_name VARCHAR2(64) NOT NULL, = - task_data NUMBER, = - priority NUMBER = - DEFAULT (0), = - earliest DATE = + REFERENCES web_customer (id) + ON DELETE CASCADE, + task_name VARCHAR2(64) NOT NULL, + task_data NUMBER, + priority NUMBER + DEFAULT (0), + earliest DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnTemplateCategory.sql b/schem= a/spacewalk/common/tables/rhnTemplateCategory.sql index fdc6fd9..ae79e8c 100644 --- a/schema/spacewalk/common/tables/rhnTemplateCategory.sql +++ b/schema/spacewalk/common/tables/rhnTemplateCategory.sql @@ -7,21 +7,21 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnTemplateCategory ( - id NUMBER NOT NULL, = - label VARCHAR2(64) NOT NULL, = - description VARCHAR2(512) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL, + label VARCHAR2(64) NOT NULL, + description VARCHAR2(512) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnTemplateString.sql b/schema/= spacewalk/common/tables/rhnTemplateString.sql index 91803cc..a7f3105 100644 --- a/schema/spacewalk/common/tables/rhnTemplateString.sql +++ b/schema/spacewalk/common/tables/rhnTemplateString.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnTemplateString ( - id NUMBER NOT NULL, = - category_id NUMBER NOT NULL = + id NUMBER NOT NULL, + category_id NUMBER NOT NULL CONSTRAINT rhn_template_str_cid_fk - REFERENCES rhnTemplateCategory (id), = - label VARCHAR2(64) NOT NULL, = - value VARCHAR2(4000), = - description VARCHAR2(512) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnTemplateCategory (id), + label VARCHAR2(64) NOT NULL, + value VARCHAR2(4000), + description VARCHAR2(512) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnTextMessage.sql b/schema/spa= cewalk/common/tables/rhnTextMessage.sql index 9635b21..5a2537b 100644 --- a/schema/spacewalk/common/tables/rhnTextMessage.sql +++ b/schema/spacewalk/common/tables/rhnTextMessage.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnTextMessage ( - message_id NUMBER NOT NULL = + message_id NUMBER NOT NULL CONSTRAINT rhn_tm_message_id_fk - REFERENCES rhnMessage (id) = - ON DELETE CASCADE, = - message_body VARCHAR2(4000) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnMessage (id) + ON DELETE CASCADE, + message_body VARCHAR2(4000) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnTimezone.sql b/schema/spacew= alk/common/tables/rhnTimezone.sql index 495889b..378e83a 100644 --- a/schema/spacewalk/common/tables/rhnTimezone.sql +++ b/schema/spacewalk/common/tables/rhnTimezone.sql @@ -7,17 +7,17 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnTimezone ( - id NUMBER NOT NULL, = - olson_name VARCHAR2(128) NOT NULL, = + id NUMBER NOT NULL, + olson_name VARCHAR2(128) NOT NULL, display_name VARCHAR2(128) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnTinyURL.sql b/schema/spacewa= lk/common/tables/rhnTinyURL.sql index be0d71d..c79ff52 100644 --- a/schema/spacewalk/common/tables/rhnTinyURL.sql +++ b/schema/spacewalk/common/tables/rhnTinyURL.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnTinyURL ( - token VARCHAR2(64) NOT NULL, = - url VARCHAR2(512) NOT NULL, = - enabled VARCHAR2(1) NOT NULL = + token VARCHAR2(64) NOT NULL, + url VARCHAR2(512) NOT NULL, + enabled VARCHAR2(1) NOT NULL CONSTRAINT rhn_tu_enabled_ck - CHECK (enabled in ( 'Y' , 'N' )), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - expires DATE = + CHECK (enabled in ( 'Y' , 'N' )), + created DATE + DEFAULT (sysdate) NOT NULL, + expires DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnTransaction.sql b/schema/spa= cewalk/common/tables/rhnTransaction.sql index 4759cc8..cf5d23f 100644 --- a/schema/spacewalk/common/tables/rhnTransaction.sql +++ b/schema/spacewalk/common/tables/rhnTransaction.sql @@ -7,27 +7,27 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnTransaction ( - id NUMBER NOT NULL, = - server_id NUMBER NOT NULL = + id NUMBER NOT NULL, + server_id NUMBER NOT NULL CONSTRAINT rhn_trans_sid_fk - REFERENCES rhnServer (id), = - timestamp DATE NOT NULL, = - rpm_trans_id NUMBER NOT NULL, = - label VARCHAR2(32), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = - DEFAULT (sysdate) NOT NULL, = - CONSTRAINT rhn_trans_sid_rti_unq UNIQUE (server_id, rpm_trans_id) = + REFERENCES rhnServer (id), + timestamp DATE NOT NULL, + rpm_trans_id NUMBER NOT NULL, + label VARCHAR2(32), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE + DEFAULT (sysdate) NOT NULL, + CONSTRAINT rhn_trans_sid_rti_unq UNIQUE (server_id, rpm_trans_id) USING INDEX TABLESPACE [[8m_tbs]] ) ENABLE ROW MOVEMENT @@ -39,6 +39,6 @@ CREATE INDEX rhn_trans_id_sid_ts_rtid_idx CREATE SEQUENCE rhn_transaction_id_seq; = ALTER TABLE rhnTransaction - ADD CONSTRAINT rhn_trans_id_pk PRIMARY KEY (id) = + ADD CONSTRAINT rhn_trans_id_pk PRIMARY KEY (id) USING INDEX TABLESPACE [[8m_tbs]]; = diff --git a/schema/spacewalk/common/tables/rhnTransactionElement.sql b/sch= ema/spacewalk/common/tables/rhnTransactionElement.sql index 1f1cdeb..3fd09b8 100644 --- a/schema/spacewalk/common/tables/rhnTransactionElement.sql +++ b/schema/spacewalk/common/tables/rhnTransactionElement.sql @@ -7,20 +7,20 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnTransactionElement ( - transaction_id NUMBER NOT NULL = + transaction_id NUMBER NOT NULL CONSTRAINT rhn_transelem_tid_fk - REFERENCES rhnTransaction (id) = - ON DELETE CASCADE, = - transaction_package_id NUMBER NOT NULL = + REFERENCES rhnTransaction (id) + ON DELETE CASCADE, + transaction_package_id NUMBER NOT NULL CONSTRAINT rhn_transelem_tpid_fk REFERENCES rhnTransactionPackage (id) ) diff --git a/schema/spacewalk/common/tables/rhnTransactionOperation.sql b/s= chema/spacewalk/common/tables/rhnTransactionOperation.sql index 9d862ea..18d914a 100644 --- a/schema/spacewalk/common/tables/rhnTransactionOperation.sql +++ b/schema/spacewalk/common/tables/rhnTransactionOperation.sql @@ -7,24 +7,24 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnTransactionOperation ( - id NUMBER NOT NULL = - CONSTRAINT rhn_transop_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[8m_tbs]], = - label VARCHAR2(32) NOT NULL = - CONSTRAINT rhn_transop_label_uq UNIQUE = - USING INDEX TABLESPACE [[8m_tbs]], = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_transop_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[8m_tbs]], + label VARCHAR2(32) NOT NULL + CONSTRAINT rhn_transop_label_uq UNIQUE + USING INDEX TABLESPACE [[8m_tbs]], + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnTransactionPackage.sql b/sch= ema/spacewalk/common/tables/rhnTransactionPackage.sql index fd45074..f664631 100644 --- a/schema/spacewalk/common/tables/rhnTransactionPackage.sql +++ b/schema/spacewalk/common/tables/rhnTransactionPackage.sql @@ -7,28 +7,28 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnTransactionPackage ( - id NUMBER NOT NULL = - CONSTRAINT rhn_transpack_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[8m_tbs]], = - operation NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_transpack_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[8m_tbs]], + operation NUMBER NOT NULL CONSTRAINT rhn_transpack_op_fk - REFERENCES rhnTransactionOperation (id), = - name_id NUMBER NOT NULL = + REFERENCES rhnTransactionOperation (id), + name_id NUMBER NOT NULL CONSTRAINT rhn_transpack_nid_fk - REFERENCES rhnPackageName (id), = - evr_id NUMBER NOT NULL = + REFERENCES rhnPackageName (id), + evr_id NUMBER NOT NULL CONSTRAINT rhn_transpack_eid_fk - REFERENCES rhnPackageEVR (id), = - package_arch_id NUMBER = + REFERENCES rhnPackageEVR (id), + package_arch_id NUMBER CONSTRAINT rhn_transpack_paid_fk REFERENCES rhnPackageArch (id) ) diff --git a/schema/spacewalk/common/tables/rhnTrustedOrgs.sql b/schema/spa= cewalk/common/tables/rhnTrustedOrgs.sql index f4b791d..2686217 100644 --- a/schema/spacewalk/common/tables/rhnTrustedOrgs.sql +++ b/schema/spacewalk/common/tables/rhnTrustedOrgs.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnTrustedOrgs ( - org_id NUMBER NOT NULL = + org_id NUMBER NOT NULL CONSTRAINT rhn_trusted_orgs_oid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - org_trust_id NUMBER NOT NULL = + REFERENCES web_customer (id) + ON DELETE CASCADE, + org_trust_id NUMBER NOT NULL CONSTRAINT rhn_trusted_orgs_otid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES web_customer (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnUserDefaultSystemGroups.sql = b/schema/spacewalk/common/tables/rhnUserDefaultSystemGroups.sql index 384ad57..7f73e2e 100644 --- a/schema/spacewalk/common/tables/rhnUserDefaultSystemGroups.sql +++ b/schema/spacewalk/common/tables/rhnUserDefaultSystemGroups.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnUserDefaultSystemGroups ( - user_id NUMBER NOT NULL = + user_id NUMBER NOT NULL CONSTRAINT rhn_udsg_uid_fk - REFERENCES web_contact (id) = - ON DELETE CASCADE, = - system_group_id NUMBER NOT NULL = + REFERENCES web_contact (id) + ON DELETE CASCADE, + system_group_id NUMBER NOT NULL CONSTRAINT rhn_udsg_cidffk - REFERENCES rhnServerGroup (id) = + REFERENCES rhnServerGroup (id) ON DELETE CASCADE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnUserGroup.sql b/schema/space= walk/common/tables/rhnUserGroup.sql index 6fddd34..fc8c508 100644 --- a/schema/spacewalk/common/tables/rhnUserGroup.sql +++ b/schema/spacewalk/common/tables/rhnUserGroup.sql @@ -7,34 +7,34 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnUserGroup ( - id NUMBER NOT NULL = - CONSTRAINT rhn_user_group_pk PRIMARY KEY = - USING INDEX TABLESPACE [[8m_tbs]], = - name VARCHAR2(64) NOT NULL, = - description VARCHAR2(1024) NOT NULL, = - max_members NUMBER, = - current_members NUMBER = - DEFAULT (0) NOT NULL, = - group_type NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT rhn_user_group_pk PRIMARY KEY + USING INDEX TABLESPACE [[8m_tbs]], + name VARCHAR2(64) NOT NULL, + description VARCHAR2(1024) NOT NULL, + max_members NUMBER, + current_members NUMBER + DEFAULT (0) NOT NULL, + group_type NUMBER NOT NULL CONSTRAINT rhn_usergroup_type_fk - REFERENCES rhnUserGroupType (id), = - org_id NUMBER NOT NULL = + REFERENCES rhnUserGroupType (id), + org_id NUMBER NOT NULL CONSTRAINT rhn_user_group_org_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = - DEFAULT (sysdate) NOT NULL, = + REFERENCES web_customer (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE + DEFAULT (sysdate) NOT NULL, CONSTRAINT rhn_ug_oid_gt_uq UNIQUE (org_id, group_type) ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnUserGroupMembers.sql b/schem= a/spacewalk/common/tables/rhnUserGroupMembers.sql index e16cb51..2cb2687 100644 --- a/schema/spacewalk/common/tables/rhnUserGroupMembers.sql +++ b/schema/spacewalk/common/tables/rhnUserGroupMembers.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnUserGroupMembers ( - user_id NUMBER NOT NULL = + user_id NUMBER NOT NULL CONSTRAINT rhn_ugmembers_uid_fk - REFERENCES web_contact (id) = - ON DELETE CASCADE, = - user_group_id NUMBER NOT NULL = + REFERENCES web_contact (id) + ON DELETE CASCADE, + user_group_id NUMBER NOT NULL CONSTRAINT rhn_ugmembers_ugid_fk - REFERENCES rhnUserGroup (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnUserGroup (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnUserGroupType.sql b/schema/s= pacewalk/common/tables/rhnUserGroupType.sql index e3389ed..a9c5910 100644 --- a/schema/spacewalk/common/tables/rhnUserGroupType.sql +++ b/schema/spacewalk/common/tables/rhnUserGroupType.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnUserGroupType ( - id NUMBER NOT NULL = - CONSTRAINT rhn_userGroupType_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - label VARCHAR2(64) NOT NULL, = - name VARCHAR2(64) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_userGroupType_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + label VARCHAR2(64) NOT NULL, + name VARCHAR2(64) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnUserGroup_sequences.sql b/sc= hema/spacewalk/common/tables/rhnUserGroup_sequences.sql index 4bc47b4..36f08e5 100644 --- a/schema/spacewalk/common/tables/rhnUserGroup_sequences.sql +++ b/schema/spacewalk/common/tables/rhnUserGroup_sequences.sql @@ -7,10 +7,10 @@ -- 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. = +-- in this software or its documentation. -- = = diff --git a/schema/spacewalk/common/tables/rhnUserInfo.sql b/schema/spacew= alk/common/tables/rhnUserInfo.sql index 29819d7..d31dfd5 100644 --- a/schema/spacewalk/common/tables/rhnUserInfo.sql +++ b/schema/spacewalk/common/tables/rhnUserInfo.sql @@ -7,62 +7,62 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnUserInfo ( - user_id NUMBER NOT NULL = + user_id NUMBER NOT NULL CONSTRAINT rhn_user_info_user_fk - REFERENCES web_contact (id) = - ON DELETE CASCADE, = - no_clear_sets NUMBER = - DEFAULT (0) NOT NULL, = - page_size NUMBER = - DEFAULT (20) NOT NULL, = - email_notify NUMBER = - DEFAULT (1) NOT NULL, = - bad_email NUMBER = - DEFAULT (0) NOT NULL, = - tz_offset NUMBER = - DEFAULT (-5) NOT NULL = + REFERENCES web_contact (id) + ON DELETE CASCADE, + no_clear_sets NUMBER + DEFAULT (0) NOT NULL, + page_size NUMBER + DEFAULT (20) NOT NULL, + email_notify NUMBER + DEFAULT (1) NOT NULL, + bad_email NUMBER + DEFAULT (0) NOT NULL, + tz_offset NUMBER + DEFAULT (-5) NOT NULL CONSTRAINT rhn_user_info_tzoffset_ck - CHECK (tz_offset >=3D -11 and tz_offse= t <=3D 13), = - timezone_id NUMBER = + CHECK (tz_offset >=3D -11 and tz_offse= t <=3D 13), + timezone_id NUMBER CONSTRAINT rhn_user_info_tzid_fk - REFERENCES rhnTimezone (id) = - ON DELETE CASCADE, = - show_applied_errata CHAR(1) = - DEFAULT ('N') NOT NULL = + REFERENCES rhnTimezone (id) + ON DELETE CASCADE, + show_applied_errata CHAR(1) + DEFAULT ('N') NOT NULL CONSTRAINT rhn_user_info_sea_ck - CHECK (show_applied_errata in ( 'Y' , = 'N' )), = - show_system_group_list CHAR(1) = - DEFAULT ('N') NOT NULL = + CHECK (show_applied_errata in ( 'Y' , = 'N' )), + show_system_group_list CHAR(1) + DEFAULT ('N') NOT NULL CONSTRAINT rhn_user_info_ssgl_ck - CHECK (show_system_group_list in ( 'Y'= , 'N' )), = - agreed_to_terms CHAR(1) = - DEFAULT ('N') NOT NULL = + CHECK (show_system_group_list in ( 'Y'= , 'N' )), + agreed_to_terms CHAR(1) + DEFAULT ('N') NOT NULL CONSTRAINT rhn_user_info_agreed_ck - CHECK (agreed_to_terms in ( 'Y' , 'N' = )), = - use_pam_authentication CHAR(1) = - DEFAULT ('N') NOT NULL = + CHECK (agreed_to_terms in ( 'Y' , 'N' = )), + use_pam_authentication CHAR(1) + DEFAULT ('N') NOT NULL CONSTRAINT rhn_user_info_pam_ck - CHECK (use_pam_authentication in ( 'Y'= , 'N' )), = - last_logged_in DATE, = - agreed_to_ws_terms CHAR(1) = + CHECK (use_pam_authentication in ( 'Y'= , 'N' )), + last_logged_in DATE, + agreed_to_ws_terms CHAR(1) CONSTRAINT rhn_user_info_ws_ck - CHECK (agreed_to_ws_terms is null or a= greed_to_ws_terms in ( 'Y' , 'N' )), = - agreed_to_es_terms CHAR(1) = + CHECK (agreed_to_ws_terms is null or a= greed_to_ws_terms in ( 'Y' , 'N' )), + agreed_to_es_terms CHAR(1) CONSTRAINT rhn_user_info_es_ck - CHECK (agreed_to_es_terms is null or a= greed_to_es_terms in ( 'Y' , 'N' )), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = - DEFAULT (sysdate) NOT NULL, = + CHECK (agreed_to_es_terms is null or a= greed_to_es_terms in ( 'Y' , 'N' )), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE + DEFAULT (sysdate) NOT NULL, preferred_locale VARCHAR2(8) ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnUserInfoPane.sql b/schema/sp= acewalk/common/tables/rhnUserInfoPane.sql index ce7e434..171bab7 100644 --- a/schema/spacewalk/common/tables/rhnUserInfoPane.sql +++ b/schema/spacewalk/common/tables/rhnUserInfoPane.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnUserInfoPane ( - user_id NUMBER NOT NULL = + user_id NUMBER NOT NULL CONSTRAINT rhn_usr_info_pane_uid_fk - REFERENCES web_contact (id) = - ON DELETE CASCADE, = - pane_id NUMBER NOT NULL = + REFERENCES web_contact (id) + ON DELETE CASCADE, + pane_id NUMBER NOT NULL CONSTRAINT rhn_usr_info_pane_pid_fk - REFERENCES rhnInfoPane (id) = + REFERENCES rhnInfoPane (id) ON DELETE CASCADE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnUserMessage.sql b/schema/spa= cewalk/common/tables/rhnUserMessage.sql index c26d2d3..871f619 100644 --- a/schema/spacewalk/common/tables/rhnUserMessage.sql +++ b/schema/spacewalk/common/tables/rhnUserMessage.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnUserMessage ( - user_id NUMBER NOT NULL = + user_id NUMBER NOT NULL CONSTRAINT rhn_um_user_id_fk - REFERENCES web_contact (id), = - message_id NUMBER NOT NULL = + REFERENCES web_contact (id), + message_id NUMBER NOT NULL CONSTRAINT rhn_um_message_id_fk - REFERENCES rhnMessage (id) = - ON DELETE CASCADE, = - status NUMBER NOT NULL = + REFERENCES rhnMessage (id) + ON DELETE CASCADE, + status NUMBER NOT NULL CONSTRAINT rhn_um_status_fk REFERENCES rhnUserMessageStatus (id) ) diff --git a/schema/spacewalk/common/tables/rhnUserMessageStatus.sql b/sche= ma/spacewalk/common/tables/rhnUserMessageStatus.sql index 5839276..866298e 100644 --- a/schema/spacewalk/common/tables/rhnUserMessageStatus.sql +++ b/schema/spacewalk/common/tables/rhnUserMessageStatus.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnUserMessageStatus ( - id NUMBER NOT NULL = - CONSTRAINT rhn_um_status_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = + id NUMBER NOT NULL + CONSTRAINT rhn_um_status_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], label VARCHAR2(48) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnUserMessageType.sql b/schema= /spacewalk/common/tables/rhnUserMessageType.sql index efbc5de..a6ed633 100644 --- a/schema/spacewalk/common/tables/rhnUserMessageType.sql +++ b/schema/spacewalk/common/tables/rhnUserMessageType.sql @@ -7,19 +7,19 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnUserMessageType ( - id NUMBER NOT NULL = - CONSTRAINT rhn_um_type_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - label VARCHAR2(48) NOT NULL, = + id NUMBER NOT NULL + CONSTRAINT rhn_um_type_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + label VARCHAR2(48) NOT NULL, name VARCHAR2(96) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnUserReserved.sql b/schema/sp= acewalk/common/tables/rhnUserReserved.sql index 3409369..821fa7c 100644 --- a/schema/spacewalk/common/tables/rhnUserReserved.sql +++ b/schema/spacewalk/common/tables/rhnUserReserved.sql @@ -7,21 +7,21 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnUserReserved ( - login VARCHAR2(64) NOT NULL, = - login_uc VARCHAR2(64) NOT NULL, = - password VARCHAR2(38) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + login VARCHAR2(64) NOT NULL, + login_uc VARCHAR2(64) NOT NULL, + password VARCHAR2(38) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnUserServerGroupPerms.sql b/s= chema/spacewalk/common/tables/rhnUserServerGroupPerms.sql index 62fe653..3e350b0 100644 --- a/schema/spacewalk/common/tables/rhnUserServerGroupPerms.sql +++ b/schema/spacewalk/common/tables/rhnUserServerGroupPerms.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnUserServerGroupPerms ( - user_id NUMBER NOT NULL = + user_id NUMBER NOT NULL CONSTRAINT rhn_usgp_user_fk - REFERENCES web_contact (id) = - ON DELETE CASCADE, = - server_group_id NUMBER NOT NULL = + REFERENCES web_contact (id) + ON DELETE CASCADE, + server_group_id NUMBER NOT NULL CONSTRAINT rhn_usgp_server_fk - REFERENCES rhnServerGroup (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnServerGroup (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnUserServerPerms.sql b/schema= /spacewalk/common/tables/rhnUserServerPerms.sql index 3e1756b..fb1528c 100644 --- a/schema/spacewalk/common/tables/rhnUserServerPerms.sql +++ b/schema/spacewalk/common/tables/rhnUserServerPerms.sql @@ -7,19 +7,19 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnUserServerPerms ( - user_id NUMBER NOT NULL = + user_id NUMBER NOT NULL CONSTRAINT rhn_usperms_uid_fk - REFERENCES web_contact (id), = - server_id NUMBER NOT NULL = + REFERENCES web_contact (id), + server_id NUMBER NOT NULL CONSTRAINT rhn_usperms_sid_fk REFERENCES rhnServer (id) ) diff --git a/schema/spacewalk/common/tables/rhnUserServerPrefs.sql b/schema= /spacewalk/common/tables/rhnUserServerPrefs.sql index 25214cd..5a309d6 100644 --- a/schema/spacewalk/common/tables/rhnUserServerPrefs.sql +++ b/schema/spacewalk/common/tables/rhnUserServerPrefs.sql @@ -7,27 +7,27 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnUserServerPrefs ( - user_id NUMBER NOT NULL = + user_id NUMBER NOT NULL CONSTRAINT rhn_userServerPrefs_uid_fk - REFERENCES web_contact (id) = - ON DELETE CASCADE, = - server_id NUMBER NOT NULL = + REFERENCES web_contact (id) + ON DELETE CASCADE, + server_id NUMBER NOT NULL CONSTRAINT rhn_userServerPrefs_sid_fk - REFERENCES rhnServer (id), = - name VARCHAR2(64) NOT NULL, = - value VARCHAR2(1) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnServer (id), + name VARCHAR2(64) NOT NULL, + value VARCHAR2(1) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnVersionInfo.sql b/schema/spa= cewalk/common/tables/rhnVersionInfo.sql index 3b5f796..b15a864 100644 --- a/schema/spacewalk/common/tables/rhnVersionInfo.sql +++ b/schema/spacewalk/common/tables/rhnVersionInfo.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnVersionInfo ( - label VARCHAR2(64) NOT NULL, = - name_id NUMBER NOT NULL = + label VARCHAR2(64) NOT NULL, + name_id NUMBER NOT NULL CONSTRAINT rhn_versioninfo_nid_fk - REFERENCES rhnPackageName (id), = - evr_id NUMBER NOT NULL = + REFERENCES rhnPackageName (id), + evr_id NUMBER NOT NULL CONSTRAINT rhn_versioninfo_eid_fk - REFERENCES rhnPackageEVR (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnPackageEVR (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnVirtSubLevel.sql b/schema/sp= acewalk/common/tables/rhnVirtSubLevel.sql index a6592a7..380edab 100644 --- a/schema/spacewalk/common/tables/rhnVirtSubLevel.sql +++ b/schema/spacewalk/common/tables/rhnVirtSubLevel.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnVirtSubLevel ( - id NUMBER = - CONSTRAINT rhn_vsl_id_pk PRIMARY KEY, = - label VARCHAR2(32) NOT NULL, = - name VARCHAR2(128) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER + CONSTRAINT rhn_vsl_id_pk PRIMARY KEY, + label VARCHAR2(32) NOT NULL, + name VARCHAR2(128) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnVirtualInstance.sql b/schema= /spacewalk/common/tables/rhnVirtualInstance.sql index 3dc71da..02bea28 100644 --- a/schema/spacewalk/common/tables/rhnVirtualInstance.sql +++ b/schema/spacewalk/common/tables/rhnVirtualInstance.sql @@ -7,30 +7,30 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnVirtualInstance ( - id NUMBER NOT NULL = - CONSTRAINT rhn_vi_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - host_system_id NUMBER = + id NUMBER NOT NULL + CONSTRAINT rhn_vi_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + host_system_id NUMBER CONSTRAINT rhn_vi_hsi_fk - REFERENCES rhnServer (id), = - virtual_system_id NUMBER = + REFERENCES rhnServer (id), + virtual_system_id NUMBER CONSTRAINT rhn_vi_vsi_fk - REFERENCES rhnServer (id), = - uuid VARCHAR2(128), = - confirmed NUMBER = - DEFAULT (1) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnServer (id), + uuid VARCHAR2(128), + confirmed NUMBER + DEFAULT (1) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnVirtualInstanceEventLog.sql = b/schema/spacewalk/common/tables/rhnVirtualInstanceEventLog.sql index c3371b8..190b6ab 100644 --- a/schema/spacewalk/common/tables/rhnVirtualInstanceEventLog.sql +++ b/schema/spacewalk/common/tables/rhnVirtualInstanceEventLog.sql @@ -7,44 +7,44 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnVirtualInstanceEventLog ( - id NUMBER NOT NULL = - CONSTRAINT rhn_viel_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - virtual_instance_id NUMBER = + id NUMBER NOT NULL + CONSTRAINT rhn_viel_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + virtual_instance_id NUMBER CONSTRAINT rhn_viel_vii_fk - REFERENCES rhnVirtualInstance (id) = - ON DELETE CASCADE, = - event_type NUMBER NOT NULL = + REFERENCES rhnVirtualInstance (id) + ON DELETE CASCADE, + event_type NUMBER NOT NULL CONSTRAINT rhn_viel_et_fk - REFERENCES rhnVirtualInstanceEventType (= id), = - event_metadata VARCHAR2(4000), = - old_state NUMBER NOT NULL = + REFERENCES rhnVirtualInstanceEventType (= id), + event_metadata VARCHAR2(4000), + old_state NUMBER NOT NULL CONSTRAINT rhn_viel_old_state_fk - REFERENCES rhnVirtualInstanceState (id), = - new_state NUMBER NOT NULL = + REFERENCES rhnVirtualInstanceState (id), + new_state NUMBER NOT NULL CONSTRAINT rhn_viel_new_state_fk - REFERENCES rhnVirtualInstanceState (id), = - old_memory_size_k NUMBER, = - new_memory_size_k NUMBER, = - old_vcpus NUMBER, = - new_vcpus NUMBER, = - old_host_system_id NUMBER, = - new_host_system_id NUMBER, = - old_host_system_name VARCHAR2(128), = - new_host_system_name VARCHAR2(128), = - local_timestamp DATE NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnVirtualInstanceState (id), + old_memory_size_k NUMBER, + new_memory_size_k NUMBER, + old_vcpus NUMBER, + new_vcpus NUMBER, + old_host_system_id NUMBER, + new_host_system_id NUMBER, + old_host_system_name VARCHAR2(128), + new_host_system_name VARCHAR2(128), + local_timestamp DATE NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnVirtualInstanceEventType.sql= b/schema/spacewalk/common/tables/rhnVirtualInstanceEventType.sql index ec5905b..1693b8c 100644 --- a/schema/spacewalk/common/tables/rhnVirtualInstanceEventType.sql +++ b/schema/spacewalk/common/tables/rhnVirtualInstanceEventType.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnVirtualInstanceEventType ( - id NUMBER NOT NULL = - CONSTRAINT rhn_viet_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - name VARCHAR2(128) NOT NULL, = - label VARCHAR2(128) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_viet_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + name VARCHAR2(128) NOT NULL, + label VARCHAR2(128) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnVirtualInstanceInfo.sql b/sc= hema/spacewalk/common/tables/rhnVirtualInstanceInfo.sql index 233c6f9..532f4f7 100644 --- a/schema/spacewalk/common/tables/rhnVirtualInstanceInfo.sql +++ b/schema/spacewalk/common/tables/rhnVirtualInstanceInfo.sql @@ -7,31 +7,31 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnVirtualInstanceInfo ( - name VARCHAR2(128), = - instance_id NUMBER NOT NULL = + name VARCHAR2(128), + instance_id NUMBER NOT NULL CONSTRAINT rhn_vii_viid_fk - REFERENCES rhnVirtualInstance (id) = - ON DELETE CASCADE, = - instance_type NUMBER NOT NULL = + REFERENCES rhnVirtualInstance (id) + ON DELETE CASCADE, + instance_type NUMBER NOT NULL CONSTRAINT rhn_vii_it_fk - REFERENCES rhnVirtualInstanceType (id), = - memory_size_k NUMBER, = - vcpus NUMBER, = - state NUMBER NOT NULL = + REFERENCES rhnVirtualInstanceType (id), + memory_size_k NUMBER, + vcpus NUMBER, + state NUMBER NOT NULL CONSTRAINT rhn_vii_state_fk - REFERENCES rhnVirtualInstanceState (id), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnVirtualInstanceState (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnVirtualInstanceInstallLog.sq= l b/schema/spacewalk/common/tables/rhnVirtualInstanceInstallLog.sql index e38d973..590f251 100644 --- a/schema/spacewalk/common/tables/rhnVirtualInstanceInstallLog.sql +++ b/schema/spacewalk/common/tables/rhnVirtualInstanceInstallLog.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnVirtualInstanceInstallLog ( - id NUMBER NOT NULL = - CONSTRAINT rhn_viil_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - log_message VARCHAR2(4000) NOT NULL, = - ks_session_id NUMBER = + id NUMBER NOT NULL + CONSTRAINT rhn_viil_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + log_message VARCHAR2(4000) NOT NULL, + ks_session_id NUMBER CONSTRAINT rhn_viil_ks_sid_fk - REFERENCES rhnKickstartSession (id) = - ON DELETE CASCADE, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + REFERENCES rhnKickstartSession (id) + ON DELETE CASCADE, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnVirtualInstanceState.sql b/s= chema/spacewalk/common/tables/rhnVirtualInstanceState.sql index e8af738..f243b5d 100644 --- a/schema/spacewalk/common/tables/rhnVirtualInstanceState.sql +++ b/schema/spacewalk/common/tables/rhnVirtualInstanceState.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnVirtualInstanceState ( - id NUMBER NOT NULL = - CONSTRAINT rhn_vis_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - name VARCHAR2(128) NOT NULL, = - label VARCHAR2(128) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_vis_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + name VARCHAR2(128) NOT NULL, + label VARCHAR2(128) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnVirtualInstanceType.sql b/sc= hema/spacewalk/common/tables/rhnVirtualInstanceType.sql index 15400e3..8ed1a11 100644 --- a/schema/spacewalk/common/tables/rhnVirtualInstanceType.sql +++ b/schema/spacewalk/common/tables/rhnVirtualInstanceType.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnVirtualInstanceType ( - id NUMBER NOT NULL = - CONSTRAINT rhn_vit_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - name VARCHAR2(128) NOT NULL, = - label VARCHAR2(128) NOT NULL, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + id NUMBER NOT NULL + CONSTRAINT rhn_vit_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + name VARCHAR2(128) NOT NULL, + label VARCHAR2(128) NOT NULL, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnVisibleObjects.sql b/schema/= spacewalk/common/tables/rhnVisibleObjects.sql index a7e6509..5d7550f 100644 --- a/schema/spacewalk/common/tables/rhnVisibleObjects.sql +++ b/schema/spacewalk/common/tables/rhnVisibleObjects.sql @@ -7,20 +7,20 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnVisibleObjects ( - pxt_session_id NUMBER NOT NULL, = - object_id NUMBER NOT NULL, = - object_type VARCHAR2(40) NOT NULL, = + pxt_session_id NUMBER NOT NULL, + object_id NUMBER NOT NULL, + object_type VARCHAR2(40) NOT NULL, CONSTRAINT rhn_vis_objs_sess_fk FOREIGN KEY (pxt_session_id) - REFERENCES PXTSessions (id) = + REFERENCES PXTSessions (id) ON DELETE CASCADE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnWebContactChangeLog.sql b/sc= hema/spacewalk/common/tables/rhnWebContactChangeLog.sql index cd956a5..d49edd0 100644 --- a/schema/spacewalk/common/tables/rhnWebContactChangeLog.sql +++ b/schema/spacewalk/common/tables/rhnWebContactChangeLog.sql @@ -7,29 +7,29 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnWebContactChangeLog ( - id NUMBER = - CONSTRAINT rhn_wcon_cl_id_pk PRIMARY KEY, = - web_contact_id NUMBER NOT NULL = + id NUMBER + CONSTRAINT rhn_wcon_cl_id_pk PRIMARY KEY, + web_contact_id NUMBER NOT NULL CONSTRAINT rhn_wcon_cl_wcon_id_fk - REFERENCES web_contact (id) = - ON DELETE CASCADE, = - web_contact_from_id NUMBER = + REFERENCES web_contact (id) + ON DELETE CASCADE, + web_contact_from_id NUMBER CONSTRAINT rhn_wcon_cl_wcon_from_id_fk - REFERENCES web_contact (id) = - ON DELETE SET NULL, = - change_state_id NUMBER NOT NULL = + REFERENCES web_contact (id) + ON DELETE SET NULL, + change_state_id NUMBER NOT NULL CONSTRAINT rhn_wcon_cl_csid_fk - REFERENCES rhnWebContactChangeState (id), = - date_completed DATE = + REFERENCES rhnWebContactChangeState (id), + date_completed DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhnWebContactChangeState.sql b/= schema/spacewalk/common/tables/rhnWebContactChangeState.sql index 665e9d7..8e1d1c8 100644 --- a/schema/spacewalk/common/tables/rhnWebContactChangeState.sql +++ b/schema/spacewalk/common/tables/rhnWebContactChangeState.sql @@ -7,17 +7,17 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhnWebContactChangeState ( - id NUMBER = - CONSTRAINT rhn_cont_change_state_id_pk PRIMARY KEY, = + id NUMBER + CONSTRAINT rhn_cont_change_state_id_pk PRIMARY KEY, label VARCHAR2(32) NOT NULL ) TABLESPACE [[32m_tbs]] diff --git a/schema/spacewalk/common/tables/rhn_check_probe.sql b/schema/sp= acewalk/common/tables/rhn_check_probe.sql index 9035c35..4d0cdda 100644 --- a/schema/spacewalk/common/tables/rhn_check_probe.sql +++ b/schema/spacewalk/common/tables/rhn_check_probe.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_check_probe ( - probe_id NUMBER NOT NULL = - CONSTRAINT rhn_chkpb_probe_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[4m_tbs]], = - probe_type VARCHAR2(12) = - DEFAULT ('check') NOT NULL = + probe_id NUMBER NOT NULL + CONSTRAINT rhn_chkpb_probe_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[4m_tbs]], + probe_type VARCHAR2(12) + DEFAULT ('check') NOT NULL CONSTRAINT chkpb_probe_type_ck - CHECK (probe_type =3D 'check'), = - host_id NUMBER NOT NULL, = + CHECK (probe_type =3D 'check'), + host_id NUMBER NOT NULL, sat_cluster_id NUMBER NOT NULL ) ENABLE ROW MOVEMENT @@ -49,11 +49,11 @@ ALTER TABLE rhn_check_probe = ALTER TABLE rhn_check_probe ADD CONSTRAINT rhn_chkpb_recid_probe_typ_fk FOREIGN KEY (probe_id, pro= be_type) - REFERENCES rhn_probe (recid, probe_type) = + REFERENCES rhn_probe (recid, probe_type) ON DELETE CASCADE; = ALTER TABLE rhn_check_probe ADD CONSTRAINT rhn_chkpb_satcl_sat_cl_id_fk FOREIGN KEY (sat_cluster_i= d) - REFERENCES rhn_sat_cluster (recid) = + REFERENCES rhn_sat_cluster (recid) ON DELETE CASCADE; = diff --git a/schema/spacewalk/common/tables/rhn_check_suite_probe.sql b/sch= ema/spacewalk/common/tables/rhn_check_suite_probe.sql index 1946c24..0717883 100644 --- a/schema/spacewalk/common/tables/rhn_check_suite_probe.sql +++ b/schema/spacewalk/common/tables/rhn_check_suite_probe.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_check_suite_probe ( - probe_id NUMBER NOT NULL = - CONSTRAINT rhn_ckspb_probe_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[4m_tbs]], = - probe_type VARCHAR2(12) = - DEFAULT ('suite') NOT NULL = + probe_id NUMBER NOT NULL + CONSTRAINT rhn_ckspb_probe_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[4m_tbs]], + probe_type VARCHAR2(12) + DEFAULT ('suite') NOT NULL CONSTRAINT rhn_ckspb_probe_type_ck - CHECK (probe_type =3D 'suite'), = + CHECK (probe_type =3D 'suite'), check_suite_id NUMBER NOT NULL ) ENABLE ROW MOVEMENT @@ -36,6 +36,6 @@ CREATE INDEX rhn_ckspb_check_suite_id_idx = ALTER TABLE rhn_check_suite_probe ADD CONSTRAINT rhn_ckspb_cksut_ck_suite_id_fk FOREIGN KEY (check_suite= _id) - REFERENCES rhn_check_suites (recid) = + REFERENCES rhn_check_suites (recid) ON DELETE CASCADE; = diff --git a/schema/spacewalk/common/tables/rhn_check_suites.sql b/schema/s= pacewalk/common/tables/rhn_check_suites.sql index cc668ef..1ff0fc8 100644 --- a/schema/spacewalk/common/tables/rhn_check_suites.sql +++ b/schema/spacewalk/common/tables/rhn_check_suites.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_check_suites ( - recid NUMBER NOT NULL = - CONSTRAINT rhn_cksut_recid_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]], = - customer_id NUMBER NOT NULL, = - suite_name VARCHAR2(40) NOT NULL, = - description VARCHAR2(255), = - last_update_user VARCHAR2(40) NOT NULL, = + recid NUMBER NOT NULL + CONSTRAINT rhn_cksut_recid_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]], + customer_id NUMBER NOT NULL, + suite_name VARCHAR2(40) NOT NULL, + description VARCHAR2(255), + last_update_user VARCHAR2(40) NOT NULL, last_update_date DATE NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_command.sql b/schema/spacew= alk/common/tables/rhn_command.sql index 1b60a8f..2aa15cc 100644 --- a/schema/spacewalk/common/tables/rhn_command.sql +++ b/schema/spacewalk/common/tables/rhn_command.sql @@ -7,33 +7,33 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_command ( - recid NUMBER NOT NULL = - CONSTRAINT rhn_cmmnd_recid_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]], = - name VARCHAR2(40) NOT NULL, = - description VARCHAR2(80) NOT NULL, = - group_name VARCHAR2(40), = - allowed_in_suite CHAR(1) = - DEFAULT ('1') NOT NULL, = - command_class VARCHAR2(255) = - DEFAULT ('/var/lib/nocpulse/libexec/plugin') = NOT NULL, = - enabled CHAR(1) = - DEFAULT ('1') NOT NULL, = - for_host_probe CHAR(1) = - DEFAULT ('0') NOT NULL, = - last_update_user VARCHAR2(40), = - last_update_date DATE, = - system_requirements VARCHAR2(40), = - version_support VARCHAR2(1024), = + recid NUMBER NOT NULL + CONSTRAINT rhn_cmmnd_recid_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]], + name VARCHAR2(40) NOT NULL, + description VARCHAR2(80) NOT NULL, + group_name VARCHAR2(40), + allowed_in_suite CHAR(1) + DEFAULT ('1') NOT NULL, + command_class VARCHAR2(255) + DEFAULT ('/var/lib/nocpulse/libexec/plugin') = NOT NULL, + enabled CHAR(1) + DEFAULT ('1') NOT NULL, + for_host_probe CHAR(1) + DEFAULT ('0') NOT NULL, + last_update_user VARCHAR2(40), + last_update_date DATE, + system_requirements VARCHAR2(40), + version_support VARCHAR2(1024), help_url VARCHAR2(1024) ) ENABLE ROW MOVEMENT @@ -70,6 +70,6 @@ ALTER TABLE rhn_command = ALTER TABLE rhn_command ADD CONSTRAINT rhn_cmmnd_sys_reqs_fk FOREIGN KEY (system_requirements) - REFERENCES rhn_command_requirements (name) = + REFERENCES rhn_command_requirements (name) ON DELETE CASCADE; = diff --git a/schema/spacewalk/common/tables/rhn_command_center_state.sql b/= schema/spacewalk/common/tables/rhn_command_center_state.sql index 519075b..36c4677 100644 --- a/schema/spacewalk/common/tables/rhn_command_center_state.sql +++ b/schema/spacewalk/common/tables/rhn_command_center_state.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_command_center_state ( - cust_admin_access_allowed CHAR(1) NOT NULL, = - reason VARCHAR2(2000) NOT NULL, = - last_update_user VARCHAR2(40) NOT NULL, = + cust_admin_access_allowed CHAR(1) NOT NULL, + reason VARCHAR2(2000) NOT NULL, + last_update_user VARCHAR2(40) NOT NULL, last_update_date DATE NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_command_class.sql b/schema/= spacewalk/common/tables/rhn_command_class.sql index f0af621..0e2929d 100644 --- a/schema/spacewalk/common/tables/rhn_command_class.sql +++ b/schema/spacewalk/common/tables/rhn_command_class.sql @@ -7,17 +7,17 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_command_class ( - class_name VARCHAR2(40) NOT NULL = - CONSTRAINT rhn_comcl_class_name_pk PRIMARY KEY = + class_name VARCHAR2(40) NOT NULL + CONSTRAINT rhn_comcl_class_name_pk PRIMARY KEY USING INDEX TABLESPACE [[2m_tbs]] ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_command_groups.sql b/schema= /spacewalk/common/tables/rhn_command_groups.sql index 5921897..60a53de 100644 --- a/schema/spacewalk/common/tables/rhn_command_groups.sql +++ b/schema/spacewalk/common/tables/rhn_command_groups.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_command_groups ( - group_name VARCHAR2(10) NOT NULL = - CONSTRAINT rhn_cmdgr_group_name_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = + group_name VARCHAR2(10) NOT NULL + CONSTRAINT rhn_cmdgr_group_name_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], description VARCHAR2(80) ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_command_param_threshold.sql= b/schema/spacewalk/common/tables/rhn_command_param_threshold.sql index 354e616..1541133 100644 --- a/schema/spacewalk/common/tables/rhn_command_param_threshold.sql +++ b/schema/spacewalk/common/tables/rhn_command_param_threshold.sql @@ -7,24 +7,24 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_command_param_threshold ( - command_id NUMBER NOT NULL, = - param_name VARCHAR2(40) NOT NULL, = - param_type VARCHAR2(10) NOT NULL = + command_id NUMBER NOT NULL, + param_name VARCHAR2(40) NOT NULL, + param_type VARCHAR2(10) NOT NULL CONSTRAINT rhn_coptr_param_type_ck - CHECK (param_type =3D 'threshold'), = - threshold_type_name VARCHAR2(10) NOT NULL, = - threshold_metric_id VARCHAR2(40) NOT NULL, = - last_update_user VARCHAR2(40), = - last_update_date DATE, = + CHECK (param_type =3D 'threshold'), + threshold_type_name VARCHAR2(10) NOT NULL, + threshold_metric_id VARCHAR2(40) NOT NULL, + last_update_user VARCHAR2(40), + last_update_date DATE, command_class VARCHAR2(255) NOT NULL ) ENABLE ROW MOVEMENT @@ -41,12 +41,12 @@ ALTER TABLE rhn_command_param_threshold = ALTER TABLE rhn_command_param_threshold ADD CONSTRAINT rhn_coptr_cmd_id_cmd_cl_fk FOREIGN KEY (command_id, com= mand_class) - REFERENCES rhn_command (recid, command_class) = + REFERENCES rhn_command (recid, command_class) ON DELETE CASCADE; = ALTER TABLE rhn_command_param_threshold ADD CONSTRAINT rhn_coptr_m_thr_m_cmd_cl_fk FOREIGN KEY (command_class,= threshold_metric_id) - REFERENCES rhn_metrics (command_class, metric_id) = + REFERENCES rhn_metrics (command_class, metric_id) ON DELETE CASCADE; = ALTER TABLE rhn_command_param_threshold diff --git a/schema/spacewalk/common/tables/rhn_command_parameter.sql b/sch= ema/spacewalk/common/tables/rhn_command_parameter.sql index e953344..73872cd 100644 --- a/schema/spacewalk/common/tables/rhn_command_parameter.sql +++ b/schema/spacewalk/common/tables/rhn_command_parameter.sql @@ -7,35 +7,35 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_command_parameter ( - command_id NUMBER NOT NULL, = - param_name VARCHAR2(40) NOT NULL, = - param_type VARCHAR2(10) = - DEFAULT ('config') NOT NULL, = - data_type_name VARCHAR2(10) NOT NULL, = - description VARCHAR2(80) NOT NULL, = - mandatory CHAR(1) = - DEFAULT ('0') NOT NULL, = - default_value VARCHAR2(1024), = - min_value NUMBER, = - max_value NUMBER, = - field_order NUMBER NOT NULL, = - field_widget_name VARCHAR2(20) NOT NULL, = - field_visible_length NUMBER, = - field_maximum_length NUMBER, = - field_visible CHAR(1) = - DEFAULT ('1') NOT NULL, = - default_value_visible CHAR(1) = - DEFAULT ('1') NOT NULL, = - last_update_user VARCHAR2(40), = + command_id NUMBER NOT NULL, + param_name VARCHAR2(40) NOT NULL, + param_type VARCHAR2(10) + DEFAULT ('config') NOT NULL, + data_type_name VARCHAR2(10) NOT NULL, + description VARCHAR2(80) NOT NULL, + mandatory CHAR(1) + DEFAULT ('0') NOT NULL, + default_value VARCHAR2(1024), + min_value NUMBER, + max_value NUMBER, + field_order NUMBER NOT NULL, + field_widget_name VARCHAR2(20) NOT NULL, + field_visible_length NUMBER, + field_maximum_length NUMBER, + field_visible CHAR(1) + DEFAULT ('1') NOT NULL, + default_value_visible CHAR(1) + DEFAULT ('1') NOT NULL, + last_update_user VARCHAR2(40), last_update_date DATE ) ENABLE ROW MOVEMENT @@ -68,7 +68,7 @@ ALTER TABLE rhn_command_parameter = ALTER TABLE rhn_command_parameter ADD CONSTRAINT rhn_cparm_cmd_command_id_fk FOREIGN KEY (command_id) - REFERENCES rhn_command (recid) = + REFERENCES rhn_command (recid) ON DELETE CASCADE; = ALTER TABLE rhn_command_parameter diff --git a/schema/spacewalk/common/tables/rhn_command_queue_commands.sql = b/schema/spacewalk/common/tables/rhn_command_queue_commands.sql index 463e1f0..2ba6cc4 100644 --- a/schema/spacewalk/common/tables/rhn_command_queue_commands.sql +++ b/schema/spacewalk/common/tables/rhn_command_queue_commands.sql @@ -7,26 +7,26 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_command_queue_commands ( - recid NUMBER NOT NULL = - CONSTRAINT rhn_cqcmd_recid_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]], = - description VARCHAR2(40) NOT NULL, = - notes VARCHAR2(2000), = - command_line VARCHAR2(2000) NOT NULL, = - permanent CHAR(1) NOT NULL, = - restartable CHAR(1) NOT NULL, = - effective_user VARCHAR2(40) NOT NULL, = - effective_group VARCHAR2(40) NOT NULL, = - last_update_user VARCHAR2(40), = + recid NUMBER NOT NULL + CONSTRAINT rhn_cqcmd_recid_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]], + description VARCHAR2(40) NOT NULL, + notes VARCHAR2(2000), + command_line VARCHAR2(2000) NOT NULL, + permanent CHAR(1) NOT NULL, + restartable CHAR(1) NOT NULL, + effective_user VARCHAR2(40) NOT NULL, + effective_group VARCHAR2(40) NOT NULL, + last_update_user VARCHAR2(40), last_update_date DATE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_command_queue_execs.sql b/s= chema/spacewalk/common/tables/rhn_command_queue_execs.sql index 11686c7..2d46ef7 100644 --- a/schema/spacewalk/common/tables/rhn_command_queue_execs.sql +++ b/schema/spacewalk/common/tables/rhn_command_queue_execs.sql @@ -7,24 +7,24 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_command_queue_execs ( - instance_id NUMBER NOT NULL, = - netsaint_id NUMBER NOT NULL, = - date_accepted DATE, = - date_executed DATE, = - exit_status NUMBER, = - execution_time NUMBER, = - stdout VARCHAR2(4000), = - stderr VARCHAR2(4000), = - last_update_date DATE, = + instance_id NUMBER NOT NULL, + netsaint_id NUMBER NOT NULL, + date_accepted DATE, + date_executed DATE, + exit_status NUMBER, + execution_time NUMBER, + stdout VARCHAR2(4000), + stderr VARCHAR2(4000), + last_update_date DATE, target_type VARCHAR2(10) NOT NULL ) ENABLE ROW MOVEMENT @@ -52,11 +52,11 @@ ALTER TABLE rhn_command_queue_execs = ALTER TABLE rhn_command_queue_execs ADD CONSTRAINT rhn_cqexe_cqins_inst_id_fk FOREIGN KEY (instance_id) - REFERENCES rhn_command_queue_instances (recid) = + REFERENCES rhn_command_queue_instances (recid) ON DELETE CASCADE; = ALTER TABLE rhn_command_queue_execs ADD CONSTRAINT rhn_cqexe_satcl_nsaint_id_fk FOREIGN KEY (netsaint_id, = target_type) - REFERENCES rhn_command_target (recid, target_type) = + REFERENCES rhn_command_target (recid, target_type) ON DELETE CASCADE; = diff --git a/schema/spacewalk/common/tables/rhn_command_queue_execs_bk.sql = b/schema/spacewalk/common/tables/rhn_command_queue_execs_bk.sql index 1121689..6fa0039 100644 --- a/schema/spacewalk/common/tables/rhn_command_queue_execs_bk.sql +++ b/schema/spacewalk/common/tables/rhn_command_queue_execs_bk.sql @@ -7,24 +7,24 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_command_queue_execs_bk ( - instance_id NUMBER NOT NULL, = - netsaint_id NUMBER NOT NULL, = - date_accepted DATE, = - date_executed DATE, = - exit_status NUMBER, = - execution_time NUMBER, = - stdout VARCHAR2(4000), = - stderr VARCHAR2(4000), = - last_update_date DATE, = + instance_id NUMBER NOT NULL, + netsaint_id NUMBER NOT NULL, + date_accepted DATE, + date_executed DATE, + exit_status NUMBER, + execution_time NUMBER, + stdout VARCHAR2(4000), + stderr VARCHAR2(4000), + last_update_date DATE, target_type VARCHAR2(10) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_command_queue_instances.sql= b/schema/spacewalk/common/tables/rhn_command_queue_instances.sql index 635b8dc..049ca19 100644 --- a/schema/spacewalk/common/tables/rhn_command_queue_instances.sql +++ b/schema/spacewalk/common/tables/rhn_command_queue_instances.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_command_queue_instances ( - recid NUMBER NOT NULL = - CONSTRAINT rhn_cqins_recid_pk PRIMARY KEY = - USING INDEX TABLESPACE [[4m_tbs]], = - command_id NUMBER NOT NULL, = - notes VARCHAR2(2000), = - date_submitted DATE NOT NULL, = - expiration_date DATE NOT NULL, = - notify_email VARCHAR2(50), = - timeout NUMBER, = - last_update_user VARCHAR2(40), = + recid NUMBER NOT NULL + CONSTRAINT rhn_cqins_recid_pk PRIMARY KEY + USING INDEX TABLESPACE [[4m_tbs]], + command_id NUMBER NOT NULL, + notes VARCHAR2(2000), + date_submitted DATE NOT NULL, + expiration_date DATE NOT NULL, + notify_email VARCHAR2(50), + timeout NUMBER, + last_update_user VARCHAR2(40), last_update_date DATE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_command_queue_instances_bk.= sql b/schema/spacewalk/common/tables/rhn_command_queue_instances_bk.sql index 1989fa0..74b1794 100644 --- a/schema/spacewalk/common/tables/rhn_command_queue_instances_bk.sql +++ b/schema/spacewalk/common/tables/rhn_command_queue_instances_bk.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_command_queue_instances_bk ( - recid NUMBER NOT NULL, = - command_id NUMBER NOT NULL, = - notes VARCHAR2(2000), = - date_submitted DATE NOT NULL, = - expiration_date DATE NOT NULL, = - notify_email VARCHAR2(50), = - timeout NUMBER, = - last_update_user VARCHAR2(40), = + recid NUMBER NOT NULL, + command_id NUMBER NOT NULL, + notes VARCHAR2(2000), + date_submitted DATE NOT NULL, + expiration_date DATE NOT NULL, + notify_email VARCHAR2(50), + timeout NUMBER, + last_update_user VARCHAR2(40), last_update_date DATE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_command_queue_params.sql b/= schema/spacewalk/common/tables/rhn_command_queue_params.sql index 3157171..508130b 100644 --- a/schema/spacewalk/common/tables/rhn_command_queue_params.sql +++ b/schema/spacewalk/common/tables/rhn_command_queue_params.sql @@ -7,17 +7,17 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_command_queue_params ( - instance_id NUMBER NOT NULL, = - ord NUMBER NOT NULL, = + instance_id NUMBER NOT NULL, + ord NUMBER NOT NULL, value VARCHAR2(1024) ) ENABLE ROW MOVEMENT @@ -34,6 +34,6 @@ ALTER TABLE rhn_command_queue_params = ALTER TABLE rhn_command_queue_params ADD CONSTRAINT rhn_cqprm_cqins_instance_id_fk FOREIGN KEY (instance_id) - REFERENCES rhn_command_queue_instances (recid) = + REFERENCES rhn_command_queue_instances (recid) ON DELETE CASCADE; = diff --git a/schema/spacewalk/common/tables/rhn_command_queue_sessions.sql = b/schema/spacewalk/common/tables/rhn_command_queue_sessions.sql index f71d399..9e60354 100644 --- a/schema/spacewalk/common/tables/rhn_command_queue_sessions.sql +++ b/schema/spacewalk/common/tables/rhn_command_queue_sessions.sql @@ -7,19 +7,19 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_command_queue_sessions ( - contact_id NUMBER NOT NULL, = - session_id VARCHAR2(255), = - expiration_date DATE, = - last_update_user VARCHAR2(40), = + contact_id NUMBER NOT NULL, + session_id VARCHAR2(255), + expiration_date DATE, + last_update_user VARCHAR2(40), last_update_date DATE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_command_requirements.sql b/= schema/spacewalk/common/tables/rhn_command_requirements.sql index 06928be..d281dcd 100644 --- a/schema/spacewalk/common/tables/rhn_command_requirements.sql +++ b/schema/spacewalk/common/tables/rhn_command_requirements.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_command_requirements ( - name VARCHAR2(40) NOT NULL = - CONSTRAINT rhn_creqs_name_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = + name VARCHAR2(40) NOT NULL + CONSTRAINT rhn_creqs_name_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], description VARCHAR2(4000) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_command_target.sql b/schema= /spacewalk/common/tables/rhn_command_target.sql index a3382d4..94003ef 100644 --- a/schema/spacewalk/common/tables/rhn_command_target.sql +++ b/schema/spacewalk/common/tables/rhn_command_target.sql @@ -7,19 +7,19 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_command_target ( - recid NUMBER NOT NULL, = - target_type VARCHAR2(10) NOT NULL = + recid NUMBER NOT NULL, + target_type VARCHAR2(10) NOT NULL CONSTRAINT cmdtg_target_type_ck - CHECK (target_type in ( 'cluster' , 'node' )), = + CHECK (target_type in ( 'cluster' , 'node' )), customer_id NUMBER NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_config_group.sql b/schema/s= pacewalk/common/tables/rhn_config_group.sql index 022aaf5..d5324c4 100644 --- a/schema/spacewalk/common/tables/rhn_config_group.sql +++ b/schema/spacewalk/common/tables/rhn_config_group.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_config_group ( - name VARCHAR2(255) NOT NULL = - CONSTRAINT rhn_confg_name_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = + name VARCHAR2(255) NOT NULL + CONSTRAINT rhn_confg_name_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], description VARCHAR2(255) ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_config_macro.sql b/schema/s= pacewalk/common/tables/rhn_config_macro.sql index 431955c..07d9b71 100644 --- a/schema/spacewalk/common/tables/rhn_config_macro.sql +++ b/schema/spacewalk/common/tables/rhn_config_macro.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_config_macro ( - environment VARCHAR2(255) NOT NULL, = - name VARCHAR2(255) NOT NULL, = - definition VARCHAR2(255), = - description VARCHAR2(255), = - editable CHAR(1) = - DEFAULT (0) NOT NULL, = - last_update_user VARCHAR2(40), = + environment VARCHAR2(255) NOT NULL, + name VARCHAR2(255) NOT NULL, + definition VARCHAR2(255), + description VARCHAR2(255), + editable CHAR(1) + DEFAULT (0) NOT NULL, + last_update_user VARCHAR2(40), last_update_date DATE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_config_parameter.sql b/sche= ma/spacewalk/common/tables/rhn_config_parameter.sql index 49190c0..e31abe8 100644 --- a/schema/spacewalk/common/tables/rhn_config_parameter.sql +++ b/schema/spacewalk/common/tables/rhn_config_parameter.sql @@ -7,20 +7,20 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_config_parameter ( - group_name VARCHAR2(255) NOT NULL, = - name VARCHAR2(255) NOT NULL, = - value VARCHAR2(255), = - security_type VARCHAR2(255) NOT NULL, = - last_update_user VARCHAR2(40), = + group_name VARCHAR2(255) NOT NULL, + name VARCHAR2(255) NOT NULL, + value VARCHAR2(255), + security_type VARCHAR2(255) NOT NULL, + last_update_user VARCHAR2(40), last_update_date DATE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_config_security_type.sql b/= schema/spacewalk/common/tables/rhn_config_security_type.sql index b2a9573..f22dc62 100644 --- a/schema/spacewalk/common/tables/rhn_config_security_type.sql +++ b/schema/spacewalk/common/tables/rhn_config_security_type.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_config_security_type ( - name VARCHAR2(255) NOT NULL = - CONSTRAINT rhn_conct_name_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = + name VARCHAR2(255) NOT NULL + CONSTRAINT rhn_conct_name_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], description VARCHAR2(255) ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_contact_group_members.sql b= /schema/spacewalk/common/tables/rhn_contact_group_members.sql index cc158b6..25b67aa 100644 --- a/schema/spacewalk/common/tables/rhn_contact_group_members.sql +++ b/schema/spacewalk/common/tables/rhn_contact_group_members.sql @@ -7,29 +7,29 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_contact_group_members ( - contact_group_id NUMBER NOT NULL = + contact_group_id NUMBER NOT NULL CONSTRAINT rhn_cntgm_cgid_fk - REFERENCES rhn_contact_groups (recid= ) = - ON DELETE CASCADE, = - order_number NUMBER NOT NULL, = - member_contact_method_id NUMBER = + REFERENCES rhn_contact_groups (recid) + ON DELETE CASCADE, + order_number NUMBER NOT NULL, + member_contact_method_id NUMBER CONSTRAINT rhn_cntgm_mcmid_fk - REFERENCES rhn_contact_methods (reci= d) = - ON DELETE CASCADE, = - member_contact_group_id NUMBER = + REFERENCES rhn_contact_methods (reci= d) + ON DELETE CASCADE, + member_contact_group_id NUMBER CONSTRAINT rhn_cntgm_mcgid_fk - REFERENCES rhn_contact_groups (recid= ) = - ON DELETE CASCADE, = - last_update_user VARCHAR2(40) NOT NULL, = + REFERENCES rhn_contact_groups (recid) + ON DELETE CASCADE, + last_update_user VARCHAR2(40) NOT NULL, last_update_date DATE NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_contact_groups.sql b/schema= /spacewalk/common/tables/rhn_contact_groups.sql index f630491..7d55c16 100644 --- a/schema/spacewalk/common/tables/rhn_contact_groups.sql +++ b/schema/spacewalk/common/tables/rhn_contact_groups.sql @@ -7,32 +7,32 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_contact_groups ( - recid NUMBER NOT NULL = - CONSTRAINT rhn_cntgp_recid_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]] = + recid NUMBER NOT NULL + CONSTRAINT rhn_cntgp_recid_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]] CONSTRAINT rhn_cntgp_recid_notzero - CHECK (recid > 0), = - contact_group_name VARCHAR2(30) NOT NULL, = - customer_id NUMBER NOT NULL, = - strategy_id NUMBER NOT NULL, = - ack_wait NUMBER NOT NULL = + CHECK (recid > 0), + contact_group_name VARCHAR2(30) NOT NULL, + customer_id NUMBER NOT NULL, + strategy_id NUMBER NOT NULL, + ack_wait NUMBER NOT NULL CONSTRAINT rhn_cntgp_ack_wait_ck - CHECK (ack_wait < 20160), = - rotate_first CHAR(1) NOT NULL = + CHECK (ack_wait < 20160), + rotate_first CHAR(1) NOT NULL CONSTRAINT rhn_cntgp_rotate_f_ck - CHECK (rotate_first in ( '0' , '1' )), = - last_update_user VARCHAR2(40) NOT NULL, = - last_update_date DATE NOT NULL, = - notification_format_id NUMBER = + CHECK (rotate_first in ( '0' , '1' )), + last_update_user VARCHAR2(40) NOT NULL, + last_update_date DATE NOT NULL, + notification_format_id NUMBER DEFAULT (4) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_contact_methods.sql b/schem= a/spacewalk/common/tables/rhn_contact_methods.sql index f08e20e..b84506a 100644 --- a/schema/spacewalk/common/tables/rhn_contact_methods.sql +++ b/schema/spacewalk/common/tables/rhn_contact_methods.sql @@ -7,39 +7,39 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_contact_methods ( - recid NUMBER NOT NULL = - CONSTRAINT rhn_cmeth_recid_pk PRIMARY K= EY = - USING INDEX TABLESPACE [[2m_tbs]] = + recid NUMBER NOT NULL + CONSTRAINT rhn_cmeth_recid_pk PRIMARY K= EY + USING INDEX TABLESPACE [[2m_tbs]] CONSTRAINT rhn_cmeth_recid_notzero - CHECK (recid > 0), = - method_name VARCHAR2(20), = - contact_id NUMBER NOT NULL, = - schedule_id NUMBER, = - method_type_id NUMBER NOT NULL, = - pager_type_id NUMBER, = - pager_pin VARCHAR2(20), = - pager_email VARCHAR2(50), = - pager_max_message_length NUMBER = + CHECK (recid > 0), + method_name VARCHAR2(20), + contact_id NUMBER NOT NULL, + schedule_id NUMBER, + method_type_id NUMBER NOT NULL, + pager_type_id NUMBER, + pager_pin VARCHAR2(20), + pager_email VARCHAR2(50), + pager_max_message_length NUMBER CONSTRAINT rhn_cmeth_pgr_length_limit - CHECK (pager_max_message_length bet= ween 10 and 1920), = - pager_split_long_messages CHAR(1), = - email_address VARCHAR2(50), = - email_reply_to VARCHAR2(50), = - last_update_user VARCHAR2(40), = - last_update_date DATE, = - snmp_host VARCHAR2(255), = - snmp_port NUMBER, = - notification_format_id NUMBER = - DEFAULT (4) NOT NULL, = + CHECK (pager_max_message_length bet= ween 10 and 1920), + pager_split_long_messages CHAR(1), + email_address VARCHAR2(50), + email_reply_to VARCHAR2(50), + last_update_user VARCHAR2(40), + last_update_date DATE, + snmp_host VARCHAR2(255), + snmp_port NUMBER, + notification_format_id NUMBER + DEFAULT (4) NOT NULL, sender_sat_cluster_id NUMBER ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_current_alerts.sql b/schema= /spacewalk/common/tables/rhn_current_alerts.sql index 15f83dc..6b2a502 100644 --- a/schema/spacewalk/common/tables/rhn_current_alerts.sql +++ b/schema/spacewalk/common/tables/rhn_current_alerts.sql @@ -7,41 +7,41 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_current_alerts ( - recid NUMBER NOT NULL = - CONSTRAINT rhn_alrts_recid_pk PRIMARY KEY = - USING INDEX TABLESPACE [[128m_tbs]], = - date_submitted DATE, = - last_server_change DATE, = - date_completed DATE = - DEFAULT (to_date('31-12-9999', 'dd-mm-yyyy')), = - original_server NUMBER, = - current_server NUMBER, = - tel_args VARCHAR2(2200), = - message VARCHAR2(2000), = - ticket_id VARCHAR2(80), = - destination_name VARCHAR2(50), = - escalation_level NUMBER = - DEFAULT (0), = - host_probe_id NUMBER, = - host_state VARCHAR2(255), = - service_probe_id NUMBER, = - service_state VARCHAR2(255), = - customer_id NUMBER NOT NULL, = - netsaint_id NUMBER, = - probe_type VARCHAR2(20) = - DEFAULT ('none'), = - in_progress CHAR(1) = - DEFAULT (1) NOT NULL, = - last_update_date DATE, = + recid NUMBER NOT NULL + CONSTRAINT rhn_alrts_recid_pk PRIMARY KEY + USING INDEX TABLESPACE [[128m_tbs]], + date_submitted DATE, + last_server_change DATE, + date_completed DATE + DEFAULT (to_date('31-12-9999', 'dd-mm-yyyy')), + original_server NUMBER, + current_server NUMBER, + tel_args VARCHAR2(2200), + message VARCHAR2(2000), + ticket_id VARCHAR2(80), + destination_name VARCHAR2(50), + escalation_level NUMBER + DEFAULT (0), + host_probe_id NUMBER, + host_state VARCHAR2(255), + service_probe_id NUMBER, + service_state VARCHAR2(255), + customer_id NUMBER NOT NULL, + netsaint_id NUMBER, + probe_type VARCHAR2(20) + DEFAULT ('none'), + in_progress CHAR(1) + DEFAULT (1) NOT NULL, + last_update_date DATE, event_timestamp DATE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_current_state_summaries.sql= b/schema/spacewalk/common/tables/rhn_current_state_summaries.sql index 9f245c8..f8729cf 100644 --- a/schema/spacewalk/common/tables/rhn_current_state_summaries.sql +++ b/schema/spacewalk/common/tables/rhn_current_state_summaries.sql @@ -7,19 +7,19 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_current_state_summaries ( - customer_id NUMBER NOT NULL, = - template_id VARCHAR2(10) NOT NULL, = - state VARCHAR2(20) NOT NULL, = - state_count NUMBER, = + customer_id NUMBER NOT NULL, + template_id VARCHAR2(10) NOT NULL, + state VARCHAR2(20) NOT NULL, + state_count NUMBER, last_check DATE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_db_environment.sql b/schema= /spacewalk/common/tables/rhn_db_environment.sql index 734dcc4..e922045 100644 --- a/schema/spacewalk/common/tables/rhn_db_environment.sql +++ b/schema/spacewalk/common/tables/rhn_db_environment.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_db_environment ( - db_name VARCHAR2(20) NOT NULL = - CONSTRAINT rhn_dbenv_db_name_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = + db_name VARCHAR2(20) NOT NULL + CONSTRAINT rhn_dbenv_db_name_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], environment VARCHAR2(255) ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_deployed_probe.sql b/schema= /spacewalk/common/tables/rhn_deployed_probe.sql index 86062fb..00727dc 100644 --- a/schema/spacewalk/common/tables/rhn_deployed_probe.sql +++ b/schema/spacewalk/common/tables/rhn_deployed_probe.sql @@ -7,35 +7,35 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_deployed_probe ( - recid NUMBER NOT NULL = - CONSTRAINT rhn_dprob_recid_pk PRIMA= RY KEY = - USING INDEX TABLESPACE [[8m_tbs]], = - probe_type VARCHAR2(15) NOT NULL, = - description VARCHAR2(255), = - customer_id NUMBER NOT NULL, = - command_id NUMBER NOT NULL, = - contact_group_id NUMBER, = - os_id NUMBER, = - notify_critical CHAR(1), = - notify_warning CHAR(1), = - notify_recovery CHAR(1), = - notify_unknown CHAR(1), = - notification_interval_minutes NUMBER NOT NULL, = - check_interval_minutes NUMBER NOT NULL, = - retry_interval_minutes NUMBER NOT NULL, = - max_attempts NUMBER, = - sat_cluster_id NUMBER, = - parent_probe_id NUMBER, = - last_update_user VARCHAR2(40), = + recid NUMBER NOT NULL + CONSTRAINT rhn_dprob_recid_pk PRIMA= RY KEY + USING INDEX TABLESPACE [[8m_tbs]], + probe_type VARCHAR2(15) NOT NULL, + description VARCHAR2(255), + customer_id NUMBER NOT NULL, + command_id NUMBER NOT NULL, + contact_group_id NUMBER, + os_id NUMBER, + notify_critical CHAR(1), + notify_warning CHAR(1), + notify_recovery CHAR(1), + notify_unknown CHAR(1), + notification_interval_minutes NUMBER NOT NULL, + check_interval_minutes NUMBER NOT NULL, + retry_interval_minutes NUMBER NOT NULL, + max_attempts NUMBER, + sat_cluster_id NUMBER, + parent_probe_id NUMBER, + last_update_user VARCHAR2(40), last_update_date DATE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_environment.sql b/schema/sp= acewalk/common/tables/rhn_environment.sql index 7dedd35..840f53b 100644 --- a/schema/spacewalk/common/tables/rhn_environment.sql +++ b/schema/spacewalk/common/tables/rhn_environment.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_environment ( - name VARCHAR2(255) NOT NULL = - CONSTRAINT rhn_envir_name_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = + name VARCHAR2(255) NOT NULL + CONSTRAINT rhn_envir_name_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], description VARCHAR2(255) ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_host_check_suites.sql b/sch= ema/spacewalk/common/tables/rhn_host_check_suites.sql index dda408d..62379a0 100644 --- a/schema/spacewalk/common/tables/rhn_host_check_suites.sql +++ b/schema/spacewalk/common/tables/rhn_host_check_suites.sql @@ -7,16 +7,16 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_host_check_suites ( - host_probe_id NUMBER NOT NULL, = + host_probe_id NUMBER NOT NULL, suite_id NUMBER NOT NULL ) ENABLE ROW MOVEMENT @@ -33,11 +33,11 @@ ALTER TABLE rhn_host_check_suites = ALTER TABLE rhn_host_check_suites ADD CONSTRAINT rhn_hstck_cksut_suite_id_fk FOREIGN KEY (suite_id) - REFERENCES rhn_check_suites (recid) = + REFERENCES rhn_check_suites (recid) ON DELETE CASCADE; = ALTER TABLE rhn_host_check_suites ADD CONSTRAINT rhn_hstck_hstpb_probe_id_fk FOREIGN KEY (host_probe_id) - REFERENCES rhn_host_probe (probe_id) = + REFERENCES rhn_host_probe (probe_id) ON DELETE CASCADE; = diff --git a/schema/spacewalk/common/tables/rhn_host_probe.sql b/schema/spa= cewalk/common/tables/rhn_host_probe.sql index d589582..9f5526a 100644 --- a/schema/spacewalk/common/tables/rhn_host_probe.sql +++ b/schema/spacewalk/common/tables/rhn_host_probe.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_host_probe ( - probe_id NUMBER NOT NULL = - CONSTRAINT rhn_hstpb_probe_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[4m_tbs]], = - probe_type VARCHAR2(12) = - DEFAULT ('host') NOT NULL = + probe_id NUMBER NOT NULL + CONSTRAINT rhn_hstpb_probe_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[4m_tbs]], + probe_type VARCHAR2(12) + DEFAULT ('host') NOT NULL CONSTRAINT rhn_hstpb_probe_type_ck - CHECK (probe_type =3D 'host'), = - host_id NUMBER NOT NULL, = + CHECK (probe_type =3D 'host'), + host_id NUMBER NOT NULL, sat_cluster_id NUMBER NOT NULL ) ENABLE ROW MOVEMENT @@ -51,11 +51,11 @@ ALTER TABLE rhn_host_probe = ALTER TABLE rhn_host_probe ADD CONSTRAINT rhn_hstpb_probe_probe_id_fk FOREIGN KEY (probe_id, prob= e_type) - REFERENCES rhn_probe (recid, probe_type) = + REFERENCES rhn_probe (recid, probe_type) ON DELETE CASCADE; = ALTER TABLE rhn_host_probe ADD CONSTRAINT rhn_hstpb_satcl_id_fk FOREIGN KEY (sat_cluster_id) - REFERENCES rhn_sat_cluster (recid) = + REFERENCES rhn_sat_cluster (recid) ON DELETE CASCADE; = diff --git a/schema/spacewalk/common/tables/rhn_interface_monitoring.sql b/= schema/spacewalk/common/tables/rhn_interface_monitoring.sql index c911ae1..bcad09f 100644 --- a/schema/spacewalk/common/tables/rhn_interface_monitoring.sql +++ b/schema/spacewalk/common/tables/rhn_interface_monitoring.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_interface_monitoring ( - server_id NUMBER NOT NULL = - CONSTRAINT rhn_monif_server_pk PRIMARY KEY = - USING INDEX TABLESPACE [[8m_tbs]], = + server_id NUMBER NOT NULL + CONSTRAINT rhn_monif_server_pk PRIMARY KEY + USING INDEX TABLESPACE [[8m_tbs]], server_name VARCHAR2(32) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_ll_netsaint.sql b/schema/sp= acewalk/common/tables/rhn_ll_netsaint.sql index 59dc598..eaf4553 100644 --- a/schema/spacewalk/common/tables/rhn_ll_netsaint.sql +++ b/schema/spacewalk/common/tables/rhn_ll_netsaint.sql @@ -7,16 +7,16 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_ll_netsaint ( - netsaint_id NUMBER NOT NULL, = + netsaint_id NUMBER NOT NULL, city VARCHAR2(255) ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_method_types.sql b/schema/s= pacewalk/common/tables/rhn_method_types.sql index 28dd12f..30e7ebe 100644 --- a/schema/spacewalk/common/tables/rhn_method_types.sql +++ b/schema/spacewalk/common/tables/rhn_method_types.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_method_types ( - recid NUMBER NOT NULL = - CONSTRAINT rhn_mthtp_recid_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]] = + recid NUMBER NOT NULL + CONSTRAINT rhn_mthtp_recid_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]] CONSTRAINT rhn_mthtp_recid_ck - CHECK (recid > 0), = - method_type_name VARCHAR2(20), = - notification_format_id NUMBER = + CHECK (recid > 0), + method_type_name VARCHAR2(20), + notification_format_id NUMBER DEFAULT (4) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_metrics.sql b/schema/spacew= alk/common/tables/rhn_metrics.sql index ee5233d..149d58a 100644 --- a/schema/spacewalk/common/tables/rhn_metrics.sql +++ b/schema/spacewalk/common/tables/rhn_metrics.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_metrics ( - metric_id VARCHAR2(40) NOT NULL, = - storage_unit_id VARCHAR2(10) NOT NULL, = - description VARCHAR2(200), = - last_update_user VARCHAR2(40), = - last_update_date DATE, = - label VARCHAR2(40), = - command_class VARCHAR2(255) = + metric_id VARCHAR2(40) NOT NULL, + storage_unit_id VARCHAR2(10) NOT NULL, + description VARCHAR2(200), + last_update_user VARCHAR2(40), + last_update_date DATE, + label VARCHAR2(40), + command_class VARCHAR2(255) DEFAULT ('nothing') NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_multi_scout_threshold.sql b= /schema/spacewalk/common/tables/rhn_multi_scout_threshold.sql index f8bb921..d1fea5e 100644 --- a/schema/spacewalk/common/tables/rhn_multi_scout_threshold.sql +++ b/schema/spacewalk/common/tables/rhn_multi_scout_threshold.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_multi_scout_threshold ( - probe_id NUMBER NOT NULL = - CONSTRAINT rhn_msthr_probe_id_pk P= RIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]], = - scout_warning_threshold_is_all CHAR(1) = - DEFAULT ('1') NOT NULL, = - scout_crit_threshold_is_all CHAR(1) = - DEFAULT ('1') NOT NULL, = - scout_warning_threshold NUMBER, = + probe_id NUMBER NOT NULL + CONSTRAINT rhn_msthr_probe_id_pk P= RIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]], + scout_warning_threshold_is_all CHAR(1) + DEFAULT ('1') NOT NULL, + scout_crit_threshold_is_all CHAR(1) + DEFAULT ('1') NOT NULL, + scout_warning_threshold NUMBER, scout_critical_threshold NUMBER ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_notification_formats.sql b/= schema/spacewalk/common/tables/rhn_notification_formats.sql index f4d8b19..6a3df8d 100644 --- a/schema/spacewalk/common/tables/rhn_notification_formats.sql +++ b/schema/spacewalk/common/tables/rhn_notification_formats.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_notification_formats ( - recid NUMBER NOT NULL = - CONSTRAINT rhn_ntfmt_recid_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - customer_id NUMBER, = - description VARCHAR2(255) NOT NULL, = - subject_format VARCHAR2(4000), = - body_format VARCHAR2(4000) NOT NULL, = - max_subject_length NUMBER, = - max_body_length NUMBER = - DEFAULT (1920) NOT NULL, = + recid NUMBER NOT NULL + CONSTRAINT rhn_ntfmt_recid_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + customer_id NUMBER, + description VARCHAR2(255) NOT NULL, + subject_format VARCHAR2(4000), + body_format VARCHAR2(4000) NOT NULL, + max_subject_length NUMBER, + max_body_length NUMBER + DEFAULT (1920) NOT NULL, reply_format VARCHAR2(4000) ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_notifservers.sql b/schema/s= pacewalk/common/tables/rhn_notifservers.sql index 653feb0..360f27c 100644 --- a/schema/spacewalk/common/tables/rhn_notifservers.sql +++ b/schema/spacewalk/common/tables/rhn_notifservers.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_notifservers ( - recid NUMBER NOT NULL = - CONSTRAINT rhn_notsv_recid_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = + recid NUMBER NOT NULL + CONSTRAINT rhn_notsv_recid_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], name VARCHAR2(255) ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_os.sql b/schema/spacewalk/c= ommon/tables/rhn_os.sql index 265444a..d582a6b 100644 --- a/schema/spacewalk/common/tables/rhn_os.sql +++ b/schema/spacewalk/common/tables/rhn_os.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_os ( - recid NUMBER NOT NULL = - CONSTRAINT rhn_os000_recid_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = + recid NUMBER NOT NULL + CONSTRAINT rhn_os000_recid_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], os_name VARCHAR2(128) ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_os_commands_xref.sql b/sche= ma/spacewalk/common/tables/rhn_os_commands_xref.sql index f325a6a..890a6a4 100644 --- a/schema/spacewalk/common/tables/rhn_os_commands_xref.sql +++ b/schema/spacewalk/common/tables/rhn_os_commands_xref.sql @@ -7,16 +7,16 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_os_commands_xref ( - os_id NUMBER NOT NULL, = + os_id NUMBER NOT NULL, commands_id NUMBER NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_pager_types.sql b/schema/sp= acewalk/common/tables/rhn_pager_types.sql index a0ffc82..a6a7931 100644 --- a/schema/spacewalk/common/tables/rhn_pager_types.sql +++ b/schema/spacewalk/common/tables/rhn_pager_types.sql @@ -7,20 +7,20 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_pager_types ( - recid NUMBER NOT NULL = - CONSTRAINT rhn_pgrtp_recid_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]] = + recid NUMBER NOT NULL + CONSTRAINT rhn_pgrtp_recid_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]] CONSTRAINT rhn_pgrtp_recid_ck - CHECK (recid > 0), = + CHECK (recid > 0), pager_type_name VARCHAR2(50) ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_physical_location.sql b/sch= ema/spacewalk/common/tables/rhn_physical_location.sql index 087caa4..5f8f3f4 100644 --- a/schema/spacewalk/common/tables/rhn_physical_location.sql +++ b/schema/spacewalk/common/tables/rhn_physical_location.sql @@ -7,30 +7,30 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_physical_location ( - recid NUMBER NOT NULL = - CONSTRAINT rhn_phslc_recid_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]], = - location_name VARCHAR2(40), = - address1 VARCHAR2(255), = - address2 VARCHAR2(255), = - city VARCHAR2(128), = - state VARCHAR2(128), = - country VARCHAR2(2), = - zipcode VARCHAR2(10), = - phone VARCHAR2(40), = - deleted CHAR(1), = - last_update_user VARCHAR2(40), = - last_update_date DATE, = - customer_id NUMBER = + recid NUMBER NOT NULL + CONSTRAINT rhn_phslc_recid_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]], + location_name VARCHAR2(40), + address1 VARCHAR2(255), + address2 VARCHAR2(255), + city VARCHAR2(128), + state VARCHAR2(128), + country VARCHAR2(2), + zipcode VARCHAR2(10), + phone VARCHAR2(40), + deleted CHAR(1), + last_update_user VARCHAR2(40), + last_update_date DATE, + customer_id NUMBER DEFAULT (999) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_probe.sql b/schema/spacewal= k/common/tables/rhn_probe.sql index 6481903..50c7659 100644 --- a/schema/spacewalk/common/tables/rhn_probe.sql +++ b/schema/spacewalk/common/tables/rhn_probe.sql @@ -7,32 +7,32 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_probe ( - recid NUMBER NOT NULL = - CONSTRAINT rhn_probe_recid_pk PRIMA= RY KEY = - USING INDEX TABLESPACE [[8m_tbs]], = - probe_type VARCHAR2(15) NOT NULL, = - description VARCHAR2(255) NOT NULL, = - customer_id NUMBER NOT NULL, = - command_id NUMBER NOT NULL, = - contact_group_id NUMBER, = - notify_critical CHAR(1), = - notify_warning CHAR(1), = - notify_unknown CHAR(1), = - notify_recovery CHAR(1), = - notification_interval_minutes NUMBER NOT NULL, = - check_interval_minutes NUMBER NOT NULL, = - retry_interval_minutes NUMBER NOT NULL, = - max_attempts NUMBER, = - last_update_user VARCHAR2(40), = + recid NUMBER NOT NULL + CONSTRAINT rhn_probe_recid_pk PRIMA= RY KEY + USING INDEX TABLESPACE [[8m_tbs]], + probe_type VARCHAR2(15) NOT NULL, + description VARCHAR2(255) NOT NULL, + customer_id NUMBER NOT NULL, + command_id NUMBER NOT NULL, + contact_group_id NUMBER, + notify_critical CHAR(1), + notify_warning CHAR(1), + notify_unknown CHAR(1), + notify_recovery CHAR(1), + notification_interval_minutes NUMBER NOT NULL, + check_interval_minutes NUMBER NOT NULL, + retry_interval_minutes NUMBER NOT NULL, + max_attempts NUMBER, + last_update_user VARCHAR2(40), last_update_date DATE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_probe_param_value.sql b/sch= ema/spacewalk/common/tables/rhn_probe_param_value.sql index 1927e6f..e2f606b 100644 --- a/schema/spacewalk/common/tables/rhn_probe_param_value.sql +++ b/schema/spacewalk/common/tables/rhn_probe_param_value.sql @@ -7,20 +7,20 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_probe_param_value ( - probe_id NUMBER NOT NULL, = - command_id NUMBER NOT NULL, = - param_name VARCHAR2(40) NOT NULL, = - value VARCHAR2(1024), = - last_update_user VARCHAR2(40), = + probe_id NUMBER NOT NULL, + command_id NUMBER NOT NULL, + param_name VARCHAR2(40) NOT NULL, + value VARCHAR2(1024), + last_update_user VARCHAR2(40), last_update_date DATE ) ENABLE ROW MOVEMENT @@ -37,11 +37,11 @@ ALTER TABLE rhn_probe_param_value = ALTER TABLE rhn_probe_param_value ADD CONSTRAINT rhn_ppval_chkpb_probe_id_fk FOREIGN KEY (probe_id) - REFERENCES rhn_probe (recid) = + REFERENCES rhn_probe (recid) ON DELETE CASCADE; = ALTER TABLE rhn_probe_param_value ADD CONSTRAINT rhn_ppval_cmd_id_parm_nm_fk FOREIGN KEY (command_id, pa= ram_name) - REFERENCES rhn_command_parameter (command_id, param_name) = + REFERENCES rhn_command_parameter (command_id, param_name) ON DELETE CASCADE; = diff --git a/schema/spacewalk/common/tables/rhn_probe_state.sql b/schema/sp= acewalk/common/tables/rhn_probe_state.sql index 0dcc438..6933727 100644 --- a/schema/spacewalk/common/tables/rhn_probe_state.sql +++ b/schema/spacewalk/common/tables/rhn_probe_state.sql @@ -7,19 +7,19 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_probe_state ( - probe_id NUMBER NOT NULL, = - scout_id NUMBER NOT NULL, = - state VARCHAR2(20), = - output VARCHAR2(4000), = + probe_id NUMBER NOT NULL, + scout_id NUMBER NOT NULL, + state VARCHAR2(20), + output VARCHAR2(4000), last_check DATE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_probe_types.sql b/schema/sp= acewalk/common/tables/rhn_probe_types.sql index 0a3e06d..008144c 100644 --- a/schema/spacewalk/common/tables/rhn_probe_types.sql +++ b/schema/spacewalk/common/tables/rhn_probe_types.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_probe_types ( - probe_type VARCHAR2(20) NOT NULL = - CONSTRAINT rhn_prbtp_probe_type_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = + probe_type VARCHAR2(20) NOT NULL + CONSTRAINT rhn_prbtp_probe_type_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], type_description VARCHAR2(200) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_quanta.sql b/schema/spacewa= lk/common/tables/rhn_quanta.sql index ca272ec..c216a9b 100644 --- a/schema/spacewalk/common/tables/rhn_quanta.sql +++ b/schema/spacewalk/common/tables/rhn_quanta.sql @@ -7,21 +7,21 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_quanta ( - quantum_id VARCHAR2(10) NOT NULL = - CONSTRAINT rhn_qnta0_quantum_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - basic_unit_id VARCHAR2(20), = - description VARCHAR2(200), = - last_update_user VARCHAR2(40), = + quantum_id VARCHAR2(10) NOT NULL + CONSTRAINT rhn_qnta0_quantum_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + basic_unit_id VARCHAR2(20), + description VARCHAR2(200), + last_update_user VARCHAR2(40), last_update_date DATE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_redirect_criteria.sql b/sch= ema/spacewalk/common/tables/rhn_redirect_criteria.sql index bafcf5d..a6ebf36 100644 --- a/schema/spacewalk/common/tables/rhn_redirect_criteria.sql +++ b/schema/spacewalk/common/tables/rhn_redirect_criteria.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_redirect_criteria ( - recid NUMBER NOT NULL = - CONSTRAINT rhn_rdrcr_recid_pk PRIMARY KEY = - USING INDEX TABLESPACE [[4m_tbs]], = - redirect_id NUMBER NOT NULL, = - match_param VARCHAR2(255) NOT NULL, = - match_value VARCHAR2(255), = - inverted CHAR(1) = + recid NUMBER NOT NULL + CONSTRAINT rhn_rdrcr_recid_pk PRIMARY KEY + USING INDEX TABLESPACE [[4m_tbs]], + redirect_id NUMBER NOT NULL, + match_param VARCHAR2(255) NOT NULL, + match_value VARCHAR2(255), + inverted CHAR(1) DEFAULT (0) NOT NULL ) ENABLE ROW MOVEMENT @@ -38,7 +38,7 @@ CREATE SEQUENCE rhn_redirect_crit_recid_seq; = ALTER TABLE rhn_redirect_criteria ADD CONSTRAINT rhn_rdrcr_rdrct_redirect_id_fk FOREIGN KEY (redirect_id) - REFERENCES rhn_redirects (recid) = + REFERENCES rhn_redirects (recid) ON DELETE CASCADE; = ALTER TABLE rhn_redirect_criteria diff --git a/schema/spacewalk/common/tables/rhn_redirect_email_targets.sql = b/schema/spacewalk/common/tables/rhn_redirect_email_targets.sql index 9a8c7a6..4478d7d 100644 --- a/schema/spacewalk/common/tables/rhn_redirect_email_targets.sql +++ b/schema/spacewalk/common/tables/rhn_redirect_email_targets.sql @@ -7,16 +7,16 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_redirect_email_targets ( - redirect_id NUMBER NOT NULL, = + redirect_id NUMBER NOT NULL, email_address VARCHAR2(255) NOT NULL ) ENABLE ROW MOVEMENT @@ -37,6 +37,6 @@ ALTER TABLE rhn_redirect_email_targets = ALTER TABLE rhn_redirect_email_targets ADD CONSTRAINT rhn_rdret_rdrct_redirect_id_fk FOREIGN KEY (redirect_id) - REFERENCES rhn_redirects (recid) = + REFERENCES rhn_redirects (recid) ON DELETE CASCADE; = diff --git a/schema/spacewalk/common/tables/rhn_redirect_group_targets.sql = b/schema/spacewalk/common/tables/rhn_redirect_group_targets.sql index 2ab3df0..b082388 100644 --- a/schema/spacewalk/common/tables/rhn_redirect_group_targets.sql +++ b/schema/spacewalk/common/tables/rhn_redirect_group_targets.sql @@ -7,16 +7,16 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_redirect_group_targets ( - redirect_id NUMBER NOT NULL, = + redirect_id NUMBER NOT NULL, contact_group_id NUMBER NOT NULL ) ENABLE ROW MOVEMENT @@ -37,6 +37,6 @@ ALTER TABLE rhn_redirect_group_targets = ALTER TABLE rhn_redirect_group_targets ADD CONSTRAINT rhn_rdrgt_rdrct_redirect_id_fk FOREIGN KEY (redirect_id) - REFERENCES rhn_redirects (recid) = + REFERENCES rhn_redirects (recid) ON DELETE CASCADE; = diff --git a/schema/spacewalk/common/tables/rhn_redirect_match_types.sql b/= schema/spacewalk/common/tables/rhn_redirect_match_types.sql index 0a6e113..14bba89 100644 --- a/schema/spacewalk/common/tables/rhn_redirect_match_types.sql +++ b/schema/spacewalk/common/tables/rhn_redirect_match_types.sql @@ -7,17 +7,17 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_redirect_match_types ( - name VARCHAR2(255) NOT NULL = - CONSTRAINT rhn_rdrmt_name_pk PRIMARY KEY = + name VARCHAR2(255) NOT NULL + CONSTRAINT rhn_rdrmt_name_pk PRIMARY KEY USING INDEX TABLESPACE [[64k_tbs]] ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_redirect_method_targets.sql= b/schema/spacewalk/common/tables/rhn_redirect_method_targets.sql index a6ca0de..a932015 100644 --- a/schema/spacewalk/common/tables/rhn_redirect_method_targets.sql +++ b/schema/spacewalk/common/tables/rhn_redirect_method_targets.sql @@ -7,16 +7,16 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_redirect_method_targets ( - redirect_id NUMBER NOT NULL, = + redirect_id NUMBER NOT NULL, contact_method_id NUMBER NOT NULL ) ENABLE ROW MOVEMENT @@ -41,11 +41,11 @@ ALTER TABLE rhn_redirect_method_targets = ALTER TABLE rhn_redirect_method_targets ADD CONSTRAINT rhn_rdrmt_cmeth_redirect_id_fk FOREIGN KEY (contact_met= hod_id) - REFERENCES rhn_contact_methods (recid) = + REFERENCES rhn_contact_methods (recid) ON DELETE CASCADE; = ALTER TABLE rhn_redirect_method_targets ADD CONSTRAINT rhn_rdrmt_rdrct_redirect_id_fk FOREIGN KEY (redirect_id) - REFERENCES rhn_redirects (recid) = + REFERENCES rhn_redirects (recid) ON DELETE CASCADE; = diff --git a/schema/spacewalk/common/tables/rhn_redirect_types.sql b/schema= /spacewalk/common/tables/rhn_redirect_types.sql index 4c36fdc..59669f6 100644 --- a/schema/spacewalk/common/tables/rhn_redirect_types.sql +++ b/schema/spacewalk/common/tables/rhn_redirect_types.sql @@ -7,19 +7,19 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_redirect_types ( - name VARCHAR2(20) NOT NULL = - CONSTRAINT rhn_rdrtp_name_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - description VARCHAR2(255), = + name VARCHAR2(20) NOT NULL + CONSTRAINT rhn_rdrtp_name_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + description VARCHAR2(255), long_name VARCHAR2(80) ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_redirects.sql b/schema/spac= ewalk/common/tables/rhn_redirects.sql index b0d4887..b49cad1 100644 --- a/schema/spacewalk/common/tables/rhn_redirects.sql +++ b/schema/spacewalk/common/tables/rhn_redirects.sql @@ -7,39 +7,39 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_redirects ( - recid NUMBER NOT NULL = - CONSTRAINT rhn_rdrct_recid_pk PRIMARY KEY = - USING INDEX TABLESPACE [[8m_tbs]], = - customer_id NUMBER, = - contact_id NUMBER, = - redirect_type VARCHAR2(20) NOT NULL, = - description VARCHAR2(25), = - reason VARCHAR2(2000), = - expiration DATE NOT NULL, = - last_update_user VARCHAR2(40), = - last_update_date DATE, = - start_date DATE NOT NULL, = - recurring NUMBER = - DEFAULT (0) NOT NULL = + recid NUMBER NOT NULL + CONSTRAINT rhn_rdrct_recid_pk PRIMARY KEY + USING INDEX TABLESPACE [[8m_tbs]], + customer_id NUMBER, + contact_id NUMBER, + redirect_type VARCHAR2(20) NOT NULL, + description VARCHAR2(25), + reason VARCHAR2(2000), + expiration DATE NOT NULL, + last_update_user VARCHAR2(40), + last_update_date DATE, + start_date DATE NOT NULL, + recurring NUMBER + DEFAULT (0) NOT NULL CONSTRAINT RHN_RDRCT_RECUR_VALID - CHECK (recurring in ( 0 , 1 )), = - recurring_frequency NUMBER = - DEFAULT (2) = + CHECK (recurring in ( 0 , 1 )), + recurring_frequency NUMBER + DEFAULT (2) CONSTRAINT RHN_RDRCT_RECUR_FREQ_VALID - CHECK (recurring_frequency in ( 2 , 3 , 6= )), = - recurring_duration NUMBER = - DEFAULT (0), = - recurring_dur_type NUMBER = - DEFAULT (12) = + CHECK (recurring_frequency in ( 2 , 3 , 6= )), + recurring_duration NUMBER + DEFAULT (0), + recurring_dur_type NUMBER + DEFAULT (12) CONSTRAINT rhn_rdrct_rec_dtype_valid CHECK (recurring_dur_type in ( 12 , 11 , = 5 , 3 , 1 )) ) @@ -63,7 +63,7 @@ CREATE INDEX rhn_rdrct_cid_idx CREATE SEQUENCE rhn_redirects_recid_seq; = ALTER TABLE rhn_redirects - ADD = + ADD CONSTRAINT rhn_rdrct_start_lte_expir CHECK (start_date <=3D expiration); = diff --git a/schema/spacewalk/common/tables/rhn_sat_cluster.sql b/schema/sp= acewalk/common/tables/rhn_sat_cluster.sql index 89b257a..f709fac 100644 --- a/schema/spacewalk/common/tables/rhn_sat_cluster.sql +++ b/schema/spacewalk/common/tables/rhn_sat_cluster.sql @@ -7,34 +7,34 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_sat_cluster ( - recid NUMBER NOT NULL = - CONSTRAINT rhn_satcl_recid_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]], = - target_type VARCHAR2(10) = - DEFAULT ('cluster') NOT NULL = + recid NUMBER NOT NULL + CONSTRAINT rhn_satcl_recid_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]], + target_type VARCHAR2(10) + DEFAULT ('cluster') NOT NULL CONSTRAINT rhn_satcl_target_type_ck - CHECK (target_type in ( 'cluster' )), = - customer_id NUMBER NOT NULL, = - description VARCHAR2(255) NOT NULL, = - last_update_user VARCHAR2(40), = - last_update_date DATE, = - physical_location_id NUMBER NOT NULL, = - public_key VARCHAR2(2000), = - vip VARCHAR2(15), = - deployed CHAR(1) = - DEFAULT ('0') NOT NULL = + CHECK (target_type in ( 'cluster' )), + customer_id NUMBER NOT NULL, + description VARCHAR2(255) NOT NULL, + last_update_user VARCHAR2(40), + last_update_date DATE, + physical_location_id NUMBER NOT NULL, + public_key VARCHAR2(2000), + vip VARCHAR2(15), + deployed CHAR(1) + DEFAULT ('0') NOT NULL CONSTRAINT rhn_satcl_deployed_ck - CHECK (deployed in ( '0' , '1' )), = - pem_public_key VARCHAR2(2000), = + CHECK (deployed in ( '0' , '1' )), + pem_public_key VARCHAR2(2000), pem_public_key_hash VARCHAR2(20) ) ENABLE ROW MOVEMENT @@ -48,7 +48,7 @@ CREATE INDEX rhn_satcl_cid_idx = ALTER TABLE rhn_sat_cluster ADD CONSTRAINT rhn_satcl_cmdtg_recid_tar_fk FOREIGN KEY (recid, target= _type) - REFERENCES rhn_command_target (recid, target_type) = + REFERENCES rhn_command_target (recid, target_type) ON DELETE CASCADE; = ALTER TABLE rhn_sat_cluster diff --git a/schema/spacewalk/common/tables/rhn_sat_cluster_probe.sql b/sch= ema/spacewalk/common/tables/rhn_sat_cluster_probe.sql index d1d0814..3fd18b5 100644 --- a/schema/spacewalk/common/tables/rhn_sat_cluster_probe.sql +++ b/schema/spacewalk/common/tables/rhn_sat_cluster_probe.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_sat_cluster_probe ( - probe_id NUMBER NOT NULL = - CONSTRAINT rhn_sclpb_probe_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]], = - probe_type VARCHAR2(12) = - DEFAULT ('satcluster') NOT NULL = + probe_id NUMBER NOT NULL + CONSTRAINT rhn_sclpb_probe_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]], + probe_type VARCHAR2(12) + DEFAULT ('satcluster') NOT NULL CONSTRAINT rhn_sclpb_probe_type_ck - CHECK (probe_type =3D 'satcluster'), = + CHECK (probe_type =3D 'satcluster'), sat_cluster_id NUMBER NOT NULL ) ENABLE ROW MOVEMENT @@ -40,11 +40,11 @@ CREATE INDEX rhn_sclpb_pid_ptype_idx = ALTER TABLE rhn_sat_cluster_probe ADD CONSTRAINT rhn_sclpb_prb_recid_prb_typ_fk FOREIGN KEY (probe_id, p= robe_type) - REFERENCES rhn_probe (recid, probe_type) = + REFERENCES rhn_probe (recid, probe_type) ON DELETE CASCADE; = ALTER TABLE rhn_sat_cluster_probe ADD CONSTRAINT rhn_sclpb_satcl_sat_cl_id_fk FOREIGN KEY (sat_cluster_i= d) - REFERENCES rhn_sat_cluster (recid) = + REFERENCES rhn_sat_cluster (recid) ON DELETE CASCADE; = diff --git a/schema/spacewalk/common/tables/rhn_sat_node.sql b/schema/space= walk/common/tables/rhn_sat_node.sql index baf1010..e5f390a 100644 --- a/schema/spacewalk/common/tables/rhn_sat_node.sql +++ b/schema/spacewalk/common/tables/rhn_sat_node.sql @@ -7,37 +7,37 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_sat_node ( - recid NUMBER NOT NULL = - CONSTRAINT rhn_satnd_recid_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]], = - server_id NUMBER = + recid NUMBER NOT NULL + CONSTRAINT rhn_satnd_recid_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]], + server_id NUMBER CONSTRAINT rhn_satnd_sid_fk - REFERENCES rhnServer (id), = - target_type VARCHAR2(10) = - DEFAULT ('node') NOT NULL = + REFERENCES rhnServer (id), + target_type VARCHAR2(10) + DEFAULT ('node') NOT NULL CONSTRAINT rhn_satnd_target_type_ck - CHECK (target_type in ( 'node' )), = - last_update_user VARCHAR2(40), = - last_update_date DATE, = - mac_address VARCHAR2(17) NOT NULL, = - max_concurrent_checks NUMBER, = - sat_cluster_id NUMBER NOT NULL, = - ip VARCHAR2(15), = - sched_log_level NUMBER = - DEFAULT (0) NOT NULL, = - sput_log_level NUMBER = - DEFAULT (0) NOT NULL, = - dq_log_level NUMBER = - DEFAULT (0) NOT NULL, = + CHECK (target_type in ( 'node' )), + last_update_user VARCHAR2(40), + last_update_date DATE, + mac_address VARCHAR2(17) NOT NULL, + max_concurrent_checks NUMBER, + sat_cluster_id NUMBER NOT NULL, + ip VARCHAR2(15), + sched_log_level NUMBER + DEFAULT (0) NOT NULL, + sput_log_level NUMBER + DEFAULT (0) NOT NULL, + dq_log_level NUMBER + DEFAULT (0) NOT NULL, scout_shared_key VARCHAR2(64) NOT NULL ) ENABLE ROW MOVEMENT @@ -57,11 +57,11 @@ CREATE UNIQUE INDEX rhn_sat_node_sid_idx = ALTER TABLE rhn_sat_node ADD CONSTRAINT rhn_satnd_cmdtg_rid_tar_ty_fk FOREIGN KEY (recid, targe= t_type) - REFERENCES rhn_command_target (recid, target_type) = + REFERENCES rhn_command_target (recid, target_type) ON DELETE CASCADE; = ALTER TABLE rhn_sat_node ADD CONSTRAINT rhn_satnd_satcl_sat_cl_id_fk FOREIGN KEY (sat_cluster_i= d) - REFERENCES rhn_sat_cluster (recid) = + REFERENCES rhn_sat_cluster (recid) ON DELETE CASCADE; = diff --git a/schema/spacewalk/common/tables/rhn_sat_node_probe.sql b/schema= /spacewalk/common/tables/rhn_sat_node_probe.sql index d5c64d5..af72ee1 100644 --- a/schema/spacewalk/common/tables/rhn_sat_node_probe.sql +++ b/schema/spacewalk/common/tables/rhn_sat_node_probe.sql @@ -7,22 +7,22 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_sat_node_probe ( - probe_id NUMBER NOT NULL = - CONSTRAINT rhn_sndpb_probe_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]], = - probe_type VARCHAR2(12) = - DEFAULT ('satnode') NOT NULL = + probe_id NUMBER NOT NULL + CONSTRAINT rhn_sndpb_probe_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]], + probe_type VARCHAR2(12) + DEFAULT ('satnode') NOT NULL CONSTRAINT rhn_sndpb_probe_type_ck - CHECK (probe_type =3D 'satnode'), = + CHECK (probe_type =3D 'satnode'), sat_node_id NUMBER NOT NULL ) ENABLE ROW MOVEMENT @@ -40,11 +40,11 @@ CREATE INDEX rhn_sndpb_pid_ptype_idx = ALTER TABLE rhn_sat_node_probe ADD CONSTRAINT rhn_sndpb_pr_recid_pr_typ_fk FOREIGN KEY (probe_id, pro= be_type) - REFERENCES rhn_probe (recid, probe_type) = + REFERENCES rhn_probe (recid, probe_type) ON DELETE CASCADE; = ALTER TABLE rhn_sat_node_probe ADD CONSTRAINT rhn_sndpb_satnd_sat_nd_id_fk FOREIGN KEY (sat_node_id) - REFERENCES rhn_sat_node (recid) = + REFERENCES rhn_sat_node (recid) ON DELETE CASCADE; = diff --git a/schema/spacewalk/common/tables/rhn_satellite_state.sql b/schem= a/spacewalk/common/tables/rhn_satellite_state.sql index 5f7ac2c..334acac 100644 --- a/schema/spacewalk/common/tables/rhn_satellite_state.sql +++ b/schema/spacewalk/common/tables/rhn_satellite_state.sql @@ -7,32 +7,32 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_satellite_state ( - satellite_id NUMBER NOT NULL = - CONSTRAINT rhn_satst_sat_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]], = - last_check DATE, = - probe_count NUMBER, = - pct_ok NUMBER, = - pct_warning NUMBER, = - pct_critical NUMBER, = - pct_unknown NUMBER, = - pct_pending NUMBER, = - recent_state_changes NUMBER, = - imminent_probes NUMBER, = - max_exec_time NUMBER, = - min_exec_time NUMBER, = - avg_exec_time NUMBER, = - max_latency NUMBER, = - min_latency NUMBER, = + satellite_id NUMBER NOT NULL + CONSTRAINT rhn_satst_sat_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]], + last_check DATE, + probe_count NUMBER, + pct_ok NUMBER, + pct_warning NUMBER, + pct_critical NUMBER, + pct_unknown NUMBER, + pct_pending NUMBER, + recent_state_changes NUMBER, + imminent_probes NUMBER, + max_exec_time NUMBER, + min_exec_time NUMBER, + avg_exec_time NUMBER, + max_latency NUMBER, + min_latency NUMBER, avg_latency NUMBER ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_schedule_days.sql b/schema/= spacewalk/common/tables/rhn_schedule_days.sql index c93f730..ff57570 100644 --- a/schema/spacewalk/common/tables/rhn_schedule_days.sql +++ b/schema/spacewalk/common/tables/rhn_schedule_days.sql @@ -7,31 +7,31 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_schedule_days ( - recid NUMBER NOT NULL = - CONSTRAINT rhn_schdy_recid_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]] = + recid NUMBER NOT NULL + CONSTRAINT rhn_schdy_recid_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]] CONSTRAINT rhn_schdy_recid_ck - CHECK (recid > 0), = - schedule_id NUMBER, = - ord NUMBER, = - start_1 DATE, = - end_1 DATE, = - start_2 DATE, = - end_2 DATE, = - start_3 DATE, = - end_3 DATE, = - start_4 DATE, = - end_4 DATE, = - last_update_user VARCHAR2(40), = + CHECK (recid > 0), + schedule_id NUMBER, + ord NUMBER, + start_1 DATE, + end_1 DATE, + start_2 DATE, + end_2 DATE, + start_3 DATE, + end_3 DATE, + start_4 DATE, + end_4 DATE, + last_update_user VARCHAR2(40), last_update_date VARCHAR2(40) ) ENABLE ROW MOVEMENT @@ -47,6 +47,6 @@ CREATE SEQUENCE rhn_schedule_days_recid_seq; = ALTER TABLE rhn_schedule_days ADD CONSTRAINT rhn_schdy_sched_schedule_id_fk FOREIGN KEY (schedule_id) - REFERENCES rhn_schedules (recid) = + REFERENCES rhn_schedules (recid) ON DELETE CASCADE; = diff --git a/schema/spacewalk/common/tables/rhn_schedule_days_norm.sql b/sc= hema/spacewalk/common/tables/rhn_schedule_days_norm.sql index b083433..aed690f 100644 --- a/schema/spacewalk/common/tables/rhn_schedule_days_norm.sql +++ b/schema/spacewalk/common/tables/rhn_schedule_days_norm.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_schedule_days_norm ( - schedule_id NUMBER, = - ord NUMBER, = - start_int NUMBER, = + schedule_id NUMBER, + ord NUMBER, + start_int NUMBER, end_int NUMBER ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_schedule_types.sql b/schema= /spacewalk/common/tables/rhn_schedule_types.sql index 1fd762f..a413336 100644 --- a/schema/spacewalk/common/tables/rhn_schedule_types.sql +++ b/schema/spacewalk/common/tables/rhn_schedule_types.sql @@ -7,20 +7,20 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_schedule_types ( - recid NUMBER NOT NULL = - CONSTRAINT rhn_schtp_recid_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]] = + recid NUMBER NOT NULL + CONSTRAINT rhn_schtp_recid_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]] CONSTRAINT rhn_schtp_recid_ck - CHECK (recid > 0), = + CHECK (recid > 0), description VARCHAR2(40) ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_schedule_weeks.sql b/schema= /spacewalk/common/tables/rhn_schedule_weeks.sql index 984716b..abfcb22 100644 --- a/schema/spacewalk/common/tables/rhn_schedule_weeks.sql +++ b/schema/spacewalk/common/tables/rhn_schedule_weeks.sql @@ -7,24 +7,24 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_schedule_weeks ( - recid NUMBER NOT NULL = - CONSTRAINT rhn_schwk_recid_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]] = + recid NUMBER NOT NULL + CONSTRAINT rhn_schwk_recid_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]] CONSTRAINT rhn_schwk_recid_ck - CHECK (recid > 0), = - schedule_id NUMBER NOT NULL, = - component_schedule_id NUMBER, = - ord NUMBER, = - last_update_user VARCHAR2(40), = + CHECK (recid > 0), + schedule_id NUMBER NOT NULL, + component_schedule_id NUMBER, + ord NUMBER, + last_update_user VARCHAR2(40), last_update_date DATE ) ENABLE ROW MOVEMENT @@ -48,6 +48,6 @@ ALTER TABLE rhn_schedule_weeks = ALTER TABLE rhn_schedule_weeks ADD CONSTRAINT rhn_schwk_sched_sched_id_fk FOREIGN KEY (schedule_id) - REFERENCES rhn_schedules (recid) = + REFERENCES rhn_schedules (recid) ON DELETE CASCADE; = diff --git a/schema/spacewalk/common/tables/rhn_schedules.sql b/schema/spac= ewalk/common/tables/rhn_schedules.sql index 6f6a606..9cb2f48 100644 --- a/schema/spacewalk/common/tables/rhn_schedules.sql +++ b/schema/spacewalk/common/tables/rhn_schedules.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_schedules ( - recid NUMBER NOT NULL = - CONSTRAINT rhn_sched_recid_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]] = + recid NUMBER NOT NULL + CONSTRAINT rhn_sched_recid_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]] CONSTRAINT rhn_sched_recid_ck - CHECK (recid > 0), = - schedule_type_id NUMBER NOT NULL, = - description VARCHAR2(40) = - DEFAULT ('unknown') NOT NULL, = - last_update_user VARCHAR2(40), = - last_update_date DATE, = + CHECK (recid > 0), + schedule_type_id NUMBER NOT NULL, + description VARCHAR2(40) + DEFAULT ('unknown') NOT NULL, + last_update_user VARCHAR2(40), + last_update_date DATE, customer_id NUMBER ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_semantic_data_type.sql b/sc= hema/spacewalk/common/tables/rhn_semantic_data_type.sql index d84c3e8..65f7dec 100644 --- a/schema/spacewalk/common/tables/rhn_semantic_data_type.sql +++ b/schema/spacewalk/common/tables/rhn_semantic_data_type.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_semantic_data_type ( - name VARCHAR2(10) NOT NULL = - CONSTRAINT rhn_sdtyp_name_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - description VARCHAR2(80) NOT NULL, = - label_name VARCHAR2(80), = - converter_name VARCHAR2(128), = - help_file VARCHAR2(128), = - last_update_user VARCHAR2(40), = + name VARCHAR2(10) NOT NULL + CONSTRAINT rhn_sdtyp_name_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + description VARCHAR2(80) NOT NULL, + label_name VARCHAR2(80), + converter_name VARCHAR2(128), + help_file VARCHAR2(128), + last_update_user VARCHAR2(40), last_update_date DATE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_server_monitoring_info.sql = b/schema/spacewalk/common/tables/rhn_server_monitoring_info.sql index d98b67a..f50aaf4 100644 --- a/schema/spacewalk/common/tables/rhn_server_monitoring_info.sql +++ b/schema/spacewalk/common/tables/rhn_server_monitoring_info.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_server_monitoring_info ( - recid NUMBER NOT NULL = - CONSTRAINT rhn_host_recid_pk PRIMARY KEY = - USING INDEX TABLESPACE [[4m_tbs]], = + recid NUMBER NOT NULL + CONSTRAINT rhn_host_recid_pk PRIMARY KEY + USING INDEX TABLESPACE [[4m_tbs]], os_id NUMBER ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_service_probe_origins.sql b= /schema/spacewalk/common/tables/rhn_service_probe_origins.sql index d6d3d44..8752798 100644 --- a/schema/spacewalk/common/tables/rhn_service_probe_origins.sql +++ b/schema/spacewalk/common/tables/rhn_service_probe_origins.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_service_probe_origins ( - service_probe_id NUMBER NOT NULL, = - origin_probe_id NUMBER, = - decoupled CHAR(1) = + service_probe_id NUMBER NOT NULL, + origin_probe_id NUMBER, + decoupled CHAR(1) DEFAULT ('0') NOT NULL ) ENABLE ROW MOVEMENT @@ -39,11 +39,11 @@ ALTER TABLE rhn_service_probe_origins = ALTER TABLE rhn_service_probe_origins ADD CONSTRAINT rhn_srvpo_chkpb_orig_pr_id_fk FOREIGN KEY (origin_probe= _id) - REFERENCES rhn_check_suite_probe (probe_id) = + REFERENCES rhn_check_suite_probe (probe_id) ON DELETE CASCADE; = ALTER TABLE rhn_service_probe_origins ADD CONSTRAINT rhn_srvpo_pr_serv_pr_fk FOREIGN KEY (service_probe_id) - REFERENCES rhn_probe (recid) = + REFERENCES rhn_probe (recid) ON DELETE CASCADE; = diff --git a/schema/spacewalk/common/tables/rhn_snmp_alert.sql b/schema/spa= cewalk/common/tables/rhn_snmp_alert.sql index c018390..0b463b8 100644 --- a/schema/spacewalk/common/tables/rhn_snmp_alert.sql +++ b/schema/spacewalk/common/tables/rhn_snmp_alert.sql @@ -7,35 +7,35 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_snmp_alert ( - recid NUMBER NOT NULL = - CONSTRAINT rhn_snmpa_recid_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]], = - sender_cluster_id NUMBER NOT NULL, = - dest_ip VARCHAR2(255) NOT NULL, = - dest_port NUMBER NOT NULL, = - date_generated DATE, = - date_submitted DATE, = - command_name VARCHAR2(255), = - notif_type NUMBER, = - op_center VARCHAR2(255), = - notif_url VARCHAR2(255), = - os_name VARCHAR2(128), = - message VARCHAR2(2000), = - probe_id NUMBER, = - host_ip VARCHAR2(255), = - severity NUMBER, = - command_id NUMBER, = - probe_class NUMBER, = - host_name VARCHAR2(255), = + recid NUMBER NOT NULL + CONSTRAINT rhn_snmpa_recid_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]], + sender_cluster_id NUMBER NOT NULL, + dest_ip VARCHAR2(255) NOT NULL, + dest_port NUMBER NOT NULL, + date_generated DATE, + date_submitted DATE, + command_name VARCHAR2(255), + notif_type NUMBER, + op_center VARCHAR2(255), + notif_url VARCHAR2(255), + os_name VARCHAR2(128), + message VARCHAR2(2000), + probe_id NUMBER, + host_ip VARCHAR2(255), + severity NUMBER, + command_id NUMBER, + probe_class NUMBER, + host_name VARCHAR2(255), support_center VARCHAR2(255) ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_strategies.sql b/schema/spa= cewalk/common/tables/rhn_strategies.sql index 548326a..3b97285 100644 --- a/schema/spacewalk/common/tables/rhn_strategies.sql +++ b/schema/spacewalk/common/tables/rhn_strategies.sql @@ -7,27 +7,27 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_strategies ( - recid NUMBER NOT NULL = - CONSTRAINT rhn_strat_recid_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]] = + recid NUMBER NOT NULL + CONSTRAINT rhn_strat_recid_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]] CONSTRAINT rhn_strat_recid_ck - CHECK (recid > 0), = - name VARCHAR2(80), = - comp_crit VARCHAR2(80), = - esc_crit VARCHAR2(80), = - contact_strategy VARCHAR2(32) = + CHECK (recid > 0), + name VARCHAR2(80), + comp_crit VARCHAR2(80), + esc_crit VARCHAR2(80), + contact_strategy VARCHAR2(32) CONSTRAINT rhn_strat_cont_strat_ck - CHECK (contact_strategy in ( 'Broadcast' , '= Escalate' )), = - ack_completed VARCHAR2(32) = + CHECK (contact_strategy in ( 'Broadcast' , '= Escalate' )), + ack_completed VARCHAR2(32) CONSTRAINT rhn_strat_ack_comp_ck CHECK (ack_completed in ( 'All' , 'One' , 'N= o' )) ) diff --git a/schema/spacewalk/common/tables/rhn_threshold_type.sql b/schema= /spacewalk/common/tables/rhn_threshold_type.sql index bf10d83..7a00c5c 100644 --- a/schema/spacewalk/common/tables/rhn_threshold_type.sql +++ b/schema/spacewalk/common/tables/rhn_threshold_type.sql @@ -7,21 +7,21 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_threshold_type ( - name VARCHAR2(10) NOT NULL = - CONSTRAINT rhn_trtyp_name_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - description VARCHAR2(80) NOT NULL, = - ordinal NUMBER NOT NULL, = - last_update_user VARCHAR2(40), = + name VARCHAR2(10) NOT NULL + CONSTRAINT rhn_trtyp_name_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + description VARCHAR2(80) NOT NULL, + ordinal NUMBER NOT NULL, + last_update_user VARCHAR2(40), last_update_date DATE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_time_zone_names.sql b/schem= a/spacewalk/common/tables/rhn_time_zone_names.sql index 5eb8f18..5619c9b 100644 --- a/schema/spacewalk/common/tables/rhn_time_zone_names.sql +++ b/schema/spacewalk/common/tables/rhn_time_zone_names.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_time_zone_names ( - recid NUMBER NOT NULL, = - java_id VARCHAR2(40) NOT NULL = - CONSTRAINT rhn_tznms_java_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - display_name VARCHAR2(60) NOT NULL, = - gmt_offset_minutes NUMBER NOT NULL, = - use_daylight_time CHAR(1) NOT NULL, = - last_update_user VARCHAR2(40), = + recid NUMBER NOT NULL, + java_id VARCHAR2(40) NOT NULL + CONSTRAINT rhn_tznms_java_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + display_name VARCHAR2(60) NOT NULL, + gmt_offset_minutes NUMBER NOT NULL, + use_daylight_time CHAR(1) NOT NULL, + last_update_user VARCHAR2(40), last_update_date DATE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_units.sql b/schema/spacewal= k/common/tables/rhn_units.sql index e7ed7e2..13f5ca3 100644 --- a/schema/spacewalk/common/tables/rhn_units.sql +++ b/schema/spacewalk/common/tables/rhn_units.sql @@ -7,25 +7,25 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_units ( - unit_id VARCHAR2(10) NOT NULL = - CONSTRAINT rhn_units_unit_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - quantum_id VARCHAR2(10) NOT NULL, = - unit_label VARCHAR2(20), = - description VARCHAR2(200), = - to_base_unit_fn VARCHAR2(2000), = - from_base_unit_fn VARCHAR2(2000), = - validate_fn VARCHAR2(2000), = - last_update_user VARCHAR2(40), = + unit_id VARCHAR2(10) NOT NULL + CONSTRAINT rhn_units_unit_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + quantum_id VARCHAR2(10) NOT NULL, + unit_label VARCHAR2(20), + description VARCHAR2(200), + to_base_unit_fn VARCHAR2(2000), + from_base_unit_fn VARCHAR2(2000), + validate_fn VARCHAR2(2000), + last_update_user VARCHAR2(40), last_update_date DATE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/rhn_url_probe.sql b/schema/spac= ewalk/common/tables/rhn_url_probe.sql index baf14f1..2b66288 100644 --- a/schema/spacewalk/common/tables/rhn_url_probe.sql +++ b/schema/spacewalk/common/tables/rhn_url_probe.sql @@ -7,42 +7,42 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_url_probe ( - username VARCHAR2(40), = - password VARCHAR2(255), = - cookie_enabled CHAR(1) = - DEFAULT (0) NOT NULL, = - multi_step CHAR(1) = - DEFAULT (0) NOT NULL = + username VARCHAR2(40), + password VARCHAR2(255), + cookie_enabled CHAR(1) + DEFAULT (0) NOT NULL, + multi_step CHAR(1) + DEFAULT (0) NOT NULL CONSTRAINT rhn_urlpb_multi_step_ck - CHECK (multi_step in ( '0' , '= 1' )), = - run_on_scouts CHAR(1) = - DEFAULT ('1') NOT NULL = + CHECK (multi_step in ( '0' , '= 1' )), + run_on_scouts CHAR(1) + DEFAULT ('1') NOT NULL CONSTRAINT rhn_urlpb_run_on_scouts= _ck - CHECK (run_on_scouts in ( '0' = , '1' )), = - probe_id NUMBER NOT NULL = - CONSTRAINT rhn_urlpb_probe_id_pk P= RIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]], = - probe_type VARCHAR2(12) = - DEFAULT ('url') NOT NULL = + CHECK (run_on_scouts in ( '0' = , '1' )), + probe_id NUMBER NOT NULL + CONSTRAINT rhn_urlpb_probe_id_pk P= RIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]], + probe_type VARCHAR2(12) + DEFAULT ('url') NOT NULL CONSTRAINT rhn_urlpb_probe_type_ck - CHECK (probe_type =3D 'url'), = - sat_cluster_id NUMBER, = - scout_warning_threshold_is_all CHAR(1) = - DEFAULT ('1') NOT NULL, = - scout_crit_threshold_is_all CHAR(1) = - DEFAULT ('1') NOT NULL, = - scout_warning_threshold NUMBER = - DEFAULT (-1), = - scout_critical_threshold NUMBER = + CHECK (probe_type =3D 'url'), + sat_cluster_id NUMBER, + scout_warning_threshold_is_all CHAR(1) + DEFAULT ('1') NOT NULL, + scout_crit_threshold_is_all CHAR(1) + DEFAULT ('1') NOT NULL, + scout_warning_threshold NUMBER + DEFAULT (-1), + scout_critical_threshold NUMBER DEFAULT (-1) ) ENABLE ROW MOVEMENT @@ -55,6 +55,6 @@ CREATE INDEX rhn_url_probe_pid_ptype_idx = ALTER TABLE rhn_url_probe ADD CONSTRAINT rhn_urlpb_probe_pr_id_pr_fk FOREIGN KEY (probe_id, prob= e_type) - REFERENCES rhn_probe (recid, probe_type) = + REFERENCES rhn_probe (recid, probe_type) ON DELETE CASCADE; = diff --git a/schema/spacewalk/common/tables/rhn_url_probe_step.sql b/schema= /spacewalk/common/tables/rhn_url_probe_step.sql index 5f88527..53f9184 100644 --- a/schema/spacewalk/common/tables/rhn_url_probe_step.sql +++ b/schema/spacewalk/common/tables/rhn_url_probe_step.sql @@ -7,68 +7,68 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_url_probe_step ( - recid NUMBER NOT NULL = - CONSTRAINT rhn_urlps_recid_pk PRIMARY KEY = - USING INDEX TABLESPACE [[2m_tbs]], = - url_probe_id NUMBER NOT NULL, = - step_number NUMBER NOT NULL, = - description VARCHAR2(255), = - url VARCHAR2(2000) NOT NULL, = - protocol_method VARCHAR2(12) NOT NULL, = - verify_links CHAR(1) = - DEFAULT (0) NOT NULL = + recid NUMBER NOT NULL + CONSTRAINT rhn_urlps_recid_pk PRIMARY KEY + USING INDEX TABLESPACE [[2m_tbs]], + url_probe_id NUMBER NOT NULL, + step_number NUMBER NOT NULL, + description VARCHAR2(255), + url VARCHAR2(2000) NOT NULL, + protocol_method VARCHAR2(12) NOT NULL, + verify_links CHAR(1) + DEFAULT (0) NOT NULL CONSTRAINT rhn_urlps_ver_links_ck - CHECK (verify_links in ( '0' , '1' )), = - load_subsidiary CHAR(1) = - DEFAULT (0) NOT NULL = + CHECK (verify_links in ( '0' , '1' )), + load_subsidiary CHAR(1) + DEFAULT (0) NOT NULL CONSTRAINT rhn_urlps_load_sub_ck - CHECK (load_subsidiary in ( '0' , '1' )), = - pattern VARCHAR2(255), = - vpattern VARCHAR2(255), = - post_content VARCHAR2(4000), = - post_content_type VARCHAR2(255), = - connect_warn NUMBER = - DEFAULT (0) NOT NULL, = - connect_crit NUMBER = - DEFAULT (0) NOT NULL, = - latency_warn NUMBER = - DEFAULT (0) NOT NULL, = - latency_crit NUMBER = - DEFAULT (0) NOT NULL, = - dns_warn NUMBER = - DEFAULT (0) NOT NULL, = - dns_crit NUMBER = - DEFAULT (0) NOT NULL, = - total_warn NUMBER = - DEFAULT (0) NOT NULL, = - total_crit NUMBER = - DEFAULT (0) NOT NULL, = - trans_warn NUMBER = - DEFAULT (0) NOT NULL, = - trans_crit NUMBER = - DEFAULT (0) NOT NULL, = - through_warn NUMBER = - DEFAULT (0) NOT NULL, = - through_crit NUMBER = - DEFAULT (0) NOT NULL, = - cookie_key VARCHAR2(255), = - cookie_value VARCHAR2(255), = - cookie_path VARCHAR2(255), = - cookie_domain VARCHAR2(255), = - cookie_port NUMBER, = - cookie_secure CHAR(1) = - DEFAULT (0) NOT NULL = + CHECK (load_subsidiary in ( '0' , '1' )), + pattern VARCHAR2(255), + vpattern VARCHAR2(255), + post_content VARCHAR2(4000), + post_content_type VARCHAR2(255), + connect_warn NUMBER + DEFAULT (0) NOT NULL, + connect_crit NUMBER + DEFAULT (0) NOT NULL, + latency_warn NUMBER + DEFAULT (0) NOT NULL, + latency_crit NUMBER + DEFAULT (0) NOT NULL, + dns_warn NUMBER + DEFAULT (0) NOT NULL, + dns_crit NUMBER + DEFAULT (0) NOT NULL, + total_warn NUMBER + DEFAULT (0) NOT NULL, + total_crit NUMBER + DEFAULT (0) NOT NULL, + trans_warn NUMBER + DEFAULT (0) NOT NULL, + trans_crit NUMBER + DEFAULT (0) NOT NULL, + through_warn NUMBER + DEFAULT (0) NOT NULL, + through_crit NUMBER + DEFAULT (0) NOT NULL, + cookie_key VARCHAR2(255), + cookie_value VARCHAR2(255), + cookie_path VARCHAR2(255), + cookie_domain VARCHAR2(255), + cookie_port NUMBER, + cookie_secure CHAR(1) + DEFAULT (0) NOT NULL CONSTRAINT rhn_urlps_cookie_sec_ck - CHECK (cookie_secure in ( '0' , '1' )), = + CHECK (cookie_secure in ( '0' , '1' )), cookie_maxage NUMBER ) ENABLE ROW MOVEMENT @@ -84,6 +84,6 @@ CREATE SEQUENCE rhn_url_probe_step_recid_seq; = ALTER TABLE rhn_url_probe_step ADD CONSTRAINT rhn_urlps_urlpb_url_pr_id_fk FOREIGN KEY (url_probe_id) - REFERENCES rhn_url_probe (probe_id) = + REFERENCES rhn_url_probe (probe_id) ON DELETE CASCADE; = diff --git a/schema/spacewalk/common/tables/rhn_widget.sql b/schema/spacewa= lk/common/tables/rhn_widget.sql index 3755af5..c5305ac 100644 --- a/schema/spacewalk/common/tables/rhn_widget.sql +++ b/schema/spacewalk/common/tables/rhn_widget.sql @@ -7,20 +7,20 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE rhn_widget ( - name VARCHAR2(20) NOT NULL = - CONSTRAINT rhn_wdget_name_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - description VARCHAR2(80) NOT NULL, = - last_update_user VARCHAR2(40), = + name VARCHAR2(20) NOT NULL + CONSTRAINT rhn_wdget_name_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + description VARCHAR2(80) NOT NULL, + last_update_user VARCHAR2(40), last_update_date DATE ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/state_change.sql b/schema/space= walk/common/tables/state_change.sql index ac55de6..47d8266 100644 --- a/schema/spacewalk/common/tables/state_change.sql +++ b/schema/spacewalk/common/tables/state_change.sql @@ -7,17 +7,17 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE state_change ( - o_id VARCHAR2(64) NOT NULL, = - entry_time NUMBER NOT NULL, = + o_id VARCHAR2(64) NOT NULL, + entry_time NUMBER NOT NULL, data VARCHAR2(4000) ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/valid_countries.sql b/schema/sp= acewalk/common/tables/valid_countries.sql index 3aeb92a..3575b73 100644 --- a/schema/spacewalk/common/tables/valid_countries.sql +++ b/schema/spacewalk/common/tables/valid_countries.sql @@ -7,18 +7,18 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE valid_countries ( - code VARCHAR2(2) NOT NULL = - CONSTRAINT valid_countries_pk PRIMARY KEY, = - short_name VARCHAR2(80) NOT NULL, = + code VARCHAR2(2) NOT NULL + CONSTRAINT valid_countries_pk PRIMARY KEY, + short_name VARCHAR2(80) NOT NULL, name VARCHAR2(240) ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/web_contact.sql b/schema/spacew= alk/common/tables/web_contact.sql index 75efced..3ff84b6 100644 --- a/schema/spacewalk/common/tables/web_contact.sql +++ b/schema/spacewalk/common/tables/web_contact.sql @@ -7,36 +7,36 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE web_contact ( - id NUMBER = - CONSTRAINT web_contact_pk PRIMARY KEY = - USING INDEX TABLESPACE [[web_index_tablespace_2= ]], = - org_id NUMBER NOT NULL = + id NUMBER + CONSTRAINT web_contact_pk PRIMARY KEY + USING INDEX TABLESPACE [[web_index_tablespace_2= ]], + org_id NUMBER NOT NULL CONSTRAINT web_contact_org_fk - REFERENCES web_customer (id), = - login VARCHAR2(64) NOT NULL, = - login_uc VARCHAR2(64) NOT NULL = - CONSTRAINT web_contact_login_uc_unq UNIQUE = - USING INDEX TABLESPACE [[web_index_tablespace_2= ]], = - password VARCHAR2(38) NOT NULL, = - old_password VARCHAR2(38), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = - DEFAULT (sysdate) NOT NULL, = - oracle_contact_id NUMBER = - CONSTRAINT web_contact_ocid_unq UNIQUE = - USING INDEX TABLESPACE [[web_index_tablespace_2= ]], = - ignore_flag CHAR(1) = - DEFAULT ('N') NOT NULL = + REFERENCES web_customer (id), + login VARCHAR2(64) NOT NULL, + login_uc VARCHAR2(64) NOT NULL + CONSTRAINT web_contact_login_uc_unq UNIQUE + USING INDEX TABLESPACE [[web_index_tablespace_2= ]], + password VARCHAR2(38) NOT NULL, + old_password VARCHAR2(38), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE + DEFAULT (sysdate) NOT NULL, + oracle_contact_id NUMBER + CONSTRAINT web_contact_ocid_unq UNIQUE + USING INDEX TABLESPACE [[web_index_tablespace_2= ]], + ignore_flag CHAR(1) + DEFAULT ('N') NOT NULL CONSTRAINT web_contact_ignore_ck CHECK (ignore_flag in ( 'N' , 'Y' )) ) diff --git a/schema/spacewalk/common/tables/web_customer.sql b/schema/space= walk/common/tables/web_customer.sql index d164251..8071617 100644 --- a/schema/spacewalk/common/tables/web_customer.sql +++ b/schema/spacewalk/common/tables/web_customer.sql @@ -7,33 +7,33 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE web_customer ( - id NUMBER NOT NULL = - CONSTRAINT web_customer_id_pk PRIMAR= Y KEY = - USING INDEX TABLESPACE [[web_index_t= ablespace_2]], = - name VARCHAR2(128) NOT NULL, = - oracle_customer_id NUMBER = - CONSTRAINT web_customer_ocid_unq UNI= QUE = - USING INDEX TABLESPACE [[web_index_t= ablespace_2]], = - oracle_customer_number NUMBER = - CONSTRAINT web_customer_ocn_unq UNIQ= UE = - USING INDEX TABLESPACE [[web_index_t= ablespace_2]], = - customer_type CHAR(1) = - DEFAULT ('P') NOT NULL = + id NUMBER NOT NULL + CONSTRAINT web_customer_id_pk PRIMAR= Y KEY + USING INDEX TABLESPACE [[web_index_t= ablespace_2]], + name VARCHAR2(128) NOT NULL, + oracle_customer_id NUMBER + CONSTRAINT web_customer_ocid_unq UNI= QUE + USING INDEX TABLESPACE [[web_index_t= ablespace_2]], + oracle_customer_number NUMBER + CONSTRAINT web_customer_ocn_unq UNIQ= UE + USING INDEX TABLESPACE [[web_index_t= ablespace_2]], + customer_type CHAR(1) + DEFAULT ('P') NOT NULL CONSTRAINT web_customer_type_list - CHECK (customer_type in ( 'B' , = 'P' )), = - credit_application_completed VARCHAR2(1), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + CHECK (customer_type in ( 'B' , = 'P' )), + credit_application_completed VARCHAR2(1), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) TABLESPACE [[web_tablespace_2]] diff --git a/schema/spacewalk/common/tables/web_customer_notification.sql b= /schema/spacewalk/common/tables/web_customer_notification.sql index 6072977..4325308 100644 --- a/schema/spacewalk/common/tables/web_customer_notification.sql +++ b/schema/spacewalk/common/tables/web_customer_notification.sql @@ -7,23 +7,23 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE web_customer_notification ( - id NUMBER NOT NULL = - CONSTRAINT web_cust_not_id_pk PRIMARY KEY = - USING INDEX TABLESPACE [[64k_tbs]], = - org_id NUMBER NOT NULL = + id NUMBER NOT NULL + CONSTRAINT web_cust_not_id_pk PRIMARY KEY + USING INDEX TABLESPACE [[64k_tbs]], + org_id NUMBER NOT NULL CONSTRAINT web_cust_not_oid_fk - REFERENCES web_customer (id) = - ON DELETE CASCADE, = - contact_email_address VARCHAR2(150) NOT NULL, = + REFERENCES web_customer (id) + ON DELETE CASCADE, + contact_email_address VARCHAR2(150) NOT NULL, creation_date DATE NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/web_user_contact_permission.sql= b/schema/spacewalk/common/tables/web_user_contact_permission.sql index 5d77f77..ed7df80 100644 --- a/schema/spacewalk/common/tables/web_user_contact_permission.sql +++ b/schema/spacewalk/common/tables/web_user_contact_permission.sql @@ -7,38 +7,38 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE web_user_contact_permission ( - web_user_id NUMBER NOT NULL = + web_user_id NUMBER NOT NULL CONSTRAINT contperm_wbuserid_fk - REFERENCES web_contact (id) = - ON DELETE CASCADE, = - email CHAR(1) = - DEFAULT ('N') = + REFERENCES web_contact (id) + ON DELETE CASCADE, + email CHAR(1) + DEFAULT ('N') CONSTRAINT wucp_email_ck - CHECK (email in ( 'Y' , 'N' )), = - mail CHAR(1) = - DEFAULT ('N') = + CHECK (email in ( 'Y' , 'N' )), + mail CHAR(1) + DEFAULT ('N') CONSTRAINT wucp_mail_ck - CHECK (mail in ( 'Y' , 'N' )), = - call CHAR(1) = - DEFAULT ('N') = + CHECK (mail in ( 'Y' , 'N' )), + call CHAR(1) + DEFAULT ('N') CONSTRAINT wucp_call_ck - CHECK (call in ( 'Y' , 'N' )), = - fax CHAR(1) = - DEFAULT ('N') = + CHECK (call in ( 'Y' , 'N' )), + fax CHAR(1) + DEFAULT ('N') CONSTRAINT wucp_fax_ck - CHECK (fax in ( 'Y' , 'N' )), = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = + CHECK (fax in ( 'Y' , 'N' )), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE DEFAULT (sysdate) NOT NULL ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/web_user_personal_info.sql b/sc= hema/spacewalk/common/tables/web_user_personal_info.sql index 1eabcce..29aa0e5 100644 --- a/schema/spacewalk/common/tables/web_user_personal_info.sql +++ b/schema/spacewalk/common/tables/web_user_personal_info.sql @@ -7,43 +7,43 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE web_user_personal_info ( - web_user_id NUMBER NOT NULL = + web_user_id NUMBER NOT NULL CONSTRAINT personal_info_web_user_id_fk - REFERENCES web_contact (id) = - ON DELETE CASCADE, = - prefix VARCHAR2(12) = - DEFAULT (' ') NOT NULL = + REFERENCES web_contact (id) + ON DELETE CASCADE, + prefix VARCHAR2(12) + DEFAULT (' ') NOT NULL CONSTRAINT wupi_prefix_fk - REFERENCES web_user_prefix (text), = - first_names VARCHAR2(128) NOT NULL, = - last_name VARCHAR2(128) NOT NULL, = - genqual VARCHAR2(12), = - parent_company VARCHAR2(128), = - company VARCHAR2(128), = - title VARCHAR2(128), = - phone VARCHAR2(128), = - fax VARCHAR2(128), = - email VARCHAR2(128), = - email_uc VARCHAR2(128), = - pin NUMBER, = - created DATE = - DEFAULT (sysdate) NOT NULL, = - modified DATE = - DEFAULT (sysdate) NOT NULL, = - first_names_ol VARCHAR2(128), = - last_name_ol VARCHAR2(128), = - genqual_ol VARCHAR2(12), = - parent_company_ol VARCHAR2(128), = - company_ol VARCHAR2(128), = + REFERENCES web_user_prefix (text), + first_names VARCHAR2(128) NOT NULL, + last_name VARCHAR2(128) NOT NULL, + genqual VARCHAR2(12), + parent_company VARCHAR2(128), + company VARCHAR2(128), + title VARCHAR2(128), + phone VARCHAR2(128), + fax VARCHAR2(128), + email VARCHAR2(128), + email_uc VARCHAR2(128), + pin NUMBER, + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE + DEFAULT (sysdate) NOT NULL, + first_names_ol VARCHAR2(128), + last_name_ol VARCHAR2(128), + genqual_ol VARCHAR2(12), + parent_company_ol VARCHAR2(128), + company_ol VARCHAR2(128), title_ol VARCHAR2(128) ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/web_user_prefix.sql b/schema/sp= acewalk/common/tables/web_user_prefix.sql index e6b2b6c..041d3f7 100644 --- a/schema/spacewalk/common/tables/web_user_prefix.sql +++ b/schema/spacewalk/common/tables/web_user_prefix.sql @@ -7,16 +7,16 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE web_user_prefix ( - text VARCHAR2(12) NOT NULL = + text VARCHAR2(12) NOT NULL CONSTRAINT wup_text_pk PRIMARY KEY ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/web_user_site_info.sql b/schema= /spacewalk/common/tables/web_user_site_info.sql index 1109544..f5a990d 100644 --- a/schema/spacewalk/common/tables/web_user_site_info.sql +++ b/schema/spacewalk/common/tables/web_user_site_info.sql @@ -7,56 +7,56 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE web_user_site_info ( - id NUMBER NOT NULL = - CONSTRAINT wusi_id_pk PRIMARY KEY, = - web_user_id NUMBER = + id NUMBER NOT NULL + CONSTRAINT wusi_id_pk PRIMARY KEY, + web_user_id NUMBER CONSTRAINT wusi_wuid_fk - REFERENCES web_contact (id) = - ON DELETE CASCADE, = - email VARCHAR2(128), = - email_uc VARCHAR2(128), = - alt_first_names VARCHAR2(128), = - alt_last_name VARCHAR2(128), = - address1 VARCHAR2(128) NOT NULL, = - address2 VARCHAR2(128), = - address3 VARCHAR2(128), = - address4 VARCHAR2(128), = - city VARCHAR2(128) NOT NULL, = - state VARCHAR2(64), = - zip VARCHAR2(64), = - country CHAR(2) NOT NULL, = - phone VARCHAR2(32), = - fax VARCHAR2(32), = - url VARCHAR2(128), = - is_po_box CHAR(1) = - DEFAULT ('0') = + REFERENCES web_contact (id) + ON DELETE CASCADE, + email VARCHAR2(128), + email_uc VARCHAR2(128), + alt_first_names VARCHAR2(128), + alt_last_name VARCHAR2(128), + address1 VARCHAR2(128) NOT NULL, + address2 VARCHAR2(128), + address3 VARCHAR2(128), + address4 VARCHAR2(128), + city VARCHAR2(128) NOT NULL, + state VARCHAR2(64), + zip VARCHAR2(64), + country CHAR(2) NOT NULL, + phone VARCHAR2(32), + fax VARCHAR2(32), + url VARCHAR2(128), + is_po_box CHAR(1) + DEFAULT ('0') CONSTRAINT wusi_ipb_ck - CHECK (is_po_box in ( '1' , '0' )), = - type CHAR(1) = + CHECK (is_po_box in ( '1' , '0' )), + type CHAR(1) CONSTRAINT wusi_type_fk - REFERENCES web_user_site_type (type), = - oracle_site_id VARCHAR2(32), = - notes VARCHAR2(2000), = - created DATE = - DEFAULT (sysdate), = - modified DATE = - DEFAULT (sysdate), = - alt_first_names_ol VARCHAR2(128), = - alt_last_name_ol VARCHAR2(128), = - address1_ol VARCHAR2(128), = - address2_ol VARCHAR2(128), = - address3_ol VARCHAR2(128), = - city_ol VARCHAR2(128), = - state_ol VARCHAR2(32), = + REFERENCES web_user_site_type (type), + oracle_site_id VARCHAR2(32), + notes VARCHAR2(2000), + created DATE + DEFAULT (sysdate), + modified DATE + DEFAULT (sysdate), + alt_first_names_ol VARCHAR2(128), + alt_last_name_ol VARCHAR2(128), + address1_ol VARCHAR2(128), + address2_ol VARCHAR2(128), + address3_ol VARCHAR2(128), + city_ol VARCHAR2(128), + state_ol VARCHAR2(32), zip_ol VARCHAR2(32) ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/common/tables/web_user_site_type.sql b/schema= /spacewalk/common/tables/web_user_site_type.sql index cbc77f1..eca7ba4 100644 --- a/schema/spacewalk/common/tables/web_user_site_type.sql +++ b/schema/spacewalk/common/tables/web_user_site_type.sql @@ -7,17 +7,17 @@ -- 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. = +-- in this software or its documentation. -- = = CREATE TABLE web_user_site_type ( - type CHAR(1) NOT NULL = - CONSTRAINT wust_type_pk PRIMARY KEY, = + type CHAR(1) NOT NULL + CONSTRAINT wust_type_pk PRIMARY KEY, description VARCHAR2(64) NOT NULL ) ENABLE ROW MOVEMENT --===============2054940310297247802==-- From partha at fedoraproject.org Thu Aug 20 11:57:30 2015 Content-Type: multipart/mixed; boundary="===============8502259812179071022==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Fri, 12 Jun 2009 16:50:31 +0000 Message-ID: <20090612165031.278711201A2@lists.fedorahosted.org> --===============8502259812179071022== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyCreateActi= onTest.java | 4 ++-- java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartIpRan= geActionTest.java | 6 +++--- java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartParti= tionActionTest.java | 2 +- java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartScrip= tActionTest.java | 2 +- java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/= MethodActionTest.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) New commits: commit 150007fa2debc88363f5730c10583085bbe63491 Author: Partha Aji Date: Fri Jun 12 12:52:45 2009 -0400 Fixed a set of unit tests which owere looking for ActtionMessagess inst= ead of ActionErrors diff --git a/java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoK= eyCreateActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/keys= /test/CryptoKeyCreateActionTest.java index 3b6432f..6b9eb6b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyCreat= eActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyCreat= eActionTest.java @@ -50,7 +50,7 @@ public class CryptoKeyCreateActionTest extends RhnMockStr= utsTestCase { actionPerform(); assertNotNull(request.getAttribute(CryptoKeyCreateAction.KEY)); String[] keys =3D {"crypto.key.nokey"}; - verifyActionMessages(keys); + verifyActionErrors(keys); } = public void testEdit() throws Exception { @@ -67,7 +67,7 @@ public class CryptoKeyCreateActionTest extends RhnMockStr= utsTestCase { key.getId().toString()); actionPerform(); String[] keys =3D {"crypto.key.nokey"}; - verifyActionMessages(keys); + verifyActionErrors(keys); } } = diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/Ki= ckstartIpRangeActionTest.java b/java/code/src/com/redhat/rhn/frontend/actio= n/kickstart/test/KickstartIpRangeActionTest.java index 54978c4..524c810 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/Kickstart= IpRangeActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/Kickstart= IpRangeActionTest.java @@ -113,7 +113,7 @@ public class KickstartIpRangeActionTest extends RhnMock= StrutsTestCase { actionPerform(); assertNotNull(request.getAttribute(RequestContext.KICKSTART)); String[] keys =3D {"kickstart.iprange_validate.failure"}; - verifyActionMessages(keys); + verifyActionErrors(keys); } = public void testConflictFailure() throws Exception { = @@ -149,7 +149,7 @@ public class KickstartIpRangeActionTest extends RhnMock= StrutsTestCase { actionPerform(); assertNotNull(request.getAttribute(RequestContext.KICKSTART)); String[] keys =3D {"kickstart.iprange_conflict.failure"}; - verifyActionMessages(keys); = + verifyActionErrors(keys); = } = public void testDeleteSuccess() throws Exception { @@ -202,7 +202,7 @@ public class KickstartIpRangeActionTest extends RhnMock= StrutsTestCase { = actionPerform(); = String[] keys =3D {"kickstart.iprange_delete.failure"}; - verifyActionMessages(keys); = + verifyActionErrors(keys); = } = } = diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/Ki= ckstartPartitionActionTest.java b/java/code/src/com/redhat/rhn/frontend/act= ion/kickstart/test/KickstartPartitionActionTest.java index d32a8dc..0f512a2 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/Kickstart= PartitionActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/Kickstart= PartitionActionTest.java @@ -90,7 +90,7 @@ public class KickstartPartitionActionTest extends RhnMock= StrutsTestCase { assertTrue(formval.length() > 0); = String[] keys =3D {"kickstart.partition.duplicate"}; - verifyActionMessages(keys); + verifyActionErrors(keys); } = public void testMultipleSwapsSubmit() throws Exception { diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/Ki= ckstartScriptActionTest.java b/java/code/src/com/redhat/rhn/frontend/action= /kickstart/test/KickstartScriptActionTest.java index 3db72a8..2f1f8e8 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/Kickstart= ScriptActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/Kickstart= ScriptActionTest.java @@ -61,7 +61,7 @@ public class KickstartScriptActionTest extends BaseKickst= artEditTestCase { setRequestPathInfo("/kickstart/KickstartScriptCreate"); actionPerform(); String[] keys =3D {"kickstart.script.toolarge"}; - verifyActionMessages(keys); + verifyActionErrors(keys); = contents =3D RandomStringUtils.randomAscii(50000); addRequestParameter(KickstartScriptCreateAction.CONTENTS, = diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notifi= cation/test/MethodActionTest.java b/java/code/src/com/redhat/rhn/frontend/a= ction/monitoring/notification/test/MethodActionTest.java index fa03fee..a12bee9 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/= test/MethodActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/= test/MethodActionTest.java @@ -77,7 +77,7 @@ public class MethodActionTest extends RhnMockStrutsTestCa= se { addRequestParameter(RhnAction.SUBMITTED, "true"); executeSubmit("/WEB-INF/pages/admin/" + "monitoring/config/notification/method-create.jsp"); - verifyActionMessages(new String[] {"method.nametaken"}); + verifyActionErrors(new String[] {"method.nametaken"}); } = = public Method executeSubmit(String expectedFwd) throws Exception { --===============8502259812179071022==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:30 2015 Content-Type: multipart/mixed; boundary="===============1946299999659091557==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Fri, 12 Jun 2009 17:11:30 +0000 Message-ID: <20090612171130.6504F1201A2@lists.fedorahosted.org> --===============1946299999659091557== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml = | 1 = java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java = | 7 ++ java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.hbm.xml = | 2 = java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.java = | 28 +++++++++ java/code/src/com/redhat/rhn/frontend/dto/EssentialChannelDto.java = | 29 +++++++++- java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java = | 7 -- 6 files changed, 65 insertions(+), 9 deletions(-) New commits: commit 9eb1f53ec0dcb3c0da6f05b10eada79a2b26f869 Author: Pradeep Kilambi Date: Fri Jun 12 13:11:17 2009 -0400 505616 - Fixing the eus logic that gets the latest and the default eus = channels to not depend on is_default column. Thanks to jsherril for his hel= p on this. diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_= queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel= _queries.xml index ecfa02e..6e59af5 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml @@ -840,6 +840,7 @@ SELECT C.id, C.name, C.label, 1 AS IS_CUSTOM select unique c.id, c.label, c.name, + rcm.release, 0 AS IS_CUSTOM from rhnChannelPermissions cp, diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.jav= a b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java index de9462a..4837cf1 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java +++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java @@ -636,8 +636,13 @@ public class ChannelFactory extends HibernateFactory { = Map params =3D new HashMap(); params.put("channel", channel); - return (ReleaseChannelMap)singleton.lookupObjectByNamedQuery( + List list =3D singleton.listObjectsByNamedQuery( "ReleaseChannelMap.findDefaultForChannel", params); + if (list.isEmpty()) { + return null; + } + Collections.sort(list); + return list.get(0); } = /** diff --git a/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.= hbm.xml b/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.hbm= .xml index 537a26a..f478468 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.hbm.xml +++ b/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.hbm.xml @@ -32,7 +32,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" = diff --git a/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.= java b/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.java index f4f48b5..ab52867 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.java +++ b/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.java @@ -14,17 +14,24 @@ */ package com.redhat.rhn.domain.channel; = +import org.apache.commons.collections.ComparatorUtils; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; = +import com.redhat.rhn.common.util.DynamicComparator; + import java.io.Serializable; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; = = /** * ReleaseChannelMap * @version $Rev$ */ -public class ReleaseChannelMap implements Serializable { +public class ReleaseChannelMap implements Serializable, = + Comparable { = private String product; private String version; @@ -124,5 +131,24 @@ public class ReleaseChannelMap implements Serializable= { return new HashCodeBuilder().append(getProduct()).append(getVersio= n()).append( getRelease()).append(getChannelArch()).append(getChannel()= ).toHashCode(); } + + /** + * compare to ReleaseChannelMap + * @param o the other object + * @return the compare return + */ + public int compareTo(ReleaseChannelMap o) { + List compar =3D new ArrayList(); + = + compar.add(new DynamicComparator("channel", true)); + compar.add(new DynamicComparator("channelArch", true)); + compar.add(new DynamicComparator("product", true)); + compar.add(new DynamicComparator("version", true)); + compar.add(new DynamicComparator("release", true)); + = + Comparator com =3D ComparatorUtils.chainedComparator( + (Comparator[]) compar.toArray()); + return com.compare(this, o); + } = } diff --git a/java/code/src/com/redhat/rhn/frontend/dto/EssentialChannelDto.= java b/java/code/src/com/redhat/rhn/frontend/dto/EssentialChannelDto.java index b856c56..a0c327d 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/EssentialChannelDto.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/EssentialChannelDto.java @@ -21,13 +21,15 @@ import com.redhat.rhn.domain.channel.Channel; * EssentialChannelDto * @version $Rev$ */ -public class EssentialChannelDto extends BaseDto { +public class EssentialChannelDto extends BaseDto = + implements Comparable { = private Long id; private Long ownerId; private String name; private String label; private boolean isCustom; + private String release; = /** * Constructor @@ -47,6 +49,22 @@ public class EssentialChannelDto extends BaseDto { } = /** + * get release + * @return the release + */ + public String getRelease() { + return release; + } + + /** + * set release + * @param releaseIn the release + */ + public void setRelease(String releaseIn) { + this.release =3D releaseIn; + } + + /** * {@inheritDoc} */ @Override @@ -133,4 +151,13 @@ public class EssentialChannelDto extends BaseDto { this.ownerId =3D ownerIdIn; } = + /** + * compare to another EssentialChannelDto + * @param o the other object + * @return the compare + */ + public int compareTo(EssentialChannelDto o) { + return this.getRelease().compareTo(o.getRelease()); + } + } diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.ja= va b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java index 526b4e7..e12c35e 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -2277,11 +2277,8 @@ public class ChannelManager extends BaseManager { if (dr.size() =3D=3D 0) { return null; } - else if (dr.size() > 1) { - throw new LookupException( - "Found multiple default EUS channels for RHEL version.= "); - } - return (EssentialChannelDto)dr.get(0); + Collections.sort(dr); + return (EssentialChannelDto) dr.get(dr.size() - 1); } = /** --===============1946299999659091557==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:30 2015 Content-Type: multipart/mixed; boundary="===============8022477720462069227==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Fri, 12 Jun 2009 17:11:58 +0000 Message-ID: <20090612171158.0FD941201A2@lists.fedorahosted.org> --===============8022477720462069227== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml = | 1 = java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java = | 7 ++ java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.hbm.xml = | 2 = java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.java = | 28 +++++++++ java/code/src/com/redhat/rhn/frontend/dto/EssentialChannelDto.java = | 29 +++++++++- java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java = | 7 -- 6 files changed, 65 insertions(+), 9 deletions(-) New commits: commit b1378ec99b45d53c49468b59206d81fb29569c79 Author: Pradeep Kilambi Date: Fri Jun 12 13:11:17 2009 -0400 505616 - Fixing the eus logic that gets the latest and the default eus = channels to not depend on is_default column. Thanks to jsherril for his hel= p on this. diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_= queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel= _queries.xml index 2e8a38a..90ccc2f 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml @@ -840,6 +840,7 @@ SELECT C.id, C.name, C.label, 1 AS IS_CUSTOM select unique c.id, c.label, c.name, + rcm.release, 0 AS IS_CUSTOM from rhnChannelPermissions cp, diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.jav= a b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java index de9462a..4837cf1 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java +++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java @@ -636,8 +636,13 @@ public class ChannelFactory extends HibernateFactory { = Map params =3D new HashMap(); params.put("channel", channel); - return (ReleaseChannelMap)singleton.lookupObjectByNamedQuery( + List list =3D singleton.listObjectsByNamedQuery( "ReleaseChannelMap.findDefaultForChannel", params); + if (list.isEmpty()) { + return null; + } + Collections.sort(list); + return list.get(0); } = /** diff --git a/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.= hbm.xml b/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.hbm= .xml index 537a26a..f478468 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.hbm.xml +++ b/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.hbm.xml @@ -32,7 +32,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" = diff --git a/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.= java b/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.java index f4f48b5..ab52867 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.java +++ b/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.java @@ -14,17 +14,24 @@ */ package com.redhat.rhn.domain.channel; = +import org.apache.commons.collections.ComparatorUtils; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; = +import com.redhat.rhn.common.util.DynamicComparator; + import java.io.Serializable; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; = = /** * ReleaseChannelMap * @version $Rev$ */ -public class ReleaseChannelMap implements Serializable { +public class ReleaseChannelMap implements Serializable, = + Comparable { = private String product; private String version; @@ -124,5 +131,24 @@ public class ReleaseChannelMap implements Serializable= { return new HashCodeBuilder().append(getProduct()).append(getVersio= n()).append( getRelease()).append(getChannelArch()).append(getChannel()= ).toHashCode(); } + + /** + * compare to ReleaseChannelMap + * @param o the other object + * @return the compare return + */ + public int compareTo(ReleaseChannelMap o) { + List compar =3D new ArrayList(); + = + compar.add(new DynamicComparator("channel", true)); + compar.add(new DynamicComparator("channelArch", true)); + compar.add(new DynamicComparator("product", true)); + compar.add(new DynamicComparator("version", true)); + compar.add(new DynamicComparator("release", true)); + = + Comparator com =3D ComparatorUtils.chainedComparator( + (Comparator[]) compar.toArray()); + return com.compare(this, o); + } = } diff --git a/java/code/src/com/redhat/rhn/frontend/dto/EssentialChannelDto.= java b/java/code/src/com/redhat/rhn/frontend/dto/EssentialChannelDto.java index b856c56..a0c327d 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/EssentialChannelDto.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/EssentialChannelDto.java @@ -21,13 +21,15 @@ import com.redhat.rhn.domain.channel.Channel; * EssentialChannelDto * @version $Rev$ */ -public class EssentialChannelDto extends BaseDto { +public class EssentialChannelDto extends BaseDto = + implements Comparable { = private Long id; private Long ownerId; private String name; private String label; private boolean isCustom; + private String release; = /** * Constructor @@ -47,6 +49,22 @@ public class EssentialChannelDto extends BaseDto { } = /** + * get release + * @return the release + */ + public String getRelease() { + return release; + } + + /** + * set release + * @param releaseIn the release + */ + public void setRelease(String releaseIn) { + this.release =3D releaseIn; + } + + /** * {@inheritDoc} */ @Override @@ -133,4 +151,13 @@ public class EssentialChannelDto extends BaseDto { this.ownerId =3D ownerIdIn; } = + /** + * compare to another EssentialChannelDto + * @param o the other object + * @return the compare + */ + public int compareTo(EssentialChannelDto o) { + return this.getRelease().compareTo(o.getRelease()); + } + } diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.ja= va b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java index 2df1781..7c55ef7 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -2300,11 +2300,8 @@ public class ChannelManager extends BaseManager { if (dr.size() =3D=3D 0) { return null; } - else if (dr.size() > 1) { - throw new LookupException( - "Found multiple default EUS channels for RHEL version.= "); - } - return (EssentialChannelDto)dr.get(0); + Collections.sort(dr); + return (EssentialChannelDto) dr.get(dr.size() - 1); } = /** --===============8022477720462069227==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:30 2015 Content-Type: multipart/mixed; boundary="===============3700247884442339501==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: client/rhel Date: Fri, 12 Jun 2009 17:53:08 +0000 Message-ID: <20090612175308.344B41201A2@lists.fedorahosted.org> --===============3700247884442339501== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py | 7 +++---- client/rhel/yum-rhn-plugin/rhnplugin.py | 5 ----- 2 files changed, 3 insertions(+), 9 deletions(-) New commits: commit aee14cc5550eaf4ca9ecc4b6638dbbda3bfba5cd Author: Pradeep Kilambi Date: Fri Jun 12 13:53:01 2009 -0400 467866 - Raise a more cleaner message if clients end up getting badStat= usLine error due to 502 proxy errors diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py b= /client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py index 9ae69c2..1ed7a30 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py @@ -41,8 +41,9 @@ class RetryServer(rpclib.Server): except rpclib.Fault: raise except httplib.BadStatusLine: - raise up2dateErrors.ServerUnavailableError( - "Server Unavailable. Please try later.") = + stdoutMsgCallback( + _("Error: Server Unavailable. Please try later.")) + sys.exit(-1) except: server =3D self.serverList.next() if server =3D=3D None: @@ -287,8 +288,6 @@ def doCall(method, *args, **kwargs): attempt_count =3D attempt_count + 1 = if attempt_count > attempts: - print "busted2" - print method raise up2dateErrors.CommunicationError("The data returned from= the server was incomplete") = return ret diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py b/client/rhel/yum-rhn-= plugin/rhnplugin.py index 273bfd1..3c572f4 100644 --- a/client/rhel/yum-rhn-plugin/rhnplugin.py +++ b/client/rhel/yum-rhn-plugin/rhnplugin.py @@ -115,11 +115,6 @@ def init_hook(conduit): str(e)) rhn_enabled =3D False return - except up2dateErrors.ServerUnavailableError: - conduit.error(0, _("Server is Unavailable temporarily. Please try = again later.") + "\n" + - RHN_DISABLED) - rhn_enabled =3D False - return = if not login_info: conduit.error(0, _("This system is not registered with RHN.") + "\= n" + --===============3700247884442339501==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:30 2015 Content-Type: multipart/mixed; boundary="===============5358629682982081623==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Fri, 12 Jun 2009 19:45:15 +0000 Message-ID: <20090612194515.41DEE1201A2@lists.fedorahosted.org> --===============5358629682982081623== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java = | 28 +++++----- 1 file changed, 14 insertions(+), 14 deletions(-) New commits: commit 3ced128e79cfd7141be0b96fa010a7928ce72527 Author: Devan Goodwin Date: Fri Jun 12 16:44:02 2009 -0300 Fix some of the failing EUS unit tests. diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManag= erTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelMana= gerTest.java index 0e936b1..b056d92 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java +++ b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java @@ -350,7 +350,7 @@ public class ChannelManagerTest extends BaseTestCaseWit= hUser { } = public static void createReleaseChannelMap(Channel channel, String pro= duct, = - String version, String release, char isDefault) { + String version, String release) { = ReleaseChannelMap rcm =3D new ReleaseChannelMap(); rcm.setChannel(channel); @@ -366,7 +366,7 @@ public class ChannelManagerTest extends BaseTestCaseWit= hUser { String version =3D "5Server"; String release =3D "5.0.0"; ChannelManagerTest.createReleaseChannelMap(base1, "MAP_OS", versio= n, = - release, 'Y'); + release); = ReleaseChannelMap rcm =3D ChannelManager.lookupDefaultReleaseChann= elMapForChannel( base1); @@ -380,6 +380,8 @@ public class ChannelManagerTest extends BaseTestCaseWit= hUser { String release =3D "5.0.0"; s =3D ServerTestUtils.addRedhatReleasePackageToServer(user, s, ver= sion, release); = + String release2 =3D "5.2.0"; + String release3 =3D "5.3.0"; // Create some base channels and corresponding entries in rhnRelea= seChannelMap: Channel base1 =3D ChannelFactoryTest.createBaseChannel(user); Channel base2 =3D ChannelFactoryTest.createBaseChannel(user); @@ -390,9 +392,9 @@ public class ChannelManagerTest extends BaseTestCaseWit= hUser { ChannelFactoryTest.createBaseChannel(user); = ChannelManagerTest.createReleaseChannelMap(base1, = - ChannelManager.RHEL_PRODUCT_NAME, version, release, 'N'); + ChannelManager.RHEL_PRODUCT_NAME, version, release2); ChannelManagerTest.createReleaseChannelMap(base2, = - ChannelManager.RHEL_PRODUCT_NAME, version, release, 'N'); + ChannelManager.RHEL_PRODUCT_NAME, version, release3); = List channels =3D ChannelManager.listBaseChan= nelsForSystem( user, s); @@ -410,18 +412,16 @@ public class ChannelManagerTest extends BaseTestCaseW= ithUser { // Create some base channels and corresponding entries in rhnRelea= seChannelMap: Channel base1 =3D ChannelFactoryTest.createBaseChannel(user); Channel base2 =3D ChannelFactoryTest.createBaseChannel(user); - // not sure why we create this third one, but I'll leave it here. - // jesusr 2007/11/15 ChannelFactoryTest.createBaseChannel(user); + = ChannelManagerTest.createReleaseChannelMap(base1, = - ChannelManager.RHEL_PRODUCT_NAME, version, release, 'N'); + ChannelManager.RHEL_PRODUCT_NAME, version, "5.0.1"); ChannelManagerTest.createReleaseChannelMap(base2, = - ChannelManager.RHEL_PRODUCT_NAME, version, release, 'N'); + ChannelManager.RHEL_PRODUCT_NAME, version, "5.0.2"); = List channels =3D ChannelManager. listBaseEusChannelsByVersionReleaseAndChannelArch(user, versio= n, release, = base1.getChannelArch().getId()); - = assertTrue(channels.size() >=3D 2); } = @@ -440,9 +440,9 @@ public class ChannelManagerTest extends BaseTestCaseWit= hUser { // jesusr 2007/11/15 ChannelFactoryTest.createBaseChannel(user); ChannelManagerTest.createReleaseChannelMap(base1, = - ChannelManager.RHEL_PRODUCT_NAME, version, release, 'N'); + ChannelManager.RHEL_PRODUCT_NAME, version, release); ChannelManagerTest.createReleaseChannelMap(base2, = - ChannelManager.RHEL_PRODUCT_NAME, version, release2, 'Y'); + ChannelManager.RHEL_PRODUCT_NAME, version, release2); = EssentialChannelDto channel =3D ChannelManager. lookupLatestEusChannelForRhelVersion(user, version, = @@ -462,14 +462,14 @@ public class ChannelManagerTest extends BaseTestCaseW= ithUser { Channel base1 =3D ChannelFactoryTest.createBaseChannel(user); Channel base2 =3D ChannelFactoryTest.createBaseChannel(user); ChannelManagerTest.createReleaseChannelMap(base1, TEST_OS, version= , = - release, 'N'); + release); ChannelManagerTest.createReleaseChannelMap(base2, TEST_OS, version= , = - release2, 'N'); + release2); = EssentialChannelDto channel =3D ChannelManager. lookupLatestEusChannelForRhelVersion(user, version, = base1.getChannelArch().getId()); - assertNull(channel); + assertEquals(base2.getId(), channel.getId()); } = public void testIsChannelFree() throws Exception { --===============5358629682982081623==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:30 2015 Content-Type: multipart/mixed; boundary="===============8653206269264350535==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Fri, 12 Jun 2009 19:45:59 +0000 Message-ID: <20090612194559.F0CE21201A2@lists.fedorahosted.org> --===============8653206269264350535== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java = | 28 +++++----- 1 file changed, 14 insertions(+), 14 deletions(-) New commits: commit 4bc37b63489bfa735755c1f34478fbb3e1fa6309 Author: Devan Goodwin Date: Fri Jun 12 16:44:02 2009 -0300 Fix some of the failing EUS unit tests. diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManag= erTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelMana= gerTest.java index 0e936b1..b056d92 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java +++ b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java @@ -350,7 +350,7 @@ public class ChannelManagerTest extends BaseTestCaseWit= hUser { } = public static void createReleaseChannelMap(Channel channel, String pro= duct, = - String version, String release, char isDefault) { + String version, String release) { = ReleaseChannelMap rcm =3D new ReleaseChannelMap(); rcm.setChannel(channel); @@ -366,7 +366,7 @@ public class ChannelManagerTest extends BaseTestCaseWit= hUser { String version =3D "5Server"; String release =3D "5.0.0"; ChannelManagerTest.createReleaseChannelMap(base1, "MAP_OS", versio= n, = - release, 'Y'); + release); = ReleaseChannelMap rcm =3D ChannelManager.lookupDefaultReleaseChann= elMapForChannel( base1); @@ -380,6 +380,8 @@ public class ChannelManagerTest extends BaseTestCaseWit= hUser { String release =3D "5.0.0"; s =3D ServerTestUtils.addRedhatReleasePackageToServer(user, s, ver= sion, release); = + String release2 =3D "5.2.0"; + String release3 =3D "5.3.0"; // Create some base channels and corresponding entries in rhnRelea= seChannelMap: Channel base1 =3D ChannelFactoryTest.createBaseChannel(user); Channel base2 =3D ChannelFactoryTest.createBaseChannel(user); @@ -390,9 +392,9 @@ public class ChannelManagerTest extends BaseTestCaseWit= hUser { ChannelFactoryTest.createBaseChannel(user); = ChannelManagerTest.createReleaseChannelMap(base1, = - ChannelManager.RHEL_PRODUCT_NAME, version, release, 'N'); + ChannelManager.RHEL_PRODUCT_NAME, version, release2); ChannelManagerTest.createReleaseChannelMap(base2, = - ChannelManager.RHEL_PRODUCT_NAME, version, release, 'N'); + ChannelManager.RHEL_PRODUCT_NAME, version, release3); = List channels =3D ChannelManager.listBaseChan= nelsForSystem( user, s); @@ -410,18 +412,16 @@ public class ChannelManagerTest extends BaseTestCaseW= ithUser { // Create some base channels and corresponding entries in rhnRelea= seChannelMap: Channel base1 =3D ChannelFactoryTest.createBaseChannel(user); Channel base2 =3D ChannelFactoryTest.createBaseChannel(user); - // not sure why we create this third one, but I'll leave it here. - // jesusr 2007/11/15 ChannelFactoryTest.createBaseChannel(user); + = ChannelManagerTest.createReleaseChannelMap(base1, = - ChannelManager.RHEL_PRODUCT_NAME, version, release, 'N'); + ChannelManager.RHEL_PRODUCT_NAME, version, "5.0.1"); ChannelManagerTest.createReleaseChannelMap(base2, = - ChannelManager.RHEL_PRODUCT_NAME, version, release, 'N'); + ChannelManager.RHEL_PRODUCT_NAME, version, "5.0.2"); = List channels =3D ChannelManager. listBaseEusChannelsByVersionReleaseAndChannelArch(user, versio= n, release, = base1.getChannelArch().getId()); - = assertTrue(channels.size() >=3D 2); } = @@ -440,9 +440,9 @@ public class ChannelManagerTest extends BaseTestCaseWit= hUser { // jesusr 2007/11/15 ChannelFactoryTest.createBaseChannel(user); ChannelManagerTest.createReleaseChannelMap(base1, = - ChannelManager.RHEL_PRODUCT_NAME, version, release, 'N'); + ChannelManager.RHEL_PRODUCT_NAME, version, release); ChannelManagerTest.createReleaseChannelMap(base2, = - ChannelManager.RHEL_PRODUCT_NAME, version, release2, 'Y'); + ChannelManager.RHEL_PRODUCT_NAME, version, release2); = EssentialChannelDto channel =3D ChannelManager. lookupLatestEusChannelForRhelVersion(user, version, = @@ -462,14 +462,14 @@ public class ChannelManagerTest extends BaseTestCaseW= ithUser { Channel base1 =3D ChannelFactoryTest.createBaseChannel(user); Channel base2 =3D ChannelFactoryTest.createBaseChannel(user); ChannelManagerTest.createReleaseChannelMap(base1, TEST_OS, version= , = - release, 'N'); + release); ChannelManagerTest.createReleaseChannelMap(base2, TEST_OS, version= , = - release2, 'N'); + release2); = EssentialChannelDto channel =3D ChannelManager. lookupLatestEusChannelForRhelVersion(user, version, = base1.getChannelArch().getId()); - assertNull(channel); + assertEquals(base2.getId(), channel.getId()); } = public void testIsChannelFree() throws Exception { --===============8653206269264350535==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:30 2015 Content-Type: multipart/mixed; boundary="===============2238826187762737065==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: spacewalk/config Date: Fri, 12 Jun 2009 21:16:54 +0000 Message-ID: <20090612211654.AEB451201A2@lists.fedorahosted.org> --===============2238826187762737065== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf | 10 = ++++++++++ 1 file changed, 10 insertions(+) New commits: commit 631ba58163d16529b0f8526252552ecf5d7443bb Author: Pradeep Kilambi Date: Fri Jun 12 17:16:48 2009 -0400 Adding the inter satellite sync config options to rhn.conf and let it o= verride the ones in defaults. diff --git a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.= conf b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf index 5676130..dc26c79 100644 --- a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf +++ b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf @@ -8,6 +8,16 @@ server.satellite.http_proxy_username =3D @@serverDOTsatell= iteDOThttp_proxy_usernam server.satellite.http_proxy_password =3D @@serverDOTsatelliteDOThttp_proxy= _password@@ server.satellite.ca_chain =3D @@serverDOTsatelliteDOTca_chain@@ = +# Name of parent for ISS. +# # If left blank rhn_parent is taken by default. +# # This option can be overriden on satellite-sync command line. +iss_parent =3D = +iss_ca_chain =3D /usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT + +# Comma separated list of allowed iss slaves, like: +# allowed_iss_slaves=3Dslave1-satellite.redhat.com,slave2-satellite.redhat= .com +allowed_iss_slaves=3D + default_db =3D @@default_db@@ = server.nls_lang =3D @@serverDOTnls_lang@@ --===============2238826187762737065==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:31 2015 Content-Type: multipart/mixed; boundary="===============2086017108771220120==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - spacewalk/config Date: Fri, 12 Jun 2009 21:17:36 +0000 Message-ID: <20090612211736.C2E161201A2@lists.fedorahosted.org> --===============2086017108771220120== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf | 10 = ++++++++++ 1 file changed, 10 insertions(+) New commits: commit aa005c5fe8f53a1fde5ce4d34ffb09d333fc90ac Author: Pradeep Kilambi Date: Fri Jun 12 17:16:48 2009 -0400 Adding the inter satellite sync config options to rhn.conf and let it o= verride the ones in defaults. diff --git a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.= conf b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf index 5676130..dc26c79 100644 --- a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf +++ b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf @@ -8,6 +8,16 @@ server.satellite.http_proxy_username =3D @@serverDOTsatell= iteDOThttp_proxy_usernam server.satellite.http_proxy_password =3D @@serverDOTsatelliteDOThttp_proxy= _password@@ server.satellite.ca_chain =3D @@serverDOTsatelliteDOTca_chain@@ = +# Name of parent for ISS. +# # If left blank rhn_parent is taken by default. +# # This option can be overriden on satellite-sync command line. +iss_parent =3D = +iss_ca_chain =3D /usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT + +# Comma separated list of allowed iss slaves, like: +# allowed_iss_slaves=3Dslave1-satellite.redhat.com,slave2-satellite.redhat= .com +allowed_iss_slaves=3D + default_db =3D @@default_db@@ = server.nls_lang =3D @@serverDOTnls_lang@@ --===============2086017108771220120==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:32 2015 Content-Type: multipart/mixed; boundary="===============2409504811326966354==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - spacewalk/config Date: Fri, 12 Jun 2009 21:35:14 +0000 Message-ID: <20090612213514.AFC341201A2@lists.fedorahosted.org> --===============2409504811326966354== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf | 2 = ++ 1 file changed, 2 insertions(+) New commits: commit 87effe5e92c7405698b5aa2d1915d6891825b26c Author: Pradeep Kilambi Date: Fri Jun 12 17:35:06 2009 -0400 Letting use know when to use these options with more explicit comments diff --git a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.= conf b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf index dc26c79..b7a2e16 100644 --- a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf +++ b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf @@ -8,12 +8,14 @@ server.satellite.http_proxy_username =3D @@serverDOTsatel= liteDOThttp_proxy_usernam server.satellite.http_proxy_password =3D @@serverDOTsatelliteDOThttp_proxy= _password@@ server.satellite.ca_chain =3D @@serverDOTsatelliteDOTca_chain@@ = +# Use these options if this server is intended to be a slave. # Name of parent for ISS. # # If left blank rhn_parent is taken by default. # # This option can be overriden on satellite-sync command line. iss_parent =3D = iss_ca_chain =3D /usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT = +# Use this option if this server is intended to be a master # Comma separated list of allowed iss slaves, like: # allowed_iss_slaves=3Dslave1-satellite.redhat.com,slave2-satellite.redhat= .com allowed_iss_slaves=3D --===============2409504811326966354==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:32 2015 Content-Type: multipart/mixed; boundary="===============2227736530727666965==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: spacewalk/config Date: Fri, 12 Jun 2009 21:35:34 +0000 Message-ID: <20090612213534.8BE471201A2@lists.fedorahosted.org> --===============2227736530727666965== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf | 2 = ++ 1 file changed, 2 insertions(+) New commits: commit 4031aaf32907ebac544626e5c2ec926203c5d051 Author: Pradeep Kilambi Date: Fri Jun 12 17:35:06 2009 -0400 Letting use know when to use these options with more explicit comments diff --git a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.= conf b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf index dc26c79..b7a2e16 100644 --- a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf +++ b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf @@ -8,12 +8,14 @@ server.satellite.http_proxy_username =3D @@serverDOTsatel= liteDOThttp_proxy_usernam server.satellite.http_proxy_password =3D @@serverDOTsatelliteDOThttp_proxy= _password@@ server.satellite.ca_chain =3D @@serverDOTsatelliteDOTca_chain@@ = +# Use these options if this server is intended to be a slave. # Name of parent for ISS. # # If left blank rhn_parent is taken by default. # # This option can be overriden on satellite-sync command line. iss_parent =3D = iss_ca_chain =3D /usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT = +# Use this option if this server is intended to be a master # Comma separated list of allowed iss slaves, like: # allowed_iss_slaves=3Dslave1-satellite.redhat.com,slave2-satellite.redhat= .com allowed_iss_slaves=3D --===============2227736530727666965==-- From partha at fedoraproject.org Thu Aug 20 11:57:33 2015 Content-Type: multipart/mixed; boundary="===============0578864383665141164==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Fri, 12 Jun 2009 22:08:17 +0000 Message-ID: <20090612220817.8EE501201A2@lists.fedorahosted.org> --===============0578864383665141164== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgCreateAction= Test.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 34e915125427d51dc0b7730dd05791c80d444fcf Author: Partha Aji Date: Fri Jun 12 18:10:47 2009 -0400 More Unit test fixes diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/Org= CreateActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/multio= rg/test/OrgCreateActionTest.java index adde257..e67194a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgCreateA= ctionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgCreateA= ctionTest.java @@ -51,7 +51,7 @@ public class OrgCreateActionTest extends RhnMockStrutsTes= tCase { actionPerform(); String[] errors =3D {"errors.required", "errors.required", = "errors.required", "errors.required", "errors.required", "= errors.required"}; - verifyActionErrors(errors); + verifyActionMessages(errors); } = public void testCreateDupeUser() throws Exception { @@ -69,7 +69,7 @@ public class OrgCreateActionTest extends RhnMockStrutsTes= tCase { addRequestParameter("prefix", "Mr."); setRequestPathInfo("/admin/multiorg/OrgCreate"); actionPerform(); - verifyActionErrors(new String[]{"error.login_already_taken"}); + verifyActionMessages(new String[]{"error.login_already_taken"}); } = } --===============0578864383665141164==-- From partha at fedoraproject.org Thu Aug 20 11:57:34 2015 Content-Type: multipart/mixed; boundary="===============8336231707549974032==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Fri, 12 Jun 2009 22:40:05 +0000 Message-ID: <20090612224005.7F46D1201A2@lists.fedorahosted.org> --===============8336231707549974032== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml = | 10 ++++------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml= | 9 +-------- 2 files changed, 5 insertions(+), 14 deletions(-) New commits: commit 9d87f8d74789d0b77806a543df2d76f4d6ca0e81 Author: Partha Aji Date: Fri Jun 12 18:42:14 2009 -0400 removed a duplicate string resources entry diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_= queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel= _queries.xml index 6e59af5..c13bad5 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml @@ -817,17 +817,15 @@ SELECT C.id, C.name, C.label, 1 AS IS_CUSTOM c.name, 0 AS IS_CUSTOM from - rhnChannelPermissions cp, - rhnChannel c, - rhnReleaseChannelMap rcm, - rhnProductName pn + rhnChannelPermissions cp = + inner join rhnChannel c on cp.channel_id =3D c.id + inner join rhnReleaseChannelMap rcm on rcm.channel_id =3D c.i= d = + inner join rhnProductName pn on pn.id =3D c.product_name_id = where rcm.release =3D :release and rcm.version =3D :version and rcm.channel_arch_id =3D :channel_arch_id - and rcm.channel_id =3D c.id and cp.org_id =3D :org_id - and pn.id =3D c.product_name_id and pn.label =3D :product_name_label and rhn_channel.loose_user_role_check(c.id, :user_id, 'subscribe') =3D 1 diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResour= ce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringReso= urce_en_US.xml index ea75762..56a20e2 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml @@ -17432,14 +17432,7 @@ performing a kickstart or creating a new kickstart= distribution.</strong> /rhn/systems/details/virtua= lization/ProvisionVirtualizationWizard.do = - = - - The following fields may be left blank (in which case defa= ult values as defined in the selected kickstart profile will be used). Eac= h field may be set individually to override the profile's default value. - - /rhn/systems/details/virtua= lization/ProvisionVirtualizationWizard.do - - - = + = Use the virtual host system's disk space: --===============8336231707549974032==-- From partha at fedoraproject.org Thu Aug 20 11:57:35 2015 Content-Type: multipart/mixed; boundary="===============7739693554179844500==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Fri, 12 Jun 2009 22:41:42 +0000 Message-ID: <20090612224142.C74AD1201A2@lists.fedorahosted.org> --===============7739693554179844500== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml = | 10 ++++------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml= | 9 +-------- 2 files changed, 5 insertions(+), 14 deletions(-) New commits: commit f235a6373dca2b4e1205424fb9ed693a8e2c52b4 Author: Partha Aji Date: Fri Jun 12 18:42:14 2009 -0400 removed a duplicate string resources entry diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_= queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel= _queries.xml index 90ccc2f..5e9307b 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml @@ -817,17 +817,15 @@ SELECT C.id, C.name, C.label, 1 AS IS_CUSTOM c.name, 0 AS IS_CUSTOM from - rhnChannelPermissions cp, - rhnChannel c, - rhnReleaseChannelMap rcm, - rhnProductName pn + rhnChannelPermissions cp = + inner join rhnChannel c on cp.channel_id =3D c.id + inner join rhnReleaseChannelMap rcm on rcm.channel_id =3D c.i= d = + inner join rhnProductName pn on pn.id =3D c.product_name_id = where rcm.release =3D :release and rcm.version =3D :version and rcm.channel_arch_id =3D :channel_arch_id - and rcm.channel_id =3D c.id and cp.org_id =3D :org_id - and pn.id =3D c.product_name_id and pn.label =3D :product_name_label and rhn_channel.loose_user_role_check(c.id, :user_id, 'subscribe') =3D 1 diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResour= ce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringReso= urce_en_US.xml index 5abf630..9f6331f 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml @@ -17432,14 +17432,7 @@ performing a kickstart or creating a new kickstart= distribution.</strong> /rhn/systems/details/virtua= lization/ProvisionVirtualizationWizard.do = - = - - The following fields may be left blank (in which case defa= ult values as defined in the selected kickstart profile will be used). Eac= h field may be set individually to override the profile's default value. - - /rhn/systems/details/virtua= lization/ProvisionVirtualizationWizard.do - - - = + = Use the virtual host system's disk space: --===============7739693554179844500==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:36 2015 Content-Type: multipart/mixed; boundary="===============6268740631023051755==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: scripts/channel-to-update-level Date: Mon, 15 Jun 2009 02:06:42 +0000 Message-ID: <20090615020642.6DDC112033D@lists.fedorahosted.org> --===============6268740631023051755== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable scripts/channel-to-update-level/README | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) New commits: commit 5eb21ab42c682f0347a8d59aa4752ca9f09109d6 Author: Justin Sherrill Date: Sun Jun 14 22:06:37 2009 -0400 updating README for create-channel-update-2.1 diff --git a/scripts/channel-to-update-level/README b/scripts/channel-to-up= date-level/README index 9c76e16..56fcb6c 100644 --- a/scripts/channel-to-update-level/README +++ b/scripts/channel-to-update-level/README @@ -1,7 +1,7 @@ Create channel to update level by Justin Sherrill (jsherril(a)redhat.com) = -This script can create a channel to a specific update level (i.e. RHEL4u3)= or upgrade an existing channel to a higher update level on an RHN Satellit= e. +This script can create a channel to a specific update level (i.e. RHEL4u3)= or upgrade an existing channel to a higher update level on an RHN Satellit= e or Spacewalk server. = For help, simply run ./create-channel-update --help = @@ -22,6 +22,18 @@ Add the extra's channel as a child channel of 'my-stable= -channel': ./create-channel-update -l admin -s myserver.example.com -v 4 -u u4 -r AS= -a i386 -e extras -p my-stable-channel = = +Skip List +--------- + +If you would like to create a channel at a specific version with the excep= tion of certain packages (kernel, bash, etc..) + simply create a file ('skiplist.txt') and with the names of the package= s such as: + +kernel +kernel-smp +bash + +then simply pass the '--skiplist=3Dskiplist.txt' option when running the = command. All packages from the specified release will + be copied to the channel except for those in the skip list. = = In addition to the script, you should find in this directory: @@ -31,6 +43,10 @@ README - This file = Changelog: ----------- +6/14/09 - 2.1 = +- Reimplemented option parsing +- adding --clone option for when creating channel +- added --skiplist option for a package skiplist = 03/06/09 - 2.0-beta - Rewrite in python, supporting command line arguments. = --===============6268740631023051755==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:37 2015 Content-Type: multipart/mixed; boundary="===============0035356203682438936==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: proxy/installer Date: Mon, 15 Jun 2009 07:22:43 +0000 Message-ID: <20090615072243.D763D120371@lists.fedorahosted.org> --===============0035356203682438936== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/installer/configure-proxy.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit f665008009d8e3d2fe65c8513fc23d443191198d Author: Miroslav Such=C3=BD Date: Mon Jun 15 09:21:31 2009 +0200 505325 - pass two parameters as two parameters = previous syntax has been read as one parameter "--password pswd" diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure= -proxy.sh index c4d4371..db1728d 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -370,7 +370,8 @@ SSL_BUILD_DIR=3D${SSL_BUILD_DIR:-"/root/ssl-build"} = if [ -n "$SSL_PASSWORD" ] ; then # use SSL_PASSWORD if already set - RHNSSLTOOLPWD=3D"--password '$SSL_PASSWORD'" + RHN_SSL_TOOL_PASSWORD_OPTION=3D"--password" + RHN_SSL_TOOL_PASSWORD=3D"$SSL_PASSWORD" elif [ "$INTERACTIVE" =3D "0" ] ; then # non-interactive mode but no SSL_PASSWORD :( config_error 4 "Please define SSL_PASSWORD." @@ -387,7 +388,7 @@ if [ ! -f $SSL_BUILD_DIR/RHN-ORG-PRIVATE-SSL-KEY ]; then --set-org=3D"$SSL_ORG" \ --set-org-unit=3D"$SSL_ORGUNIT" \ --set-email=3D"$SSL_EMAIL" \ - $RHNSSLTOOLPWD + $RHN_SSL_TOOL_PASSWORD_OPTION $RHN_SSL_TOOL_PASSWORD config_error $? "CA certificate generation failed!" else echo "Using CA key at $SSL_BUILD_DIR/RHN-ORG-PRIVATE-SSL-KEY." @@ -417,7 +418,7 @@ echo "Generating SSL key and public certificate:" --set-org=3D"$SSL_ORG" \ --set-org-unit=3D"$SSL_ORGUNIT" \ --set-email=3D"$SSL_EMAIL" \ - $RHNSSLTOOLPWD + $RHN_SSL_TOOL_PASSWORD_OPTION $RHN_SSL_TOOL_PASSWORD config_error $? "SSL key generation failed!" = echo "Installing SSL certificate for Apache and Jabberd:" --===============0035356203682438936==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:37 2015 Content-Type: multipart/mixed; boundary="===============6229438658539450707==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - proxy/installer Date: Mon, 15 Jun 2009 07:23:38 +0000 Message-ID: <20090615072338.6F854120371@lists.fedorahosted.org> --===============6229438658539450707== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/installer/configure-proxy.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit b948594a5d12b523705271bf957cca89cdb43843 Author: Miroslav Such=C3=BD Date: Mon Jun 15 09:21:31 2009 +0200 505325 - pass two parameters as two parameters = previous syntax has been read as one parameter "--password pswd" diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure= -proxy.sh index bcf3410..63a645f 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -367,7 +367,8 @@ SSL_BUILD_DIR=3D${SSL_BUILD_DIR:-"/root/ssl-build"} = if [ -n "$SSL_PASSWORD" ] ; then # use SSL_PASSWORD if already set - RHNSSLTOOLPWD=3D"--password '$SSL_PASSWORD'" + RHN_SSL_TOOL_PASSWORD_OPTION=3D"--password" + RHN_SSL_TOOL_PASSWORD=3D"$SSL_PASSWORD" elif [ "$INTERACTIVE" =3D "0" ] ; then # non-interactive mode but no SSL_PASSWORD :( config_error 4 "Please define SSL_PASSWORD." @@ -384,7 +385,7 @@ if [ ! -f $SSL_BUILD_DIR/RHN-ORG-PRIVATE-SSL-KEY ]; then --set-org=3D"$SSL_ORG" \ --set-org-unit=3D"$SSL_ORGUNIT" \ --set-email=3D"$SSL_EMAIL" \ - $RHNSSLTOOLPWD + $RHN_SSL_TOOL_PASSWORD_OPTION $RHN_SSL_TOOL_PASSWORD config_error $? "CA certificate generation failed!" else echo "Using CA key at $SSL_BUILD_DIR/RHN-ORG-PRIVATE-SSL-KEY." @@ -414,7 +415,7 @@ echo "Generating SSL key and public certificate:" --set-org=3D"$SSL_ORG" \ --set-org-unit=3D"$SSL_ORGUNIT" \ --set-email=3D"$SSL_EMAIL" \ - $RHNSSLTOOLPWD + $RHN_SSL_TOOL_PASSWORD_OPTION $RHN_SSL_TOOL_PASSWORD config_error $? "SSL key generation failed!" = echo "Installing SSL certificate for Apache and Jabberd:" --===============6229438658539450707==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:37 2015 Content-Type: multipart/mixed; boundary="===============5859706762837196935==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: proxy/installer rel-eng/packages Date: Mon, 15 Jun 2009 07:26:20 +0000 Message-ID: <20090615072620.D4C94120371@lists.fedorahosted.org> --===============5859706762837196935== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/installer/spacewalk-proxy-installer.spec | 5 ++++- rel-eng/packages/spacewalk-proxy-installer | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 186a7271b03d8291a40b7c10d5e3ca8476b05aa3 Author: Miroslav Such=C3=BD Date: Mon Jun 15 09:26:12 2009 +0200 Automatic commit of package [spacewalk-proxy-installer] release [0.6.13= -1]. diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/install= er/spacewalk-proxy-installer.spec index b75cb64..0c7aa3d 100644 --- a/proxy/installer/spacewalk-proxy-installer.spec +++ b/proxy/installer/spacewalk-proxy-installer.spec @@ -2,7 +2,7 @@ Name: spacewalk-proxy-installer Summary: Spacewalk Proxy Server Installer Group: Applications/Internet License: GPLv2 -Version: 0.6.12 +Version: 0.6.13 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz @@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE answers.txt = %changelog +* Mon Jun 15 2009 Miroslav Suchy 0.6.13-1 +- 505325 - pass two parameters as two parameters + * Wed Jun 10 2009 Miroslav Suchy 0.6.12-1 - runtime error - global name 's' is not defined - 504660 - fix typo in message diff --git a/rel-eng/packages/spacewalk-proxy-installer b/rel-eng/packages/= spacewalk-proxy-installer index 74b85da..d1ee1ba 100644 --- a/rel-eng/packages/spacewalk-proxy-installer +++ b/rel-eng/packages/spacewalk-proxy-installer @@ -1 +1 @@ -0.6.12-1 proxy/installer/ +0.6.13-1 proxy/installer/ --===============5859706762837196935==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:37 2015 Content-Type: multipart/mixed; boundary="===============0208821049152149659==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-proxy-installer-0.6.13-1' Date: Mon, 15 Jun 2009 07:26:27 +0000 Message-ID: <20090615072627.9A3B5120371@lists.fedorahosted.org> --===============0208821049152149659== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-proxy-installer-0.6.13-1' created by Miroslav Such=C3=BD at 2009-06-15 07:26 +0000 Tagging package [spacewalk-proxy-installer] version [0.6.13-1] in directory= [proxy/installer/]. Changes since oracle-xe-selinux-10.2-11-28: --- 0 files changed --- --===============0208821049152149659==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:37 2015 Content-Type: multipart/mixed; boundary="===============7186146445706213997==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - client/tools rel-eng/packages Date: Mon, 15 Jun 2009 07:33:17 +0000 Message-ID: <20090615073317.AE8CC120371@lists.fedorahosted.org> --===============7186146445706213997== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/osad/osad.spec | 7 +++++-- rel-eng/packages/osad | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) New commits: commit 884ecdc2846d09f7d4fccc41f705595664bf0e3b Author: Miroslav Such=C3=BD Date: Mon Jun 15 09:32:32 2009 +0200 Automatic commit of package [osad] release [5.9.12-1]. diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index 25134f3..96f6bb6 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -9,7 +9,7 @@ Group: System Environment/Daemons License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz -Version: 5.9.11 +Version: 5.9.12 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -226,6 +226,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -r= vvi {} = # $Id$ %changelog +* Mon Jun 15 2009 Miroslav Suchy 5.9.12-1 +498611 - run restorecon in %posttrans + * Wed Apr 29 2009 Jan Pazdziora 5.9.11-1 - move the %post SELinux activation to /usr/sbin/osa-dispatcher-selinux-enable diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad index 9f84b7b..04d25e8 100644 --- a/rel-eng/packages/osad +++ b/rel-eng/packages/osad @@ -1 +1 @@ -5.9.11-1 client/tools/osad/ +5.9.12-1 client/tools/osad/ commit 888dc5a715b0e8724212f6ea55a562f9c408b306 Author: Miroslav Such=C3=BD Date: Mon Jun 15 09:29:43 2009 +0200 498611 - run restorecon in %posttrans if we run: yum install spacewalk-monitoring-selinux osa-dispatcher-selinux then packages from osad will have wrong context. This seem to be bug in= rpm or selinux. As workaround we run restorecon in %posttrans when all fil= es are already installed. diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index da449d8..25134f3 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -156,7 +156,7 @@ if [ $1 =3D 0 ]; then fi = %if %{include_selinux_package} -%post -n osa-dispatcher-selinux +%posttrans -n osa-dispatcher-selinux if /usr/sbin/selinuxenabled ; then %{_sbindir}/osa-dispatcher-selinux-enable fi --===============7186146445706213997==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:37 2015 Content-Type: multipart/mixed; boundary="===============1905133809537914636==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - client/tools Date: Mon, 15 Jun 2009 07:33:48 +0000 Message-ID: <20090615073348.BB42B120371@lists.fedorahosted.org> --===============1905133809537914636== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/osad/osad.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7e85d5f5fda5ff1c3060b5e31f492492fc191b16 Author: Miroslav Such=C3=BD Date: Mon Jun 15 09:29:43 2009 +0200 498611 - run restorecon in %posttrans if we run: yum install spacewalk-monitoring-selinux osa-dispatcher-selinux then packages from osad will have wrong context. This seem to be bug in= rpm or selinux. As workaround we run restorecon in %posttrans when all fil= es are already installed. (cherry picked from commit 888dc5a715b0e8724212f6ea55a562f9c408b306) diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index bce75cc..17445af 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -156,7 +156,7 @@ if [ $1 =3D 0 ]; then fi = %if %{include_selinux_package} -%post -n osa-dispatcher-selinux +%posttrans -n osa-dispatcher-selinux if /usr/sbin/selinuxenabled ; then %{_sbindir}/osa-dispatcher-selinux-enable fi --===============1905133809537914636==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:37 2015 Content-Type: multipart/mixed; boundary="===============1047033826884815512==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/osad-5.9.12-1' Date: Mon, 15 Jun 2009 07:51:50 +0000 Message-ID: <20090615075150.C1F92120371@lists.fedorahosted.org> --===============1047033826884815512== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'osad-5.9.12-1' created by Miroslav Such=C3=BD at= 2009-06-15 07:32 +0000 Tagging package [osad] version [5.9.12-1] in directory [client/tools/osad/]. Changes since spacewalk-proxy-installer-0.6.13-1-1: --- 0 files changed --- --===============1047033826884815512==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:37 2015 Content-Type: multipart/mixed; boundary="===============8330567239953724655==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - client/tools selinux/jabberd-selinux selinux/oracle-instantclient-selinux selinux/oracle-rhnsat-selinux selinux/oracle-selinux selinux/oracle-xe-selinux selinux/spacewalk-monitoring-selinux selinux/spacewalk-proxy-selinux selinux/spacewalk-selinux Date: Mon, 15 Jun 2009 09:36:12 +0000 Message-ID: <20090615093612.93489120375@lists.fedorahosted.org> --===============8330567239953724655== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/osad/osad.spec | = 13 ++++- selinux/jabberd-selinux/jabberd-selinux.spec | = 13 ++++- selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec | = 20 ++++++-- selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | = 15 ++++-- selinux/oracle-selinux/oracle-selinux.spec | = 25 ++++++++-- selinux/oracle-xe-selinux/oracle-xe-selinux.spec | = 15 ++++-- selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | = 11 +++- selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec | = 9 ++- selinux/spacewalk-selinux/spacewalk-selinux.spec | = 15 ++++-- 9 files changed, 108 insertions(+), 28 deletions(-) New commits: commit 513e5611738ca67bebc0b240eeac621c095ca812 Author: Miroslav Such=C3=BD Date: Mon Jun 15 11:35:49 2009 +0200 fix rpmlint warnings = addressing: W: macro-in-%changelog diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index d8ff5ef..4ee8665 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -234,10 +234,10 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon = -rvvi {} # $Id$ %changelog * Mon Jun 15 2009 Miroslav Suchy 5.9.12-1 -498611 - run restorecon in %posttrans +- 498611 - run restorecon in %%posttrans = * Wed Apr 29 2009 Jan Pazdziora 5.9.11-1 -- move the %post SELinux activation to +- move the %%post SELinux activation to /usr/sbin/osa-dispatcher-selinux-enable = * Fri Mar 27 2009 jesus m. rodriguez 5.9.10-1 diff --git a/selinux/jabberd-selinux/jabberd-selinux.spec b/selinux/jabberd= -selinux/jabberd-selinux.spec index 04a8c42..9e3693f 100644 --- a/selinux/jabberd-selinux/jabberd-selinux.spec +++ b/selinux/jabberd-selinux/jabberd-selinux.spec @@ -106,10 +106,10 @@ rpm -ql jabberd | xargs -n 1 /sbin/restorecon -ri {} = || : = %changelog * Wed Jun 10 2009 Miroslav Suchy 1.4.4-1 -- 498611 - run restorecon in %posttrans +- 498611 - run restorecon in %%posttrans = * Mon Apr 27 2009 Jan Pazdziora 1.4.3-1 -- move the %post SELinux activation to /usr/sbin/jabberd-selinux-enable +- move the %%post SELinux activation to /usr/sbin/jabberd-selinux-enable - use src.rpm packaging with single Source0 - bump version up to 1.4.3, to allow 1.4.2 to be used by Satellite 5.3.0 = diff --git a/selinux/oracle-instantclient-selinux/oracle-instantclient-seli= nux.spec b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinu= x.spec index b7bd4d2..16b68c1 100644 --- a/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec +++ b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec @@ -118,7 +118,7 @@ fi - return version down to 10.2 = * Wed Jun 10 2009 Miroslav Suchy 10.3-1 -- 498611 - run restorecon in %posttrans +- 498611 - run restorecon in %%posttrans = * Tue May 26 2009 Jan Pazdziora 10.2-13 - oracle-instantclient-selinux: use the correct @@ -134,7 +134,7 @@ fi - Require oracle-instantclient-sqlplus = * Wed Apr 29 2009 Jan Pazdziora 10.2-9 -- move the %post SELinux activation to +- move the %%post SELinux activation to /usr/sbin/oracle-instantclient-selinux-enable = * Tue Mar 24 2009 Jan Pazdziora 10.2-8 diff --git a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec b/sel= inux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec index 4cd27fb..7783d14 100644 --- a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec +++ b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec @@ -116,10 +116,10 @@ fi - return version down to 10.2 = * Wed Jun 10 2009 Miroslav Suchy 10.3-1 -- 498611 - run restorecon in %posttrans +- 498611 - run restorecon in %%posttrans = * Wed Apr 29 2009 Jan Pazdziora 10.2-11 -- move the %post SELinux activation to /usr/sbin/oracle-rhnsat-enable +- move the %%post SELinux activation to /usr/sbin/oracle-rhnsat-enable = * Mon Mar 16 2009 Jan Pazdziora 10.2-10 - 489377 - allow sqlplus and lsnrctl to use NIS diff --git a/selinux/oracle-selinux/oracle-selinux.spec b/selinux/oracle-se= linux/oracle-selinux.spec index 87bd504..9fdd6ab 100644 --- a/selinux/oracle-selinux/oracle-selinux.spec +++ b/selinux/oracle-selinux/oracle-selinux.spec @@ -203,13 +203,13 @@ fi = %changelog * Wed Jun 10 2009 Miroslav Suchy 0.2-1 -- 498611 - run restorecon in %posttrans +- 498611 - run restorecon in %%posttrans = * Wed Apr 29 2009 Jan Pazdziora 0.1-23.8 - fix the name of the SELinux enabling script = * Tue Apr 28 2009 Jan Pazdziora 0.1-23.7 -- move the %post SELinux activation of -nofcontext package to +- move the %%post SELinux activation of -nofcontext package to /usr/sbin/oracle-nofcontext-selinux-enable = * Thu Mar 12 2009 jesus m. rodriguez 0.1-23.6 diff --git a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec b/selinux/ora= cle-xe-selinux/oracle-xe-selinux.spec index d654fc9..44ca1f3 100644 --- a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec +++ b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec @@ -141,10 +141,10 @@ fi - return version down to 10.2 = * Wed Jun 10 2009 Miroslav Suchy 10.3-1 -- 498611 - run restorecon in %posttrans +- 498611 - run restorecon in %%posttrans = * Wed Apr 29 2009 Jan Pazdziora 10.2-10 -- move the %post SELinux activation to /usr/sbin/oracle-xe-enable +- move the %%post SELinux activation to /usr/sbin/oracle-xe-enable = * Tue Feb 10 2009 Jan Pazdziora 10.2-9 - added textrel_shlib_t to libdbcfg10.so diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-seli= nux.spec b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinu= x.spec index 5e5cd16..c70f386 100644 --- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec +++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec @@ -148,7 +148,7 @@ fi - spacewalk_monitoring_conf_t for /etc/NOCpulse.ini (mzazrivec(a)redhat.co= m) - 501546 - Require tsdb so that /var/log/nocpulse/TSDBLocalQueue already e= xists when we run restorecon (jpazdziora(a)redhat.com) - 500330 - allow httpd_sys_script_t to bind to loopback as well (jpazdzior= a(a)redhat.com) -- 498611 - run restorecon in %posttrans +- 498611 - run restorecon in %%posttrans = * Tue May 26 2009 Jan Pazdziora 0.6.8-1 - 498941 - allow monitoring to connect to ftp diff --git a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec b= /selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec index b14a9c3..13b9593 100644 --- a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec +++ b/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec @@ -107,7 +107,7 @@ fi = %changelog * Wed Jun 10 2009 Miroslav Suchy 0.6.3-1 -- 498611 - run restorecon in %posttrans +- 498611 - run restorecon in %%posttrans = * Mon Apr 27 2009 Jan Pazdziora 0.6.2-1 - move the %post SELinux activation to /usr/sbin/spacewalk-proxy-selinux-e= nable diff --git a/selinux/spacewalk-selinux/spacewalk-selinux.spec b/selinux/spa= cewalk-selinux/spacewalk-selinux.spec index 4b61da8..66e5a0c 100644 --- a/selinux/spacewalk-selinux/spacewalk-selinux.spec +++ b/selinux/spacewalk-selinux/spacewalk-selinux.spec @@ -113,7 +113,7 @@ fi = %changelog * Wed Jun 10 2009 Miroslav Suchy 0.6.9-1 -- 498611 - run restorecon in %posttrans +- 498611 - run restorecon in %%posttrans = * Wed May 27 2009 Jan Pazdziora 0.6.8-1 - call to spacewalk-make-mount-points and Require spacewalk-setup for that @@ -128,7 +128,7 @@ fi * Mon May 11 2009 Jan Pazdziora 0.6.4-1 - spacewalk-selinux-enable: add invocation of other -selinux-enable scripts - only run them if --run-pure is not specified -- use spacewalk-selinux-enable --run-pure in %post +- use spacewalk-selinux-enable --run-pure in %%post - spacewalk-selinux-enable: fix indentation to use tabelators = * Mon May 11 2009 Jan Pazdziora 0.6.3-1 @@ -136,7 +136,7 @@ fi = * Wed Apr 29 2009 Jan Pazdziora 0.6.2-1 - fix type (double Source0) -- amend %changelog +- amend %%changelog = * Fri Apr 24 2009 Jan Pazdziora 0.6.1-1 - move the %post SELinux activation to /usr/sbin/spacewalk-selinux-enable commit 115478daa9322baf18e487de6f188ce49dbe430a Author: Miroslav Such=C3=BD Date: Mon Jun 15 11:21:37 2009 +0200 498611 - run "semodule -i" in %post and restorecon in %posttrans = According to jnovy there is no guaranteed order of %posttrans :( Therefore we will need to split %{_sbindir}/%{name}-enable into two par= ts. semodule -i should be called in %post when we have guaranteed order due requires and in %posttrans we can restorecon and there is no need of de= pendency then. diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index 96f6bb6..d8ff5ef 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -156,11 +156,18 @@ if [ $1 =3D 0 ]; then fi = %if %{include_selinux_package} -%posttrans -n osa-dispatcher-selinux +%post -n osa-dispatcher-selinux if /usr/sbin/selinuxenabled ; then %{_sbindir}/osa-dispatcher-selinux-enable fi = +%posttrans -n osa-dispatcher-selinux +#this may be safely remove when BZ 505066 is fixed +if /usr/sbin/selinuxenabled ; then + rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvvi {} + /sbin/restorecon -vvi /var/log/rhn/osa-dispatcher.log +fi + %postun -n osa-dispatcher-selinux # Clean up after package removal if [ $1 -eq 0 ]; then diff --git a/selinux/jabberd-selinux/jabberd-selinux.spec b/selinux/jabberd= -selinux/jabberd-selinux.spec index f5f70a8..04a8c42 100644 --- a/selinux/jabberd-selinux/jabberd-selinux.spec +++ b/selinux/jabberd-selinux/jabberd-selinux.spec @@ -70,11 +70,18 @@ install -p -m 755 %{name}-enable %{buildroot}%{_sbindir= }/%{name}-enable %clean rm -rf %{buildroot} = -%posttrans +%post if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable fi = +%posttrans +#this may be safely remove when BZ 505066 is fixed +if /usr/sbin/selinuxenabled ; then + rpm -ql jabberd | xargs -n 1 /sbin/restorecon -ri {} || : + /sbin/restorecon -ri /var/run/jabberd || : +fi + %postun # Clean up after package removal if [ $1 -eq 0 ]; then diff --git a/selinux/oracle-instantclient-selinux/oracle-instantclient-seli= nux.spec b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinu= x.spec index 78cc022..b7bd4d2 100644 --- a/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec +++ b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec @@ -68,11 +68,17 @@ EOS %clean rm -rf $RPM_BUILD_ROOT = -%posttrans +%post if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable fi = +%posttrans +#this may be safely remove when BZ 505066 is fixed +if /usr/sbin/selinuxenabled ; then + /sbin/restorecon -Rvv /usr/lib/oracle/10.2.*/client* || : +fi + %postun if [ $1 -eq 0 ]; then for i in %used_libs ; do @@ -82,11 +88,17 @@ if [ $1 -eq 0 ]; then /sbin/restorecon -Rvv /usr/lib/oracle/10.2.*/client* || : fi = -%posttrans -n oracle-instantclient-sqlplus-selinux +%post -n oracle-instantclient-sqlplus-selinux if /usr/sbin/selinuxenabled ; then %{_sbindir}/oracle-instantclient-sqlplus-selinux-enable fi = +%posttrans -n oracle-instantclient-sqlplus-selinux +#this may be safely remove when BZ 505066 is fixed +if /usr/sbin/selinuxenabled ; then + /sbin/restorecon -Rvv /usr/lib/oracle/10.2.*/client* || : +fi + %postun -n oracle-instantclient-sqlplus-selinux if [ $1 -eq 0 ]; then /usr/sbin/semanage fcontext -d -t oracle_sqlplus_exec_t '/usr/lib/oracle/= 10\.2\..*/client.*/bin/sqlplus' diff --git a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec b/sel= inux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec index 516fe75..4cd27fb 100644 --- a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec +++ b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec @@ -74,11 +74,20 @@ install -p -m 755 %{name}-%{version}/%{name}-enable %{b= uildroot}%{_sbindir}/%{na %clean rm -rf %{buildroot} = -%posttrans +%post if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable fi = +%posttrans +#this may be safely removed when BZ 505066 is fixed +if /usr/sbin/selinuxenabled ; then + # Fix up oracle-server-arch files + rpm -q --whatprovides oracle-server | xargs rpm -ql | xargs -n 100 /sbin= /restorecon -Riv + # Fix up database files + /sbin/restorecon -rvi /rhnsat /var/tmp/.oracle || : +fi + %postun # Clean up after package removal if [ $1 -eq 0 ]; then diff --git a/selinux/oracle-selinux/oracle-selinux.spec b/selinux/oracle-se= linux/oracle-selinux.spec index fbd8048..87bd504 100644 --- a/selinux/oracle-selinux/oracle-selinux.spec +++ b/selinux/oracle-selinux/oracle-selinux.spec @@ -114,7 +114,7 @@ install -p -m 755 SELinux/oracle-nofcontext-selinux-ena= ble %{buildroot}%{_sbindi %clean rm -rf %{buildroot} = -%posttrans +%post # Install SELinux policy modules for selinuxvariant in %{selinux_variants} do @@ -132,11 +132,28 @@ test ${SEPORT_STATUS} -lt 1 && semanage port -a -t or= acle_port_t -p tcp 1521 || /sbin/restorecon -R -v /etc || : /sbin/restorecon -R -v /var/tmp || : = -%posttrans -n oracle-nofcontext-selinux +%posttrans +#this may be safely removed when BZ 505066 is fixed +if /usr/sbin/selinuxenabled ; then + # Fix up non-standard file contexts + /sbin/restorecon -R -v %{oracle_base} || : + /sbin/restorecon -R -v /u0? || : + /sbin/restorecon -R -v /etc || : + /sbin/restorecon -R -v /var/tmp || : +fi + +%post -n oracle-nofcontext-selinux if /usr/sbin/selinuxenabled ; then %{_sbindir}/oracle-nofcontext-selinux-enable fi = +%posttrans -n oracle-nofcontext-selinux +if /usr/sbin/selinuxenabled ; then + # add an oracle port if it does not already exist + SEPORT_STATUS=3D`semanage port -l | grep -c ^oracle` + test ${SEPORT_STATUS} -lt 1 && semanage port -a -t oracle_port_t -p tcp = 1521 || : +fi + %postun # Clean up after package removal if [ $1 -eq 0 ]; then diff --git a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec b/selinux/ora= cle-xe-selinux/oracle-xe-selinux.spec index 656b91a..d654fc9 100644 --- a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec +++ b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec @@ -97,11 +97,20 @@ elif [ $ORACLE_UID -ge 500 ] ; then exit 1 fi = -%posttrans +%post if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable fi = +%posttrans +#this may be safely remove when BZ 505066 is fixed +if /usr/sbin/selinuxenabled ; then + # Relabel oracle-xe-univ's files + rpm -ql oracle-xe-univ | xargs -n 100 /sbin/restorecon -Rivv + # Fix up additional directories, not owned by oracle-xe-univ + /sbin/restorecon -Rivv %extra_restorecon +fi + %postun # Clean up after package removal if [ $1 -eq 0 ]; then diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-seli= nux.spec b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinu= x.spec index 469f2a9..5e5cd16 100644 --- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec +++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec @@ -108,11 +108,18 @@ install -p -m 755 %{name}-enable %{buildroot}%{_sbind= ir}/%{name}-enable %clean rm -rf %{buildroot} = -%posttrans +%post if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable fi = +%posttrans +#this may be safely remove when BZ 505066 is fixed +if /usr/sbin/selinuxenabled ; then + /sbin/restorecon -rv /etc/rc.d/np.d /etc/notification /var/lib/nocpulse = /var/lib/notification /var/log/nocpulse + /sbin/restorecon -rvi /var/log/SysVStep.* /var/run/SysVStep.* +fi + %postun # Clean up after package removal if [ $1 -eq 0 ]; then diff --git a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec b= /selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec index 828d430..b14a9c3 100644 --- a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec +++ b/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec @@ -76,11 +76,16 @@ install -p -m 755 %{name}-enable %{buildroot}%{_sbindir= }/%{name}-enable %clean rm -rf %{buildroot} = -%posttrans +%post if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable fi = +%posttrans +if /usr/sbin/selinuxenabled ; then + /sbin/restorecon -rvvi /var/log/rhn /var/cache/rhn/proxy-auth /var/spool= /rhn-proxy +fi + %postun # Clean up after package removal if [ $1 -eq 0 ]; then diff --git a/selinux/spacewalk-selinux/spacewalk-selinux.spec b/selinux/spa= cewalk-selinux/spacewalk-selinux.spec index 289ddb0..4b61da8 100644 --- a/selinux/spacewalk-selinux/spacewalk-selinux.spec +++ b/selinux/spacewalk-selinux/spacewalk-selinux.spec @@ -79,11 +79,18 @@ install -p -m 755 %{name}-enable %{buildroot}%{_sbindir= }/%{name}-enable %clean rm -rf %{buildroot} = -%posttrans +%post if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable --run-pure fi = +%posttrans +#this may be safely remove when BZ 505066 is fixed +if /usr/sbin/selinuxenabled ; then + /sbin/restorecon -rvvi /etc/rhn/satellite-httpd/conf/satidmap.pl /usr/sb= in/rhn-sat-restart-silent /var/log/rhn /var/cache/rhn \ + /usr/bin/rhn-sudo-ssl-tool /usr/bin/rhn-sudo-load-ssl-cert +fi + %postun # Clean up after package removal if [ $1 -eq 0 ]; then --===============8330567239953724655==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:37 2015 Content-Type: multipart/mixed; boundary="===============5905940839244501531==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: 9 commits - client/tools rel-eng/packages selinux/jabberd-selinux selinux/oracle-instantclient-selinux selinux/oracle-rhnsat-selinux selinux/oracle-selinux selinux/oracle-xe-selinux selinux/spacewalk-monitoring-selinux selinux/spacewalk-proxy-selinux selinux/spacewalk-selinux Date: Mon, 15 Jun 2009 09:47:29 +0000 Message-ID: <20090615094729.2EA30120375@lists.fedorahosted.org> --===============5905940839244501531== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/osad/osad.spec | = 5 +++-- rel-eng/packages/jabberd-selinux | = 2 +- rel-eng/packages/oracle-instantclient-selinux | = 2 +- rel-eng/packages/oracle-rhnsat-selinux | = 2 +- rel-eng/packages/oracle-selinux | = 2 +- rel-eng/packages/oracle-xe-selinux | = 2 +- rel-eng/packages/osad | = 2 +- rel-eng/packages/spacewalk-monitoring-selinux | = 2 +- rel-eng/packages/spacewalk-proxy-selinux | = 2 +- rel-eng/packages/spacewalk-selinux | = 2 +- selinux/jabberd-selinux/jabberd-selinux.spec | = 5 ++++- selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec | = 5 ++++- selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | = 5 ++++- selinux/oracle-selinux/oracle-selinux.spec | = 5 ++++- selinux/oracle-xe-selinux/oracle-xe-selinux.spec | = 5 ++++- selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | = 5 ++++- selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec | = 5 ++++- selinux/spacewalk-selinux/spacewalk-selinux.spec | = 5 ++++- 18 files changed, 44 insertions(+), 19 deletions(-) New commits: commit a792c54376384dcd6315da873d26340afb5ce43c Author: Miroslav Such=C3=BD Date: Mon Jun 15 11:47:17 2009 +0200 Automatic commit of package [spacewalk-selinux] release [0.6.10-1]. diff --git a/rel-eng/packages/spacewalk-selinux b/rel-eng/packages/spacewal= k-selinux index 9ab1f35..91ce8d9 100644 --- a/rel-eng/packages/spacewalk-selinux +++ b/rel-eng/packages/spacewalk-selinux @@ -1 +1 @@ -0.6.9-1 selinux/spacewalk-selinux/ +0.6.10-1 selinux/spacewalk-selinux/ diff --git a/selinux/spacewalk-selinux/spacewalk-selinux.spec b/selinux/spa= cewalk-selinux/spacewalk-selinux.spec index 66e5a0c..717b07b 100644 --- a/selinux/spacewalk-selinux/spacewalk-selinux.spec +++ b/selinux/spacewalk-selinux/spacewalk-selinux.spec @@ -7,7 +7,7 @@ %define modulename spacewalk = Name: spacewalk-selinux -Version: 0.6.9 +Version: 0.6.10 Release: 1%{?dist} Summary: SELinux policy module supporting Spacewalk Server = @@ -112,6 +112,9 @@ fi %attr(0755,root,root) %{_sbindir}/%{name}-enable = %changelog +* Mon Jun 15 2009 Miroslav Suchy 0.6.10-1 +- 498611 - run "semodule -i" in %%post and restorecon in %%posttrans + * Wed Jun 10 2009 Miroslav Suchy 0.6.9-1 - 498611 - run restorecon in %%posttrans = commit 5e34a3c030c0af489eb4192a0c4043c154415468 Author: Miroslav Such=C3=BD Date: Mon Jun 15 11:46:46 2009 +0200 Automatic commit of package [spacewalk-proxy-selinux] release [0.6.4-1]. diff --git a/rel-eng/packages/spacewalk-proxy-selinux b/rel-eng/packages/sp= acewalk-proxy-selinux index 8e58785..a7bee46 100644 --- a/rel-eng/packages/spacewalk-proxy-selinux +++ b/rel-eng/packages/spacewalk-proxy-selinux @@ -1 +1 @@ -0.6.3-1 selinux/spacewalk-proxy-selinux/ +0.6.4-1 selinux/spacewalk-proxy-selinux/ diff --git a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec b= /selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec index 13b9593..a00dca9 100644 --- a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec +++ b/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec @@ -7,7 +7,7 @@ %define modulename spacewalk-proxy = Name: spacewalk-proxy-selinux -Version: 0.6.3 +Version: 0.6.4 Release: 1%{?dist} Summary: SELinux policy module supporting Spacewalk Proxy = @@ -106,6 +106,9 @@ fi %attr(0755,root,root) %{_sbindir}/%{name}-enable = %changelog +* Mon Jun 15 2009 Miroslav Suchy 0.6.4-1 +- 498611 - run "semodule -i" in %%post and restorecon in %%posttrans + * Wed Jun 10 2009 Miroslav Suchy 0.6.3-1 - 498611 - run restorecon in %%posttrans = commit cef79e676835fc6d546c86f92f347d76b13a8fb4 Author: Miroslav Such=C3=BD Date: Mon Jun 15 11:46:16 2009 +0200 Automatic commit of package [spacewalk-monitoring-selinux] release [0.6= .11-1]. diff --git a/rel-eng/packages/spacewalk-monitoring-selinux b/rel-eng/packag= es/spacewalk-monitoring-selinux index 6ea7c7a..2d758a9 100644 --- a/rel-eng/packages/spacewalk-monitoring-selinux +++ b/rel-eng/packages/spacewalk-monitoring-selinux @@ -1 +1 @@ -0.6.10-1 selinux/spacewalk-monitoring-selinux/ +0.6.11-1 selinux/spacewalk-monitoring-selinux/ diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-seli= nux.spec b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinu= x.spec index c70f386..c75dd55 100644 --- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec +++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec @@ -7,7 +7,7 @@ %define modulename spacewalk-monitoring = Name: spacewalk-monitoring-selinux -Version: 0.6.10 +Version: 0.6.11 Release: 1%{?dist} Summary: SELinux policy module supporting Spacewalk monitoring = @@ -141,6 +141,9 @@ fi %attr(0755,root,root) %{_sbindir}/%{name}-enable = %changelog +* Mon Jun 15 2009 Miroslav Suchy 0.6.11-1 +- 498611 - run "semodule -i" in %%post and restorecon in %%posttrans + * Wed Jun 10 2009 Miroslav Suchy 0.6.10-1 - 504649 - give /var/tmp/escalator.state context of spacewalk_monitoring_v= ar_lib_t - 498611 - Require all monitoring packages so the files already exist when= we run restorecon commit 752f0c26823dc0fc9d1d9b02b5221daa5726e4f3 Author: Miroslav Such=C3=BD Date: Mon Jun 15 11:45:24 2009 +0200 Automatic commit of package [oracle-xe-selinux] minor release [10.2-12]. diff --git a/rel-eng/packages/oracle-xe-selinux b/rel-eng/packages/oracle-x= e-selinux index 8603bd6..99244de 100644 --- a/rel-eng/packages/oracle-xe-selinux +++ b/rel-eng/packages/oracle-xe-selinux @@ -1 +1 @@ -10.2-11 selinux/oracle-xe-selinux/ +10.2-12 selinux/oracle-xe-selinux/ diff --git a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec b/selinux/ora= cle-xe-selinux/oracle-xe-selinux.spec index 44ca1f3..4feaa95 100644 --- a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec +++ b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec @@ -6,7 +6,7 @@ = Name: oracle-xe-selinux Version: 10.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: SELinux policy module supporting Oracle XE Group: System Environment/Base License: GPLv2+ @@ -137,6 +137,9 @@ fi %attr(0755,root,root) %{_sbindir}/%{name}-enable = %changelog +* Mon Jun 15 2009 Miroslav Suchy 10.2-12 +- 498611 - run "semodule -i" in %%post and restorecon in %%posttrans + * Thu Jun 11 2009 Miroslav Suchy 10.2-11 - return version down to 10.2 = commit d1348a9edafca5c5ee5c68ddcab20f09550ebe51 Author: Miroslav Such=C3=BD Date: Mon Jun 15 11:44:17 2009 +0200 Automatic commit of package [oracle-selinux] release [0.3-1]. diff --git a/rel-eng/packages/oracle-selinux b/rel-eng/packages/oracle-seli= nux index 32963e2..d367898 100644 --- a/rel-eng/packages/oracle-selinux +++ b/rel-eng/packages/oracle-selinux @@ -1 +1 @@ -0.2-1 selinux/oracle-selinux/ +0.3-1 selinux/oracle-selinux/ diff --git a/selinux/oracle-selinux/oracle-selinux.spec b/selinux/oracle-se= linux/oracle-selinux.spec index 9fdd6ab..4a66248 100644 --- a/selinux/oracle-selinux/oracle-selinux.spec +++ b/selinux/oracle-selinux/oracle-selinux.spec @@ -19,7 +19,7 @@ %endif = Name: oracle-selinux -Version: 0.2 +Version: 0.3 Release: 1%{?obtag}%{?dist}%{?repo} Summary: SELinux policy module supporting Oracle Group: System Environment/Base @@ -202,6 +202,9 @@ fi %attr(0755,root,root) %{_sbindir}/oracle-nofcontext-selinux-enable = %changelog +* Mon Jun 15 2009 Miroslav Suchy 0.3-1 +- 498611 - run "semodule -i" in %%post and restorecon in %%posttrans + * Wed Jun 10 2009 Miroslav Suchy 0.2-1 - 498611 - run restorecon in %%posttrans = commit db8135ec0ba0dc5e9ff5671ce403f68257d5c91f Author: Miroslav Such=C3=BD Date: Mon Jun 15 11:41:57 2009 +0200 Automatic commit of package [oracle-rhnsat-selinux] minor release [10.2= -13]. diff --git a/rel-eng/packages/oracle-rhnsat-selinux b/rel-eng/packages/orac= le-rhnsat-selinux index 0aab211..8889687 100644 --- a/rel-eng/packages/oracle-rhnsat-selinux +++ b/rel-eng/packages/oracle-rhnsat-selinux @@ -1 +1 @@ -10.2-12 selinux/oracle-rhnsat-selinux/ +10.2-13 selinux/oracle-rhnsat-selinux/ diff --git a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec b/sel= inux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec index 7783d14..7ff91c9 100644 --- a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec +++ b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec @@ -6,7 +6,7 @@ = Name: oracle-rhnsat-selinux Version: 10.2 -Release: 12%{?dist} +Release: 13%{?dist} Summary: SELinux policy module supporting Oracle Group: System Environment/Base License: GPLv2+ @@ -112,6 +112,9 @@ fi %attr(0755,root,root) %{_sbindir}/%{name}-enable = %changelog +* Mon Jun 15 2009 Miroslav Suchy 10.2-13 +- 498611 - run "semodule -i" in %%post and restorecon in %%posttrans + * Thu Jun 11 2009 Miroslav Suchy 10.2-12 - return version down to 10.2 = commit a7de05e0dbf408e64929f6eb07571d82b6f633cc Author: Miroslav Such=C3=BD Date: Mon Jun 15 11:40:05 2009 +0200 Automatic commit of package [oracle-instantclient-selinux] minor releas= e [10.2-15]. diff --git a/rel-eng/packages/oracle-instantclient-selinux b/rel-eng/packag= es/oracle-instantclient-selinux index 626307f..f6ef1bd 100644 --- a/rel-eng/packages/oracle-instantclient-selinux +++ b/rel-eng/packages/oracle-instantclient-selinux @@ -1 +1 @@ -10.2-14 selinux/oracle-instantclient-selinux/ +10.2-15 selinux/oracle-instantclient-selinux/ diff --git a/selinux/oracle-instantclient-selinux/oracle-instantclient-seli= nux.spec b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinu= x.spec index 16b68c1..bc07a72 100644 --- a/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec +++ b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec @@ -1,7 +1,7 @@ = Name: oracle-instantclient-selinux Version: 10.2 -Release: 14%{?dist} +Release: 15%{?dist} Summary: SELinux support for Oracle Instant Client Group: System Environment/Base License: GPLv2+ @@ -114,6 +114,9 @@ fi %attr(0755,root,root) %{_sbindir}/oracle-instantclient-sqlplus-selinux-ena= ble = %changelog +* Mon Jun 15 2009 Miroslav Suchy 10.2-15 +- 498611 - run "semodule -i" in %%post and restorecon in %%posttrans + * Thu Jun 11 2009 Miroslav Suchy 10.2-14 - return version down to 10.2 = commit 1f8d9206b4e510362e9cb48208b06b93a263c514 Author: Miroslav Such=C3=BD Date: Mon Jun 15 11:39:11 2009 +0200 Automatic commit of package [jabberd-selinux] release [1.4.5-1]. diff --git a/rel-eng/packages/jabberd-selinux b/rel-eng/packages/jabberd-se= linux index 6257821..ebe9b5c 100644 --- a/rel-eng/packages/jabberd-selinux +++ b/rel-eng/packages/jabberd-selinux @@ -1 +1 @@ -1.4.4-1 selinux/jabberd-selinux/ +1.4.5-1 selinux/jabberd-selinux/ diff --git a/selinux/jabberd-selinux/jabberd-selinux.spec b/selinux/jabberd= -selinux/jabberd-selinux.spec index 9e3693f..c30869c 100644 --- a/selinux/jabberd-selinux/jabberd-selinux.spec +++ b/selinux/jabberd-selinux/jabberd-selinux.spec @@ -7,7 +7,7 @@ %define modulename jabber = Name: jabberd-selinux -Version: 1.4.4 +Version: 1.4.5 Release: 1%{?dist} Summary: SELinux policy module supporting jabberd = @@ -105,6 +105,9 @@ rpm -ql jabberd | xargs -n 1 /sbin/restorecon -ri {} ||= : %attr(0755,root,root) %{_sbindir}/%{name}-enable = %changelog +* Mon Jun 15 2009 Miroslav Suchy 1.4.5-1 +- 498611 - run "semodule -i" in %%post and restorecon in %%posttrans + * Wed Jun 10 2009 Miroslav Suchy 1.4.4-1 - 498611 - run restorecon in %%posttrans = commit b5014c5053a69a19bc0fcddaeb22fe1e1864c2c2 Author: Miroslav Such=C3=BD Date: Mon Jun 15 11:38:24 2009 +0200 Automatic commit of package [osad] release [5.9.13-1]. diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index 4ee8665..9abb0c5 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -9,7 +9,7 @@ Group: System Environment/Daemons License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz -Version: 5.9.12 +Version: 5.9.13 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -233,8 +233,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -r= vvi {} = # $Id$ %changelog -* Mon Jun 15 2009 Miroslav Suchy 5.9.12-1 +* Mon Jun 15 2009 Miroslav Suchy 5.9.13-1 - 498611 - run restorecon in %%posttrans +- 498611 - run "semodule -i" in %%post and restorecon in %%posttrans = * Wed Apr 29 2009 Jan Pazdziora 5.9.11-1 - move the %%post SELinux activation to diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad index 04d25e8..bd219ae 100644 --- a/rel-eng/packages/osad +++ b/rel-eng/packages/osad @@ -1 +1 @@ -5.9.12-1 client/tools/osad/ +5.9.13-1 client/tools/osad/ --===============5905940839244501531==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:38 2015 Content-Type: multipart/mixed; boundary="===============7359550483130266355==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/oracle-instantclient-selinux-10.2-15' Date: Mon, 15 Jun 2009 09:47:41 +0000 Message-ID: <20090615094741.6F45C120379@lists.fedorahosted.org> --===============7359550483130266355== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'oracle-instantclient-selinux-10.2-15' created by Miroslav Such=C3=BD <= msuchy(a)redhat.com> at 2009-06-15 09:40 +0000 Tagging package [oracle-instantclient-selinux] version [10.2-15] in directo= ry [selinux/oracle-instantclient-selinux/]. Changes since jabberd-selinux-1.4.5-1: Miroslav Such=C3=BD (1): Automatic commit of package [oracle-instantclient-selinux] minor rele= ase [10.2-15]. --- rel-eng/packages/oracle-instantclient-selinux | = 2 +- selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec | = 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) --- --===============7359550483130266355==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:38 2015 Content-Type: multipart/mixed; boundary="===============3466966557920973344==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/jabberd-selinux-1.4.5-1' Date: Mon, 15 Jun 2009 09:47:41 +0000 Message-ID: <20090615094741.16FB8120378@lists.fedorahosted.org> --===============3466966557920973344== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'jabberd-selinux-1.4.5-1' created by Miroslav Such=C3=BD at 2009-06-15 09:39 +0000 Tagging package [jabberd-selinux] version [1.4.5-1] in directory [selinux/j= abberd-selinux/]. Changes since osad-5.9.12-1-3: --- 0 files changed --- --===============3466966557920973344==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:38 2015 Content-Type: multipart/mixed; boundary="===============6489376226036573751==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/oracle-rhnsat-selinux-10.2-13' Date: Mon, 15 Jun 2009 09:47:41 +0000 Message-ID: <20090615094741.E0C7212037A@lists.fedorahosted.org> --===============6489376226036573751== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'oracle-rhnsat-selinux-10.2-13' created by Miroslav Such=C3=BD at 2009-06-15 09:41 +0000 Tagging package [oracle-rhnsat-selinux] version [10.2-13] in directory [sel= inux/oracle-rhnsat-selinux/]. Changes since oracle-instantclient-selinux-10.2-15: Miroslav Such=C3=BD (1): Automatic commit of package [oracle-rhnsat-selinux] minor release [10= .2-13]. --- rel-eng/packages/oracle-rhnsat-selinux | 2 +- selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) --- --===============6489376226036573751==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:38 2015 Content-Type: multipart/mixed; boundary="===============4473501703461231729==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/oracle-selinux-0.3-1' Date: Mon, 15 Jun 2009 09:47:42 +0000 Message-ID: <20090615094742.4179312037B@lists.fedorahosted.org> --===============4473501703461231729== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'oracle-selinux-0.3-1' created by Miroslav Such=C3=BD at 2009-06-15 09:44 +0000 Tagging package [oracle-selinux] version [0.3-1] in directory [selinux/orac= le-selinux/]. Changes since oracle-rhnsat-selinux-10.2-13: Miroslav Such=C3=BD (1): Automatic commit of package [oracle-selinux] release [0.3-1]. --- rel-eng/packages/oracle-selinux | 2 +- selinux/oracle-selinux/oracle-selinux.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) --- --===============4473501703461231729==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:38 2015 Content-Type: multipart/mixed; boundary="===============5940166404404565659==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/osad-5.9.13-1' Date: Mon, 15 Jun 2009 09:47:42 +0000 Message-ID: <20090615094742.E1D7712037D@lists.fedorahosted.org> --===============5940166404404565659== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'osad-5.9.13-1' created by Miroslav Such=C3=BD at= 2009-06-15 09:38 +0000 Tagging package [osad] version [5.9.13-1] in directory [client/tools/osad/]. Changes since osad-5.9.12-1-2: --- 0 files changed --- --===============5940166404404565659==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:38 2015 Content-Type: multipart/mixed; boundary="===============5266237938322819769==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/oracle-xe-selinux-10.2-12' Date: Mon, 15 Jun 2009 09:47:42 +0000 Message-ID: <20090615094742.954C112037C@lists.fedorahosted.org> --===============5266237938322819769== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'oracle-xe-selinux-10.2-12' created by Miroslav Such=C3=BD at 2009-06-15 09:45 +0000 Tagging package [oracle-xe-selinux] version [10.2-12] in directory [selinux= /oracle-xe-selinux/]. Changes since oracle-selinux-0.3-1: Miroslav Such=C3=BD (1): Automatic commit of package [oracle-xe-selinux] minor release [10.2-1= 2]. --- rel-eng/packages/oracle-xe-selinux | 2 +- selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) --- --===============5266237938322819769==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:38 2015 Content-Type: multipart/mixed; boundary="===============1170671669540622063==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-monitoring-selinux-0.6.11-1' Date: Mon, 15 Jun 2009 09:47:43 +0000 Message-ID: <20090615094743.3E29512037E@lists.fedorahosted.org> --===============1170671669540622063== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-monitoring-selinux-0.6.11-1' created by Miroslav Such=C3=BD = at 2009-06-15 09:46 +0000 Tagging package [spacewalk-monitoring-selinux] version [0.6.11-1] in direct= ory [selinux/spacewalk-monitoring-selinux/]. Changes since oracle-xe-selinux-10.2-12: Miroslav Such=C3=BD (1): Automatic commit of package [spacewalk-monitoring-selinux] release [0= .6.11-1]. --- rel-eng/packages/spacewalk-monitoring-selinux | = 2 +- selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | = 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) --- --===============1170671669540622063==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:38 2015 Content-Type: multipart/mixed; boundary="===============2218693855889410738==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-proxy-selinux-0.6.4-1' Date: Mon, 15 Jun 2009 09:47:43 +0000 Message-ID: <20090615094743.BD997120375@lists.fedorahosted.org> --===============2218693855889410738== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-proxy-selinux-0.6.4-1' created by Miroslav Such=C3=BD at 2009-06-15 09:46 +0000 Tagging package [spacewalk-proxy-selinux] version [0.6.4-1] in directory [s= elinux/spacewalk-proxy-selinux/]. Changes since spacewalk-monitoring-selinux-0.6.11-1: Miroslav Such=C3=BD (1): Automatic commit of package [spacewalk-proxy-selinux] release [0.6.4-= 1]. --- rel-eng/packages/spacewalk-proxy-selinux | 2 +- selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) --- --===============2218693855889410738==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:38 2015 Content-Type: multipart/mixed; boundary="===============6650957439921190363==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-selinux-0.6.10-1' Date: Mon, 15 Jun 2009 09:47:44 +0000 Message-ID: <20090615094744.1F9BB120376@lists.fedorahosted.org> --===============6650957439921190363== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-selinux-0.6.10-1' created by Miroslav Such=C3=BD at 2009-06-15 09:47 +0000 Tagging package [spacewalk-selinux] version [0.6.10-1] in directory [selinu= x/spacewalk-selinux/]. Changes since spacewalk-proxy-selinux-0.6.4-1: Miroslav Such=C3=BD (1): Automatic commit of package [spacewalk-selinux] release [0.6.10-1]. --- rel-eng/packages/spacewalk-selinux | 2 +- selinux/spacewalk-selinux/spacewalk-selinux.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) --- --===============6650957439921190363==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:38 2015 Content-Type: multipart/mixed; boundary="===============4001937481068712018==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - client/tools selinux/jabberd-selinux selinux/oracle-instantclient-selinux selinux/oracle-rhnsat-selinux selinux/oracle-selinux selinux/oracle-xe-selinux selinux/spacewalk-monitoring-selinux selinux/spacewalk-proxy-selinux selinux/spacewalk-selinux Date: Mon, 15 Jun 2009 09:49:52 +0000 Message-ID: <20090615094952.576D7120375@lists.fedorahosted.org> --===============4001937481068712018== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/osad/osad.spec | = 9 +++- selinux/jabberd-selinux/jabberd-selinux.spec | = 9 +++- selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec | = 16 ++++++- selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | = 11 ++++- selinux/oracle-selinux/oracle-selinux.spec | = 21 +++++++++- selinux/oracle-xe-selinux/oracle-xe-selinux.spec | = 11 ++++- selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | = 9 +++- selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec | = 7 ++- selinux/spacewalk-selinux/spacewalk-selinux.spec | = 9 +++- 9 files changed, 91 insertions(+), 11 deletions(-) New commits: commit e67b06c188f5850a5ce89632b8171ce06bb0ed7b Author: Miroslav Such=C3=BD Date: Mon Jun 15 11:21:37 2009 +0200 498611 - run "semodule -i" in %post and restorecon in %posttrans = According to jnovy there is no guaranteed order of %posttrans :( Therefore we will need to split %{_sbindir}/%{name}-enable into two par= ts. semodule -i should be called in %post when we have guaranteed order due requires and in %posttrans we can restorecon and there is no need of de= pendency then. (cherry picked from commit 115478daa9322baf18e487de6f188ce49dbe430a) diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index 17445af..08293df 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -156,11 +156,18 @@ if [ $1 =3D 0 ]; then fi = %if %{include_selinux_package} -%posttrans -n osa-dispatcher-selinux +%post -n osa-dispatcher-selinux if /usr/sbin/selinuxenabled ; then %{_sbindir}/osa-dispatcher-selinux-enable fi = +%posttrans -n osa-dispatcher-selinux +#this may be safely remove when BZ 505066 is fixed +if /usr/sbin/selinuxenabled ; then + rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvvi {} + /sbin/restorecon -vvi /var/log/rhn/osa-dispatcher.log +fi + %postun -n osa-dispatcher-selinux # Clean up after package removal if [ $1 -eq 0 ]; then diff --git a/selinux/jabberd-selinux/jabberd-selinux.spec b/selinux/jabberd= -selinux/jabberd-selinux.spec index d8b07ed..1562418 100644 --- a/selinux/jabberd-selinux/jabberd-selinux.spec +++ b/selinux/jabberd-selinux/jabberd-selinux.spec @@ -70,11 +70,18 @@ install -p -m 755 %{name}-enable %{buildroot}%{_sbindir= }/%{name}-enable %clean rm -rf %{buildroot} = -%posttrans +%post if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable fi = +%posttrans +#this may be safely remove when BZ 505066 is fixed +if /usr/sbin/selinuxenabled ; then + rpm -ql jabberd | xargs -n 1 /sbin/restorecon -ri {} || : + /sbin/restorecon -ri /var/run/jabberd || : +fi + %postun # Clean up after package removal if [ $1 -eq 0 ]; then diff --git a/selinux/oracle-instantclient-selinux/oracle-instantclient-seli= nux.spec b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinu= x.spec index c6565e1..0f67734 100644 --- a/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec +++ b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec @@ -68,11 +68,17 @@ EOS %clean rm -rf $RPM_BUILD_ROOT = -%posttrans +%post if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable fi = +%posttrans +#this may be safely remove when BZ 505066 is fixed +if /usr/sbin/selinuxenabled ; then + /sbin/restorecon -Rvv /usr/lib/oracle/10.2.*/client* || : +fi + %postun if [ $1 -eq 0 ]; then for i in %used_libs ; do @@ -82,11 +88,17 @@ if [ $1 -eq 0 ]; then /sbin/restorecon -Rvv /usr/lib/oracle/10.2.*/client* || : fi = -%posttrans -n oracle-instantclient-sqlplus-selinux +%post -n oracle-instantclient-sqlplus-selinux if /usr/sbin/selinuxenabled ; then %{_sbindir}/oracle-instantclient-sqlplus-selinux-enable fi = +%posttrans -n oracle-instantclient-sqlplus-selinux +#this may be safely remove when BZ 505066 is fixed +if /usr/sbin/selinuxenabled ; then + /sbin/restorecon -Rvv /usr/lib/oracle/10.2.*/client* || : +fi + %postun -n oracle-instantclient-sqlplus-selinux if [ $1 -eq 0 ]; then /usr/sbin/semanage fcontext -d -t oracle_sqlplus_exec_t '/usr/lib/oracle/= 10\.2\..*/client.*/bin/sqlplus' diff --git a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec b/sel= inux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec index 736e838..ecc991d 100644 --- a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec +++ b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec @@ -74,11 +74,20 @@ install -p -m 755 %{name}-%{version}/%{name}-enable %{b= uildroot}%{_sbindir}/%{na %clean rm -rf %{buildroot} = -%posttrans +%post if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable fi = +%posttrans +#this may be safely removed when BZ 505066 is fixed +if /usr/sbin/selinuxenabled ; then + # Fix up oracle-server-arch files + rpm -q --whatprovides oracle-server | xargs rpm -ql | xargs -n 100 /sbin= /restorecon -Riv + # Fix up database files + /sbin/restorecon -rvi /rhnsat /var/tmp/.oracle || : +fi + %postun # Clean up after package removal if [ $1 -eq 0 ]; then diff --git a/selinux/oracle-selinux/oracle-selinux.spec b/selinux/oracle-se= linux/oracle-selinux.spec index 8e07ec4..fb239ed 100644 --- a/selinux/oracle-selinux/oracle-selinux.spec +++ b/selinux/oracle-selinux/oracle-selinux.spec @@ -114,7 +114,7 @@ install -p -m 755 SELinux/oracle-nofcontext-selinux-ena= ble %{buildroot}%{_sbindi %clean rm -rf %{buildroot} = -%posttrans +%post # Install SELinux policy modules for selinuxvariant in %{selinux_variants} do @@ -132,11 +132,28 @@ test ${SEPORT_STATUS} -lt 1 && semanage port -a -t or= acle_port_t -p tcp 1521 || /sbin/restorecon -R -v /etc || : /sbin/restorecon -R -v /var/tmp || : = -%posttrans -n oracle-nofcontext-selinux +%posttrans +#this may be safely removed when BZ 505066 is fixed +if /usr/sbin/selinuxenabled ; then + # Fix up non-standard file contexts + /sbin/restorecon -R -v %{oracle_base} || : + /sbin/restorecon -R -v /u0? || : + /sbin/restorecon -R -v /etc || : + /sbin/restorecon -R -v /var/tmp || : +fi + +%post -n oracle-nofcontext-selinux if /usr/sbin/selinuxenabled ; then %{_sbindir}/oracle-nofcontext-selinux-enable fi = +%posttrans -n oracle-nofcontext-selinux +if /usr/sbin/selinuxenabled ; then + # add an oracle port if it does not already exist + SEPORT_STATUS=3D`semanage port -l | grep -c ^oracle` + test ${SEPORT_STATUS} -lt 1 && semanage port -a -t oracle_port_t -p tcp = 1521 || : +fi + %postun # Clean up after package removal if [ $1 -eq 0 ]; then diff --git a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec b/selinux/ora= cle-xe-selinux/oracle-xe-selinux.spec index 5ef5342..ad9fceb 100644 --- a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec +++ b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec @@ -97,11 +97,20 @@ elif [ $ORACLE_UID -ge 500 ] ; then exit 1 fi = -%posttrans +%post if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable fi = +%posttrans +#this may be safely remove when BZ 505066 is fixed +if /usr/sbin/selinuxenabled ; then + # Relabel oracle-xe-univ's files + rpm -ql oracle-xe-univ | xargs -n 100 /sbin/restorecon -Rivv + # Fix up additional directories, not owned by oracle-xe-univ + /sbin/restorecon -Rivv %extra_restorecon +fi + %postun # Clean up after package removal if [ $1 -eq 0 ]; then diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-seli= nux.spec b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinu= x.spec index f485c26..a92c013 100644 --- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec +++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec @@ -108,11 +108,18 @@ install -p -m 755 %{name}-enable %{buildroot}%{_sbind= ir}/%{name}-enable %clean rm -rf %{buildroot} = -%posttrans +%post if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable fi = +%posttrans +#this may be safely remove when BZ 505066 is fixed +if /usr/sbin/selinuxenabled ; then + /sbin/restorecon -rv /etc/rc.d/np.d /etc/notification /var/lib/nocpulse = /var/lib/notification /var/log/nocpulse + /sbin/restorecon -rvi /var/log/SysVStep.* /var/run/SysVStep.* +fi + %postun # Clean up after package removal if [ $1 -eq 0 ]; then diff --git a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec b= /selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec index 3978aee..395310f 100644 --- a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec +++ b/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec @@ -76,11 +76,16 @@ install -p -m 755 %{name}-enable %{buildroot}%{_sbindir= }/%{name}-enable %clean rm -rf %{buildroot} = -%posttrans +%post if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable fi = +%posttrans +if /usr/sbin/selinuxenabled ; then + /sbin/restorecon -rvvi /var/log/rhn /var/cache/rhn/proxy-auth /var/spool= /rhn-proxy +fi + %postun # Clean up after package removal if [ $1 -eq 0 ]; then diff --git a/selinux/spacewalk-selinux/spacewalk-selinux.spec b/selinux/spa= cewalk-selinux/spacewalk-selinux.spec index 25ab6e4..875a2f0 100644 --- a/selinux/spacewalk-selinux/spacewalk-selinux.spec +++ b/selinux/spacewalk-selinux/spacewalk-selinux.spec @@ -79,11 +79,18 @@ install -p -m 755 %{name}-enable %{buildroot}%{_sbindir= }/%{name}-enable %clean rm -rf %{buildroot} = -%posttrans +%post if /usr/sbin/selinuxenabled ; then %{_sbindir}/%{name}-enable --run-pure fi = +%posttrans +#this may be safely remove when BZ 505066 is fixed +if /usr/sbin/selinuxenabled ; then + /sbin/restorecon -rvvi /etc/rhn/satellite-httpd/conf/satidmap.pl /usr/sb= in/rhn-sat-restart-silent /var/log/rhn /var/cache/rhn \ + /usr/bin/rhn-sudo-ssl-tool /usr/bin/rhn-sudo-load-ssl-cert +fi + %postun # Clean up after package removal if [ $1 -eq 0 ]; then --===============4001937481068712018==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:38 2015 Content-Type: multipart/mixed; boundary="===============6443807811231004396==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - proxy/proxy rel-eng/packages Date: Mon, 15 Jun 2009 10:46:41 +0000 Message-ID: <20090615104641.8214D120375@lists.fedorahosted.org> --===============6443807811231004396== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/proxy/httpd-conf/rhn_proxy.conf | 2 +- proxy/proxy/spacewalk-proxy.spec | 5 ++++- rel-eng/packages/spacewalk-proxy | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) New commits: commit 8b20bbe3f3118fa3a5e8fe696d0df5236e6f6497 Author: Miroslav Such=C3=BD Date: Mon Jun 15 12:46:32 2009 +0200 Automatic commit of package [spacewalk-proxy] release [0.6.4-1]. diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy= .spec index efc2e15..74e9180 100644 --- a/proxy/proxy/spacewalk-proxy.spec +++ b/proxy/proxy/spacewalk-proxy.spec @@ -4,7 +4,7 @@ Group: Applications/Internet License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz -Version: 0.6.3 +Version: 0.6.4 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) = BuildRequires: python @@ -288,6 +288,9 @@ fi = = %changelog +* Mon Jun 15 2009 Miroslav Suchy 0.6.4-1 +- 503187 - close tag + * Wed Jun 10 2009 Miroslav Suchy 0.6.3-1 - 503187 - set MaxRequestsPerChild to 200 (Proxy CLI) = diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-= proxy index 096d3b7..29725a0 100644 --- a/rel-eng/packages/spacewalk-proxy +++ b/rel-eng/packages/spacewalk-proxy @@ -1 +1 @@ -0.6.3-1 proxy/proxy/ +0.6.4-1 proxy/proxy/ commit 65806ffdc604a27c5ef9bbdfc86f3fdf5012ba91 Author: Miroslav Such=C3=BD Date: Mon Jun 15 12:44:35 2009 +0200 503187 - close tag diff --git a/proxy/proxy/httpd-conf/rhn_proxy.conf b/proxy/proxy/httpd-conf= /rhn_proxy.conf index 5549297..e56c916 100644 --- a/proxy/proxy/httpd-conf/rhn_proxy.conf +++ b/proxy/proxy/httpd-conf/rhn_proxy.conf @@ -4,7 +4,7 @@ # bug #503187 MaxRequestsPerChild 200 - = # RHN Proxy Server location --===============6443807811231004396==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:38 2015 Content-Type: multipart/mixed; boundary="===============0685430142961422247==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-proxy-0.6.4-1' Date: Mon, 15 Jun 2009 10:46:49 +0000 Message-ID: <20090615104649.D1DEE120375@lists.fedorahosted.org> --===============0685430142961422247== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-proxy-0.6.4-1' created by Miroslav Such=C3=BD at 2009-06-15 10:46 +0000 Tagging package [spacewalk-proxy] version [0.6.4-1] in directory [proxy/pro= xy/]. Changes since spacewalk-selinux-0.6.10-1-1: --- 0 files changed --- --===============0685430142961422247==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:38 2015 Content-Type: multipart/mixed; boundary="===============0142149048229768011==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - proxy/proxy Date: Mon, 15 Jun 2009 10:48:05 +0000 Message-ID: <20090615104805.E830A120375@lists.fedorahosted.org> --===============0142149048229768011== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/proxy/httpd-conf/rhn_proxy.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e184015d62dbcd3d4ccc90a9674989035e5d5ceb Author: Miroslav Such=C3=BD Date: Mon Jun 15 12:44:35 2009 +0200 503187 - close tag (cherry picked from commit 65806ffdc604a27c5ef9bbdfc86f3fdf5012ba91) diff --git a/proxy/proxy/httpd-conf/rhn_proxy.conf b/proxy/proxy/httpd-conf= /rhn_proxy.conf index 5549297..e56c916 100644 --- a/proxy/proxy/httpd-conf/rhn_proxy.conf +++ b/proxy/proxy/httpd-conf/rhn_proxy.conf @@ -4,7 +4,7 @@ # bug #503187 MaxRequestsPerChild 200 - = # RHN Proxy Server location --===============0142149048229768011==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:38 2015 Content-Type: multipart/mixed; boundary="===============4155178528224594553==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: backend/server Date: Mon, 15 Jun 2009 17:32:23 +0000 Message-ID: <20090615173223.A54281201B7@lists.fedorahosted.org> --===============4155178528224594553== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/importlib/backend.py | 7 +++++++ 1 file changed, 7 insertions(+) New commits: commit 994a53a8c2db4b0dfdb06b9de5b72cd515d1cd8d Author: Pradeep Kilambi Date: Mon Jun 15 13:32:09 2009 -0400 505680 - When satsync tries to do an import it compares whats in cache = to db and tries to import only new content, but since the last_modified dat= e always differ we end up updating the rhnChannel table even when there is = nothing to sync. Adding last_modified to ignore keys list so that we dont d= ecide the diff based on this field. We still continue to compare the rest o= f the fields. diff --git a/backend/server/importlib/backend.py b/backend/server/importlib= /backend.py index 4ae1093..b1d7a5e 100644 --- a/backend/server/importlib/backend.py +++ b/backend/server/importlib/backend.py @@ -2015,7 +2015,14 @@ def _buildExternalValue(dict, entry, tableObj): def computeDiff(hash1, hash2, diffHash, diffobj, prefix=3DNone): # Compare if the key-values of hash1 are a subset of hash2's difference =3D 0 + ignore_keys =3D ['last_modified'] + for k, v in hash1.items(): + if k in ignore_keys: + # Dont decide the diff based on last_modified + # as this obviously wont match due to our db + # other triggers. + continue if hash2[k] =3D=3D v: # Same values continue --===============4155178528224594553==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:38 2015 Content-Type: multipart/mixed; boundary="===============0408996490840483103==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - backend/server Date: Mon, 15 Jun 2009 17:53:11 +0000 Message-ID: <20090615175311.2CE501201B7@lists.fedorahosted.org> --===============0408996490840483103== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/importlib/backend.py | 7 +++++++ 1 file changed, 7 insertions(+) New commits: commit 24af2dae7cf51bd32563f3e9cffec38c38b6934d Author: Pradeep Kilambi Date: Mon Jun 15 13:32:09 2009 -0400 505680 - When satsync tries to do an import it compares whats in cache = to db and tries to import only new content, but since the last_modified dat= e always differ we end up updating the rhnChannel table even when there is = nothing to sync. Adding last_modified to ignore keys list so that we dont d= ecide the diff based on this field. We still continue to compare the rest o= f the fields. diff --git a/backend/server/importlib/backend.py b/backend/server/importlib= /backend.py index 4ae1093..b1d7a5e 100644 --- a/backend/server/importlib/backend.py +++ b/backend/server/importlib/backend.py @@ -2015,7 +2015,14 @@ def _buildExternalValue(dict, entry, tableObj): def computeDiff(hash1, hash2, diffHash, diffobj, prefix=3DNone): # Compare if the key-values of hash1 are a subset of hash2's difference =3D 0 + ignore_keys =3D ['last_modified'] + for k, v in hash1.items(): + if k in ignore_keys: + # Dont decide the diff based on last_modified + # as this obviously wont match due to our db + # other triggers. + continue if hash2[k] =3D=3D v: # Same values continue --===============0408996490840483103==-- From shughes at fedoraproject.org Thu Aug 20 11:57:38 2015 Content-Type: multipart/mixed; boundary="===============6473323139481534297==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Mon, 15 Jun 2009 18:11:52 +0000 Message-ID: <20090615181152.E7A881201B7@lists.fedorahosted.org> --===============6473323139481534297== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralConfigA= ctionTest.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit 6f7570fd077fd0276b8a0d9bf53a98ca3c4fda78 Author: Shannon Hughes Date: Mon Jun 15 14:04:35 2009 -0400 fix unit test cases diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/Ge= neralConfigActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/s= atellite/test/GeneralConfigActionTest.java index 72d64d0..af94a3d 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralCo= nfigActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralCo= nfigActionTest.java @@ -103,10 +103,7 @@ public class GeneralConfigActionTest extends RhnMockSt= rutsTestCase { assertEquals("testuser(a)redhat.com", Config.get().getString("trac= eback_mail")); assertEquals("testbox", Config.get().getString("server.jabber_serv= er")); = - = - // The 2 errors are from the 1st actionPerform() - verifyActionMessages(new String[] {"config.restartrequired", = - "errors.required", "errors.required"}); + verifyActionMessages(new String[] {"config.restartrequired"}); = = Config.get().setBoolean(TEST_CONFIG_BOOLEAN, new Boolean(origValue= ).toString()); --===============6473323139481534297==-- From shughes at fedoraproject.org Thu Aug 20 11:57:38 2015 Content-Type: multipart/mixed; boundary="===============0096443673660674140==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Mon, 15 Jun 2009 18:13:19 +0000 Message-ID: <20090615181320.00E691201B7@lists.fedorahosted.org> --===============0096443673660674140== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralConfigA= ctionTest.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit 49942078c920576babbeb2d8d486ee4ca589aa95 Author: Shannon Hughes Date: Mon Jun 15 14:04:35 2009 -0400 fix unit test cases diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/Ge= neralConfigActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/s= atellite/test/GeneralConfigActionTest.java index 72d64d0..af94a3d 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralCo= nfigActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralCo= nfigActionTest.java @@ -103,10 +103,7 @@ public class GeneralConfigActionTest extends RhnMockSt= rutsTestCase { assertEquals("testuser(a)redhat.com", Config.get().getString("trac= eback_mail")); assertEquals("testbox", Config.get().getString("server.jabber_serv= er")); = - = - // The 2 errors are from the 1st actionPerform() - verifyActionMessages(new String[] {"config.restartrequired", = - "errors.required", "errors.required"}); + verifyActionMessages(new String[] {"config.restartrequired"}); = = Config.get().setBoolean(TEST_CONFIG_BOOLEAN, new Boolean(origValue= ).toString()); --===============0096443673660674140==-- From jdob at fedoraproject.org Thu Aug 20 11:57:38 2015 Content-Type: multipart/mixed; boundary="===============1664500090953152067==" MIME-Version: 1.0 From: jdob To: spacewalk-commits at lists.fedorahosted.org Subject: web/html Date: Mon, 15 Jun 2009 18:47:49 +0000 Message-ID: <20090615184749.2E9DC1201B7@lists.fedorahosted.org> --===============1664500090953152067== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable web/html/network/systems/ssm/provisioning/remote_command_conf.pxt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 500fb9d63cdcddf37786f72c0e5b353a454ce757 Author: Jason Dobies Date: Mon Jun 15 14:42:08 2009 -0400 501933 - Changed the script rendering to wrap in a readonly textarea. = As a pre tag, any overly long lines extended the width of the content a= rea indefinitely. On IE, past a certain limit caused problems with the widt= h calculation and the submit button could slide off the right side. = With this change, the script will be held inside of a scrollable textar= ea, just like when it was originally entered (except on the confirmation pa= ge the textarea is readonly). This way, it's rendered just like when the us= er first entered it, however the size can be held constant and scroll bars = are used to navigate long scripts. diff --git a/web/html/network/systems/ssm/provisioning/remote_command_conf.= pxt b/web/html/network/systems/ssm/provisioning/remote_command_conf.pxt index c0c4cbc..db97c5e 100644 --- a/web/html/network/systems/ssm/provisioning/remote_command_conf.pxt +++ b/web/html/network/systems/ssm/provisioning/remote_command_conf.pxt @@ -30,7 +30,7 @@ Script: -
                                      {formvar:script}
                                      + --===============1664500090953152067==-- From jdob at fedoraproject.org Thu Aug 20 11:57:38 2015 Content-Type: multipart/mixed; boundary="===============0176338316448186097==" MIME-Version: 1.0 From: jdob To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - web/html Date: Mon, 15 Jun 2009 18:48:20 +0000 Message-ID: <20090615184820.13B391201B7@lists.fedorahosted.org> --===============0176338316448186097== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable web/html/network/systems/ssm/provisioning/remote_command_conf.pxt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9d274534a9b8683510ba538f7baca74bf1ab54cc Author: Jason Dobies Date: Mon Jun 15 14:42:08 2009 -0400 501933 - Changed the script rendering to wrap in a readonly textarea. = As a pre tag, any overly long lines extended the width of the content a= rea indefinitely. On IE, past a certain limit caused problems with the widt= h calculation and the submit button could slide off the right side. = With this change, the script will be held inside of a scrollable textar= ea, just like when it was originally entered (except on the confirmation pa= ge the textarea is readonly). This way, it's rendered just like when the us= er first entered it, however the size can be held constant and scroll bars = are used to navigate long scripts. diff --git a/web/html/network/systems/ssm/provisioning/remote_command_conf.= pxt b/web/html/network/systems/ssm/provisioning/remote_command_conf.pxt index c0c4cbc..db97c5e 100644 --- a/web/html/network/systems/ssm/provisioning/remote_command_conf.pxt +++ b/web/html/network/systems/ssm/provisioning/remote_command_conf.pxt @@ -30,7 +30,7 @@ Script: -
                                      {formvar:script}
                                      + --===============0176338316448186097==-- From jdob at fedoraproject.org Thu Aug 20 11:57:38 2015 Content-Type: multipart/mixed; boundary="===============2589964590588869766==" MIME-Version: 1.0 From: jdob To: spacewalk-commits at lists.fedorahosted.org Subject: web/modules Date: Mon, 15 Jun 2009 19:25:56 +0000 Message-ID: <20090615192556.99BB41201B7@lists.fedorahosted.org> --===============2589964590588869766== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable web/modules/rhn/RHN/Form/Widget/TextArea.pm | 17 +++++++++++++++-- web/modules/sniglets/Sniglets/Servers.pm | 1 + 2 files changed, 16 insertions(+), 2 deletions(-) New commits: commit 121a259a4f609854aed3e50102b37aeb6b74905f Author: Jason Dobies Date: Mon Jun 15 15:20:51 2009 -0400 506154 - Added "wrap" option to textarea widget. Set to off for remote = command script editing page. diff --git a/web/modules/rhn/RHN/Form/Widget/TextArea.pm b/web/modules/rhn/= RHN/Form/Widget/TextArea.pm index 5582afd..d8392cd 100644 --- a/web/modules/rhn/RHN/Form/Widget/TextArea.pm +++ b/web/modules/rhn/RHN/Form/Widget/TextArea.pm @@ -24,7 +24,8 @@ use RHN::Form::Widget; our @ISA =3D qw/RHN::Form::Widget/; = my %valid_fields =3D (rows =3D> undef, - cols =3D> undef); + cols =3D> undef, + wrap =3D> undef); = sub valid_fields { return (shift->SUPER::valid_fields(), %valid_fields) } = @@ -52,13 +53,25 @@ sub cols { return $self->{cols}; } = +sub wrap { + my $self =3D shift; + my $wrap =3D shift; + + if (defined $wrap) { + $self->{wrap} =3D $wrap; + } + + return $self->{wrap}; +} + sub render { my $self =3D shift; = my $ret =3D PXT::HTML->textarea(-name =3D> $self->label, -value =3D> PXT::Utils->escapeHTML($self->value || $self->default || '= '), -cols =3D> $self->cols, - -rows =3D> $self->rows); + -rows =3D> $self->rows, + -wrap =3D> $self->wrap); = return $ret; } diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglet= s/Sniglets/Servers.pm index 7c6384c..7c79c4f 100644 --- a/web/modules/sniglets/Sniglets/Servers.pm +++ b/web/modules/sniglets/Sniglets/Servers.pm @@ -2176,6 +2176,7 @@ sub build_remote_command_form { label =3D> 'script', rows =3D> 8, cols =3D> 80, + wrap =3D> 'off', default =3D> "#!/bin/sh\n", requires =3D> { response =3D> 1 }, }); --===============2589964590588869766==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:38 2015 Content-Type: multipart/mixed; boundary="===============7006016105693574676==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Mon, 15 Jun 2009 20:19:23 +0000 Message-ID: <20090615201923.546351201B7@lists.fedorahosted.org> --===============7006016105693574676== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageOverviewSer= ializer.java | 3 +++ 1 file changed, 3 insertions(+) New commits: commit f07ee3605a0e55e34e0e9cf88b4543014c87e0eb Author: Brad Buckingham Date: Mon Jun 15 16:18:41 2009 -0400 506144 - apidoc - packages.search - adding missing files to return value diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/Packag= eOverviewSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/ser= ializer/PackageOverviewSerializer.java index 3b4560f..0098d1a 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageOvervi= ewSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageOvervi= ewSerializer.java @@ -30,12 +30,15 @@ import redstone.xmlrpc.XmlRpcSerializer; * * @xmlrpc.doc * #struct("package overview") + * #prop("int", "id") * #prop("string", "name") * #prop("string", "summary") * #prop("string", "description") * #prop("string", "version") * #prop("string", "release") + * #prop("string", "arch") * #prop("string", "epoch") + * #prop("string", "provider") * #struct_end() */ public class PackageOverviewSerializer implements XmlRpcCustomSerializer { --===============7006016105693574676==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:38 2015 Content-Type: multipart/mixed; boundary="===============2956095444423891761==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Mon, 15 Jun 2009 20:20:55 +0000 Message-ID: <20090615202055.31ECA1201B7@lists.fedorahosted.org> --===============2956095444423891761== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageOverviewSer= ializer.java | 3 +++ 1 file changed, 3 insertions(+) New commits: commit 8acdb69e0635b08460c69f65e88af8598577b73a Author: Brad Buckingham Date: Mon Jun 15 16:18:41 2009 -0400 506144 - apidoc - packages.search - adding missing files to return value diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/Packag= eOverviewSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/ser= ializer/PackageOverviewSerializer.java index 3b4560f..0098d1a 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageOvervi= ewSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageOvervi= ewSerializer.java @@ -30,12 +30,15 @@ import redstone.xmlrpc.XmlRpcSerializer; * * @xmlrpc.doc * #struct("package overview") + * #prop("int", "id") * #prop("string", "name") * #prop("string", "summary") * #prop("string", "description") * #prop("string", "version") * #prop("string", "release") + * #prop("string", "arch") * #prop("string", "epoch") + * #prop("string", "provider") * #struct_end() */ public class PackageOverviewSerializer implements XmlRpcCustomSerializer { --===============2956095444423891761==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:38 2015 Content-Type: multipart/mixed; boundary="===============3485448272744745057==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: monitoring/nocpulse-common Date: Tue, 16 Jun 2009 08:48:26 +0000 Message-ID: <20090616084826.370D312037D@lists.fedorahosted.org> --===============3485448272744745057== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable monitoring/nocpulse-common/nocpulse-common.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a6f2e5de38efd3193d4af7dfb7a36ff2ab5cbc0c Author: Miroslav Such=C3=BD Date: Tue Jun 16 10:48:07 2009 +0200 fix problem when nocpulse user do not exist = addressing: /var/tmp/rpm-tmp.64987: line 4: [: too many arguments Installing : nocpulse-common [137/27= 2] diff --git a/monitoring/nocpulse-common/nocpulse-common.spec b/monitoring/n= ocpulse-common/nocpulse-common.spec index cccee8e..0e7eba2 100644 --- a/monitoring/nocpulse-common/nocpulse-common.spec +++ b/monitoring/nocpulse-common/nocpulse-common.spec @@ -65,8 +65,8 @@ install -m 755 npConfigValue $RPM_BUILD_ROOT%{_bindir}/ # change nocpulse user & group to system user & group if needed dirs=3D"/home/nocpulse /opt/notification /opt/nocpulse /var/log/nocpulse /= var/www/templates /var/tmp" = -if [ -d /home/nocpulse -a `id -u nocpulse 2> /dev/null` -ge 500 ]; then - if [ `id -g nocpulse` -ge 500 ]; then +if [ -d /home/nocpulse -a 0`id -u nocpulse 2> /dev/null` -ge 500 ]; then + if [ 0`id -g nocpulse` -ge 500 ]; then groupmod -n nocpulse-old nocpulse groupadd -r nocpulse usermod -g nocpulse nocpulse --===============3485448272744745057==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:38 2015 Content-Type: multipart/mixed; boundary="===============4826590784378993519==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - monitoring/nocpulse-common Date: Tue, 16 Jun 2009 08:49:21 +0000 Message-ID: <20090616084921.B29DA12037D@lists.fedorahosted.org> --===============4826590784378993519== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable monitoring/nocpulse-common/nocpulse-common.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 9f9fd29f108c81f98122ccc2ae12f3a2caf81538 Author: Miroslav Such=C3=BD Date: Tue Jun 16 10:48:07 2009 +0200 fix problem when nocpulse user do not exist = addressing: /var/tmp/rpm-tmp.64987: line 4: [: too many arguments Installing : nocpulse-common [137/27= 2] (cherry picked from commit a6f2e5de38efd3193d4af7dfb7a36ff2ab5cbc0c) diff --git a/monitoring/nocpulse-common/nocpulse-common.spec b/monitoring/n= ocpulse-common/nocpulse-common.spec index 2a5085b..a5673be 100644 --- a/monitoring/nocpulse-common/nocpulse-common.spec +++ b/monitoring/nocpulse-common/nocpulse-common.spec @@ -65,8 +65,8 @@ install -m 755 npConfigValue $RPM_BUILD_ROOT%{_bindir}/ # change nocpulse user & group to system user & group if needed dirs=3D"/home/nocpulse /opt/notification /opt/nocpulse /var/log/nocpulse /= var/www/templates /var/tmp" = -if [ -d /home/nocpulse -a `id -u nocpulse 2> /dev/null` -ge 500 ]; then - if [ `id -g nocpulse` -ge 500 ]; then +if [ -d /home/nocpulse -a 0`id -u nocpulse 2> /dev/null` -ge 500 ]; then + if [ 0`id -g nocpulse` -ge 500 ]; then groupmod -n nocpulse-old nocpulse groupadd -r nocpulse usermod -g nocpulse nocpulse --===============4826590784378993519==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:38 2015 Content-Type: multipart/mixed; boundary="===============2117353977743739417==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: monitoring/nocpulse-common rel-eng/packages Date: Tue, 16 Jun 2009 08:50:22 +0000 Message-ID: <20090616085022.EBE0412037D@lists.fedorahosted.org> --===============2117353977743739417== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable monitoring/nocpulse-common/nocpulse-common.spec | 5 ++++- rel-eng/packages/nocpulse-common | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 0cb3af5d88c9b27799a913b61db23e58f5a43d3c Author: Miroslav Such=C3=BD Date: Tue Jun 16 10:50:17 2009 +0200 Automatic commit of package [nocpulse-common] release [2.1.15-1]. diff --git a/monitoring/nocpulse-common/nocpulse-common.spec b/monitoring/n= ocpulse-common/nocpulse-common.spec index 0e7eba2..f9377ea 100644 --- a/monitoring/nocpulse-common/nocpulse-common.spec +++ b/monitoring/nocpulse-common/nocpulse-common.spec @@ -1,5 +1,5 @@ Name: nocpulse-common -Version: 2.1.14 +Version: 2.1.15 Release: 1%{?dist} Summary: NOCpulse common License: GPLv2 @@ -136,6 +136,9 @@ fi rm -rf $RPM_BUILD_ROOT = %changelog +* Tue Jun 16 2009 Miroslav Such=C3=BD 2.1.15-1 +- fix problem when nocpulse user do not exist + * Wed Jun 03 2009 Milan Zazrivec 2.1.14-1 - switch nocpulse to a system user if needed = diff --git a/rel-eng/packages/nocpulse-common b/rel-eng/packages/nocpulse-c= ommon index 1edcc75..e1088df 100644 --- a/rel-eng/packages/nocpulse-common +++ b/rel-eng/packages/nocpulse-common @@ -1 +1 @@ -2.1.14-1 monitoring/nocpulse-common/ +2.1.15-1 monitoring/nocpulse-common/ --===============2117353977743739417==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:38 2015 Content-Type: multipart/mixed; boundary="===============8097389535944770819==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/nocpulse-common-2.1.15-1' Date: Tue, 16 Jun 2009 08:50:32 +0000 Message-ID: <20090616085032.CCC3612037D@lists.fedorahosted.org> --===============8097389535944770819== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'nocpulse-common-2.1.15-1' created by Miroslav Such=C3=BD at 2009-06-16 08:50 +0000 Tagging package [nocpulse-common] version [2.1.15-1] in directory [monitori= ng/nocpulse-common/]. Changes since spacewalk-proxy-0.6.4-1-6: --- 0 files changed --- --===============8097389535944770819==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:39 2015 Content-Type: multipart/mixed; boundary="===============7242119680288994475==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - proxy/installer rel-eng/packages Date: Tue, 16 Jun 2009 10:35:45 +0000 Message-ID: <20090616103545.ACB3512037D@lists.fedorahosted.org> --===============7242119680288994475== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/installer/rhn_proxy_activate.py | 3 ++- proxy/installer/spacewalk-proxy-installer.spec | 5 ++++- rel-eng/packages/spacewalk-proxy-installer | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) New commits: commit 0be388297370e25564c256afb4c7e84527d290a6 Author: Miroslav Such=C3=BD Date: Tue Jun 16 12:35:34 2009 +0200 Automatic commit of package [spacewalk-proxy-installer] release [0.6.14= -1]. diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/install= er/spacewalk-proxy-installer.spec index 0c7aa3d..34edf77 100644 --- a/proxy/installer/spacewalk-proxy-installer.spec +++ b/proxy/installer/spacewalk-proxy-installer.spec @@ -2,7 +2,7 @@ Name: spacewalk-proxy-installer Summary: Spacewalk Proxy Server Installer Group: Applications/Internet License: GPLv2 -Version: 0.6.13 +Version: 0.6.14 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz @@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE answers.txt = %changelog +* Tue Jun 16 2009 Miroslav Suchy 0.6.14-1 +- 499399 - print scout shared key on output + * Mon Jun 15 2009 Miroslav Suchy 0.6.13-1 - 505325 - pass two parameters as two parameters = diff --git a/rel-eng/packages/spacewalk-proxy-installer b/rel-eng/packages/= spacewalk-proxy-installer index d1ee1ba..a07628b 100644 --- a/rel-eng/packages/spacewalk-proxy-installer +++ b/rel-eng/packages/spacewalk-proxy-installer @@ -1 +1 @@ -0.6.13-1 proxy/installer/ +0.6.14-1 proxy/installer/ commit f480311f006acc4e7cff0da2dd6df397bfb46ac4 Author: Miroslav Such=C3=BD Date: Tue Jun 16 12:32:13 2009 +0200 499399 - print scout shared key on output diff --git a/proxy/installer/rhn_proxy_activate.py b/proxy/installer/rhn_pr= oxy_activate.py index 3de27c2..52e03dc 100644 --- a/proxy/installer/rhn_proxy_activate.py +++ b/proxy/installer/rhn_proxy_activate.py @@ -403,7 +403,8 @@ def createMonitoringScout(options): = errorCode, errorString =3D 0, '' try: - s.proxy.create_monitoring_scout(systemid) + ssk =3D s.proxy.create_monitoring_scout(systemid) + print "Scout shared key: %s" % ssk except: errorCode, errorString =3D _errorHandler() try: --===============7242119680288994475==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:39 2015 Content-Type: multipart/mixed; boundary="===============1632614619575619312==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-proxy-installer-0.6.14-1' Date: Tue, 16 Jun 2009 10:35:52 +0000 Message-ID: <20090616103552.6131012037E@lists.fedorahosted.org> --===============1632614619575619312== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-proxy-installer-0.6.14-1' created by Miroslav Such=C3=BD at 2009-06-16 10:35 +0000 Tagging package [spacewalk-proxy-installer] version [0.6.14-1] in directory= [proxy/installer/]. Changes since nocpulse-common-2.1.15-1-1: --- 0 files changed --- --===============1632614619575619312==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:39 2015 Content-Type: multipart/mixed; boundary="===============7711156325061246360==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - proxy/installer Date: Tue, 16 Jun 2009 11:31:39 +0000 Message-ID: <20090616113139.9312D12010C@lists.fedorahosted.org> --===============7711156325061246360== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/installer/rhn_proxy_activate.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 47c27ee2438923fe92c8f5745af58a34427f3c4e Author: Miroslav Such=C3=BD Date: Tue Jun 16 12:32:13 2009 +0200 499399 - print scout shared key on output (cherry picked from commit f480311f006acc4e7cff0da2dd6df397bfb46ac4) diff --git a/proxy/installer/rhn_proxy_activate.py b/proxy/installer/rhn_pr= oxy_activate.py index adbe3be..f1bd37a 100644 --- a/proxy/installer/rhn_proxy_activate.py +++ b/proxy/installer/rhn_proxy_activate.py @@ -399,7 +399,8 @@ def createMonitoringScout(options): = errorCode, errorString =3D 0, '' try: - s.proxy.create_monitoring_scout(systemid) + ssk =3D s.proxy.create_monitoring_scout(systemid) + print "Scout shared key: %s" % ssk except: errorCode, errorString =3D _errorHandler() try: --===============7711156325061246360==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:39 2015 Content-Type: multipart/mixed; boundary="===============9118935881158061576==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 2 commits - client/tools rel-eng/packages Date: Tue, 16 Jun 2009 16:26:29 +0000 Message-ID: <20090616162629.86DF012010C@lists.fedorahosted.org> --===============9118935881158061576== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/rhn-kickstart/rhn-kickstart.spec | 5 ++++- rel-eng/packages/rhn-kickstart | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 9bb8f59a4d26dc6285fa795841d0aa52993670c4 Author: Brad Buckingham Date: Tue Jun 16 12:26:19 2009 -0400 Automatic commit of package [rhn-kickstart] release [5.3.0-1]. diff --git a/client/tools/rhn-kickstart/rhn-kickstart.spec b/client/tools/r= hn-kickstart/rhn-kickstart.spec index 0c3c78b..704cbf9 100644 --- a/client/tools/rhn-kickstart/rhn-kickstart.spec +++ b/client/tools/rhn-kickstart/rhn-kickstart.spec @@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT %endif = %changelog +* Tue Jun 16 2009 Brad Buckingham 5.3.0-1 +- bumping version (bbuckingham(a)redhat.com) + * Thu Jan 22 2009 Dennis Gilmore 0.2.2-1 - BuildRequires python = diff --git a/rel-eng/packages/rhn-kickstart b/rel-eng/packages/rhn-kickstart index dca51b1..f29043b 100644 --- a/rel-eng/packages/rhn-kickstart +++ b/rel-eng/packages/rhn-kickstart @@ -1 +1 @@ -0.2.2-1 client/tools/rhn-kickstart/ +5.3.0-1 client/tools/rhn-kickstart/ commit bf28dae8f8a98199d84755b6faa87b71b9cdf585 Author: Brad Buckingham Date: Tue Jun 16 12:25:54 2009 -0400 rhn-kickstart - bumping version diff --git a/client/tools/rhn-kickstart/rhn-kickstart.spec b/client/tools/r= hn-kickstart/rhn-kickstart.spec index 735dce3..0c3c78b 100644 --- a/client/tools/rhn-kickstart/rhn-kickstart.spec +++ b/client/tools/rhn-kickstart/rhn-kickstart.spec @@ -5,7 +5,7 @@ Name: rhn-kickstart Group: System Environment/Kernel License: GPLv2 Source0: %{name}-%{version}.tar.gz -Version: 0.2.2 +Version: 5.3.0 Release: 1%{?dist} BuildArch: noarch BuildRequires: python --===============9118935881158061576==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:39 2015 Content-Type: multipart/mixed; boundary="===============4831965875054131370==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/rhn-kickstart-5.3.0-1' Date: Tue, 16 Jun 2009 16:26:35 +0000 Message-ID: <20090616162635.5BDD012010C@lists.fedorahosted.org> --===============4831965875054131370== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'rhn-kickstart-5.3.0-1' created by Brad Buckingham at 2009-06-16 16:26 +0000 Tagging package [rhn-kickstart] version [5.3.0-1] in directory [client/tool= s/rhn-kickstart/]. Changes since rhn-custom-info-5.3.0-1-76: --- 0 files changed --- --===============4831965875054131370==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:39 2015 Content-Type: multipart/mixed; boundary="===============5336064813964965513==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 2 commits - client/tools rel-eng/packages Date: Tue, 16 Jun 2009 16:28:22 +0000 Message-ID: <20090616162822.F16C812010C@lists.fedorahosted.org> --===============5336064813964965513== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/rhn-virtualization/rhn-virtualization.spec | 7 ++++++- rel-eng/packages/rhn-virtualization | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) New commits: commit 1fd681deee939a3f7864b53752e69d0447828f52 Author: Brad Buckingham Date: Tue Jun 16 12:28:14 2009 -0400 Automatic commit of package [rhn-virtualization] release [5.3.0-1]. diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec b/clie= nt/tools/rhn-virtualization/rhn-virtualization.spec index 4617772..edebb69 100644 --- a/client/tools/rhn-virtualization/rhn-virtualization.spec +++ b/client/tools/rhn-virtualization/rhn-virtualization.spec @@ -162,6 +162,11 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE = %changelog +* Tue Jun 16 2009 Brad Buckingham 5.3.0-1 +- bumping version (bbuckingham(a)redhat.com) +- 470335 - Fixed the name error where the class was not called from cPickle + (pkilambi(a)redhat.com) + * Fri May 01 2009 Devan Goodwin 0.5.2-1 - wrap long description lines (msuchy(a)redhat.com) - point URL to fedorahosted.org (msuchy(a)redhat.com) diff --git a/rel-eng/packages/rhn-virtualization b/rel-eng/packages/rhn-vir= tualization index a3d3af4..ab96981 100644 --- a/rel-eng/packages/rhn-virtualization +++ b/rel-eng/packages/rhn-virtualization @@ -1 +1 @@ -0.5.2-1 client/tools/rhn-virtualization/ +5.3.0-1 client/tools/rhn-virtualization/ commit 49cee79c4768b11632a8557eb1e25fbafcb0546a Author: Brad Buckingham Date: Tue Jun 16 12:27:49 2009 -0400 rhn-virtualization - bumping version diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec b/clie= nt/tools/rhn-virtualization/rhn-virtualization.spec index 1a30cca..4617772 100644 --- a/client/tools/rhn-virtualization/rhn-virtualization.spec +++ b/client/tools/rhn-virtualization/rhn-virtualization.spec @@ -10,7 +10,7 @@ License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{= version}.tar.gz = -Version: 0.5.2 +Version: 5.3.0 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u}= -n) BuildArch: noarch --===============5336064813964965513==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:39 2015 Content-Type: multipart/mixed; boundary="===============2947194394803652760==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/rhn-virtualization-5.3.0-1' Date: Tue, 16 Jun 2009 16:28:26 +0000 Message-ID: <20090616162826.E6CC512028E@lists.fedorahosted.org> --===============2947194394803652760== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'rhn-virtualization-5.3.0-1' created by Brad Buckingham at 2009-06-16 16:28 +0000 Tagging package [rhn-virtualization] version [5.3.0-1] in directory [client= /tools/rhn-virtualization/]. Changes since rhn-kickstart-5.3.0-1-1: --- 0 files changed --- --===============2947194394803652760==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:39 2015 Content-Type: multipart/mixed; boundary="===============3091208209865962059==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: 4 commits - client/tools rel-eng/packages Date: Tue, 16 Jun 2009 17:34:45 +0000 Message-ID: <20090616173445.DE6A212010C@lists.fedorahosted.org> --===============3091208209865962059== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/rhn-virtualization/rhn-virtualization.spec | 8 +++++++- rel-eng/packages/rhn-virtualization | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) New commits: commit 3e243a52e379b2249153609fd40c7405760d664e Author: Brad Buckingham Date: Tue Jun 16 13:33:41 2009 -0400 Automatic commit of package [rhn-virtualization] release [5.4.0-1]. diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec b/clie= nt/tools/rhn-virtualization/rhn-virtualization.spec index d4ae1e6..7407508 100644 --- a/client/tools/rhn-virtualization/rhn-virtualization.spec +++ b/client/tools/rhn-virtualization/rhn-virtualization.spec @@ -162,6 +162,12 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE = %changelog +* Tue Jun 16 2009 Brad Buckingham 5.4.0-1 +- bumping version (bbuckingham(a)redhat.com) +- 502902 - If xend is not running instead of returning an empty list retur= n an + empty dict and let the registration and profile sync warn instead of fai= ling + (pkilambi(a)redhat.com) + * Tue May 26 2009 Devan Goodwin 0.6.1-1 - 470335 - Fixed the name error where the class was not called from cPickle (pkilambi(a)redhat.com) diff --git a/rel-eng/packages/rhn-virtualization b/rel-eng/packages/rhn-vir= tualization index 2d66f21..87f4c1c 100644 --- a/rel-eng/packages/rhn-virtualization +++ b/rel-eng/packages/rhn-virtualization @@ -1 +1 @@ -0.6.1-1 client/tools/rhn-virtualization/ +5.4.0-1 client/tools/rhn-virtualization/ commit 49016cb19d8cf4c653ad71959d7252b31990b7d3 Author: Brad Buckingham Date: Tue Jun 16 13:33:11 2009 -0400 rhn-virtualization - bumping version diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec b/clie= nt/tools/rhn-virtualization/rhn-virtualization.spec index 43ee81d..d4ae1e6 100644 --- a/client/tools/rhn-virtualization/rhn-virtualization.spec +++ b/client/tools/rhn-virtualization/rhn-virtualization.spec @@ -10,7 +10,7 @@ License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{= version}.tar.gz = -Version: 0.6.1 +Version: 5.4.0 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u}= -n) BuildArch: noarch commit 7e1f7f3d67939ea3503643ad4c554b9068bb782a Author: Brad Buckingham Date: Tue Jun 16 13:32:14 2009 -0400 Revert "rhn-virtualization - bumping version" = This reverts commit 3f041d4163f142f7a87cfdb6fd9c7b672c1261b8. diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec b/clie= nt/tools/rhn-virtualization/rhn-virtualization.spec index a622382..43ee81d 100644 --- a/client/tools/rhn-virtualization/rhn-virtualization.spec +++ b/client/tools/rhn-virtualization/rhn-virtualization.spec @@ -10,7 +10,7 @@ License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{= version}.tar.gz = -Version: 5.3.0 +Version: 0.6.1 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u}= -n) BuildArch: noarch commit cb3a4cde5b3add03a71080d5ca2acf098f3fe68b Author: Brad Buckingham Date: Tue Jun 16 13:02:58 2009 -0400 rhn-virtualization - bumping version diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec b/clie= nt/tools/rhn-virtualization/rhn-virtualization.spec index 43ee81d..a622382 100644 --- a/client/tools/rhn-virtualization/rhn-virtualization.spec +++ b/client/tools/rhn-virtualization/rhn-virtualization.spec @@ -10,7 +10,7 @@ License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{= version}.tar.gz = -Version: 0.6.1 +Version: 5.3.0 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u}= -n) BuildArch: noarch --===============3091208209865962059==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:39 2015 Content-Type: multipart/mixed; boundary="===============7787041564480702524==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/rhn-virtualization-5.4.0-1' Date: Tue, 16 Jun 2009 17:35:24 +0000 Message-ID: <20090616173524.17BE112010C@lists.fedorahosted.org> --===============7787041564480702524== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'rhn-virtualization-5.4.0-1' created by Brad Buckingham at 2009-06-16 17:33 +0000 Tagging package [rhn-virtualization] version [5.4.0-1] in directory [client= /tools/rhn-virtualization/]. Changes since spacewalk-proxy-0.6.4-1-8: --- 0 files changed --- --===============7787041564480702524==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:39 2015 Content-Type: multipart/mixed; boundary="===============4849892425571852637==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - client/tools rel-eng/packages Date: Tue, 16 Jun 2009 17:37:37 +0000 Message-ID: <20090616173737.84B2D12010C@lists.fedorahosted.org> --===============4849892425571852637== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/rhn-kickstart/rhn-kickstart.spec | 5 ++++- rel-eng/packages/rhn-kickstart | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit a15cd27a6fa163bf8bf93ee77f902c55b3856146 Author: Brad Buckingham Date: Tue Jun 16 13:37:30 2009 -0400 Automatic commit of package [rhn-kickstart] release [5.4.0-1]. diff --git a/client/tools/rhn-kickstart/rhn-kickstart.spec b/client/tools/r= hn-kickstart/rhn-kickstart.spec index 27794f6..dcc53aa 100644 --- a/client/tools/rhn-kickstart/rhn-kickstart.spec +++ b/client/tools/rhn-kickstart/rhn-kickstart.spec @@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT %endif = %changelog +* Tue Jun 16 2009 Brad Buckingham 5.4.0-1 +- bumping version (bbuckingham(a)redhat.com) + * Thu Jan 22 2009 Dennis Gilmore 0.2.2-1 - BuildRequires python = diff --git a/rel-eng/packages/rhn-kickstart b/rel-eng/packages/rhn-kickstart index dca51b1..e76bdec 100644 --- a/rel-eng/packages/rhn-kickstart +++ b/rel-eng/packages/rhn-kickstart @@ -1 +1 @@ -0.2.2-1 client/tools/rhn-kickstart/ +5.4.0-1 client/tools/rhn-kickstart/ commit d81b5dc1fd55c2c2b7cce93aca678ed0da503307 Author: Brad Buckingham Date: Tue Jun 16 13:37:14 2009 -0400 rhn-kickstart - bumping version diff --git a/client/tools/rhn-kickstart/rhn-kickstart.spec b/client/tools/r= hn-kickstart/rhn-kickstart.spec index 735dce3..27794f6 100644 --- a/client/tools/rhn-kickstart/rhn-kickstart.spec +++ b/client/tools/rhn-kickstart/rhn-kickstart.spec @@ -5,7 +5,7 @@ Name: rhn-kickstart Group: System Environment/Kernel License: GPLv2 Source0: %{name}-%{version}.tar.gz -Version: 0.2.2 +Version: 5.4.0 Release: 1%{?dist} BuildArch: noarch BuildRequires: python --===============4849892425571852637==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:39 2015 Content-Type: multipart/mixed; boundary="===============1873412358589969042==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/rhn-kickstart-5.4.0-1' Date: Tue, 16 Jun 2009 17:37:43 +0000 Message-ID: <20090616173743.37C3112028E@lists.fedorahosted.org> --===============1873412358589969042== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'rhn-kickstart-5.4.0-1' created by Brad Buckingham at 2009-06-16 17:37 +0000 Tagging package [rhn-kickstart] version [5.4.0-1] in directory [client/tool= s/rhn-kickstart/]. Changes since spacewalk-proxy-installer-0.6.14-1-5: --- 0 files changed --- --===============1873412358589969042==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:39 2015 Content-Type: multipart/mixed; boundary="===============6748404976489491245==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - client/tools rel-eng/packages Date: Tue, 16 Jun 2009 17:41:26 +0000 Message-ID: <20090616174127.02B7F12010C@lists.fedorahosted.org> --===============6748404976489491245== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/rhncustominfo/rhncustominfo.spec | 5 ++++- rel-eng/packages/rhn-custom-info | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit e06f91f59a3d5f8c564707326962ea7882b17b30 Author: Brad Buckingham Date: Tue Jun 16 13:41:20 2009 -0400 Automatic commit of package [rhn-custom-info] release [5.4.0-1]. diff --git a/client/tools/rhncustominfo/rhncustominfo.spec b/client/tools/r= hncustominfo/rhncustominfo.spec index eb6c5c6..0612608 100644 --- a/client/tools/rhncustominfo/rhncustominfo.spec +++ b/client/tools/rhncustominfo/rhncustominfo.spec @@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT = # $Id$ %changelog +* Tue Jun 16 2009 Brad Buckingham 5.4.0-1 +- bumping version (bbuckingham(a)redhat.com) + * Thu Apr 23 2009 jesus m. rodriguez 0.4.6-1 - update copyright and licenses (jesusr(a)redhat.com) = diff --git a/rel-eng/packages/rhn-custom-info b/rel-eng/packages/rhn-custom= -info index 1a54bc4..9300d18 100644 --- a/rel-eng/packages/rhn-custom-info +++ b/rel-eng/packages/rhn-custom-info @@ -1 +1 @@ -0.4.6-1 client/tools/rhncustominfo/ +5.4.0-1 client/tools/rhncustominfo/ commit 3139fe1ea968516ddb91fddb3138dbc8fbe61cc7 Author: Brad Buckingham Date: Tue Jun 16 13:41:07 2009 -0400 rhncustominfo - bumping version diff --git a/client/tools/rhncustominfo/rhncustominfo.spec b/client/tools/r= hncustominfo/rhncustominfo.spec index ffd51da..eb6c5c6 100644 --- a/client/tools/rhncustominfo/rhncustominfo.spec +++ b/client/tools/rhncustominfo/rhncustominfo.spec @@ -3,7 +3,7 @@ Summary: set and list custom values for RHN-enabled machines Group: RHN/Client License: GPLv2 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz -Version: 0.4.6 +Version: 5.4.0 Release: 1%{?dist} BuildRoot: /var/tmp/%{name}-%{version}-root BuildArch: noarch --===============6748404976489491245==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:39 2015 Content-Type: multipart/mixed; boundary="===============2353351645959513367==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/rhn-custom-info-5.4.0-1' Date: Tue, 16 Jun 2009 17:41:36 +0000 Message-ID: <20090616174136.9642312028E@lists.fedorahosted.org> --===============2353351645959513367== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'rhn-custom-info-5.4.0-1' created by Brad Buckingham at 2009-06-16 17:41 +0000 Tagging package [rhn-custom-info] version [5.4.0-1] in directory [client/to= ols/rhncustominfo/]. Changes since rhn-kickstart-5.4.0-1-1: --- 0 files changed --- --===============2353351645959513367==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:39 2015 Content-Type: multipart/mixed; boundary="===============0825794964571742339==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - backend/satellite_exporter backend/satellite_tools backend/server Date: Tue, 16 Jun 2009 21:39:55 +0000 Message-ID: <20090616213955.DC8E812010C@lists.fedorahosted.org> --===============0825794964571742339== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/satellite_exporter/exporter/exportLib.py | 36 ++++++++++++++++++= +++++ backend/satellite_tools/exporter/exportLib.py | 35 ++++++++++++++++++= ++++ backend/server/importlib/backend.py | 12 +------ backend/server/importlib/channelImport.py | 2 - 4 files changed, 75 insertions(+), 10 deletions(-) New commits: commit 1a5d7bfdeca08cc2af146d54c158c10fb9d252c6 Author: Pradeep Kilambi Date: Tue Jun 16 17:39:45 2009 -0400 506264 - This commit includes: = Fix for iss exporter to extract the ChannelProduct details and send it = down to the client. = Fix the importer to not hard code data and extract the exporter content= and populate rhnChannelProduct table for all channels instead of jus proxy. = Fix to populate rhnProductName table, product_name_id and channel_produ= ct_id in rhnChannel table. This should help the current issues specific to eus from satsync and UI= stand point diff --git a/backend/satellite_exporter/exporter/exportLib.py b/backend/sat= ellite_exporter/exporter/exportLib.py index 1008b14..3b0ce75 100644 --- a/backend/satellite_exporter/exporter/exportLib.py +++ b/backend/satellite_exporter/exporter/exportLib.py @@ -233,6 +233,14 @@ class ChannelDumper(BaseRowDumper): _dbtime2timestamp(self._row['last_modified'])) ) = + channel_product_details =3D self._get_channel_product_details() + arr.append(SimpleDumper(self._writer, 'rhn-channel-product-name', + channel_product_details[0])) + arr.append(SimpleDumper(self._writer, 'rhn-channel-product-version= ', + channel_product_details[1])) + arr.append(SimpleDumper(self._writer, 'rhn-channel-product-beta', + channel_product_details[2])) + h =3D rhnSQL.prepare(self._query_channel_families) h.execute(channel_id=3Dchannel_id) arr.append(ChannelFamiliesDumper(self._writer, data_iterator=3Dh, @@ -321,6 +329,34 @@ class ChannelDumper(BaseRowDumper): ks_trees.sort() return ks_trees = + _query_get_channel_product_details =3D rhnSQL.Statement(""" + select cp.product as name, + cp.version as version, + cp.beta + from rhnChannel c, + rhnChannelProduct cp + where c.id =3D :channel_id + and c.channel_product_id =3D cp.id + """) + + def _get_channel_product_details(self): + """ + Export rhnChannelProduct table content through ChannelDumper + + return a tuple containing (product name, product version, beta sta= tus) + or (None, None, None) if the information is missing + """ + + channel_id =3D self._row['id'] + + h =3D rhnSQL.prepare(self._query_get_channel_product_details) + h.execute(channel_id=3Dchannel_id) + row =3D h.fetchone_dict() + if not row: + return (None, None, None) + else: + return (row['name'], row['version'], row['beta']) + class ChannelSourcePackagesDumper(BaseDumper): # Dumps the erratum id and the last modified for an erratum in this # channel diff --git a/backend/satellite_tools/exporter/exportLib.py b/backend/satell= ite_tools/exporter/exportLib.py index 9afab1e..cd88b52 100644 --- a/backend/satellite_tools/exporter/exportLib.py +++ b/backend/satellite_tools/exporter/exportLib.py @@ -222,6 +222,13 @@ class _ChannelDumper(BaseRowDumper): arr.append(SimpleDumper(self._writer, 'rhn-channel-last-modified', = _dbtime2timestamp(self._row['last_modified'])) ) + channel_product_details =3D self._get_channel_product_details() + arr.append(SimpleDumper(self._writer, 'rhn-channel-product-name', + channel_product_details[0])) + arr.append(SimpleDumper(self._writer, 'rhn-channel-product-version= ', + channel_product_details[1])) + arr.append(SimpleDumper(self._writer, 'rhn-channel-product-beta', + channel_product_details[2])) = h =3D rhnSQL.prepare(self._query_channel_families) h.execute(channel_id=3Dchannel_id) @@ -306,6 +313,34 @@ class _ChannelDumper(BaseRowDumper): ks_trees.sort() return ks_trees = + _query_get_channel_product_details =3D rhnSQL.Statement(""" + select cp.product as name, + cp.version as version, + cp.beta + from rhnChannel c, + rhnChannelProduct cp + where c.id =3D :channel_id + and c.channel_product_id =3D cp.id + """) + + def _get_channel_product_details(self): + """ + Export rhnChannelProduct table content through ChannelDumper + + return a tuple containing (product name, product version, beta sta= tus) + or (None, None, None) if the information is missing + """ + + channel_id =3D self._row['id'] + + h =3D rhnSQL.prepare(self._query_get_channel_product_details) + h.execute(channel_id=3Dchannel_id) + row =3D h.fetchone_dict() + if not row: + return (None, None, None) + else: + return (row['name'], row['version'], row['beta']) + class ChannelSourcePackagesDumper(BaseDumper): # Dumps the erratum id and the last modified for an erratum in this # channel diff --git a/backend/server/importlib/backend.py b/backend/server/importlib= /backend.py index b1d7a5e..1d39047 100644 --- a/backend/server/importlib/backend.py +++ b/backend/server/importlib/backend.py @@ -1122,16 +1122,10 @@ class Backend: = def processChannelProduct(self, channel): """ Associate product with channel """ - # this should be probably done for others products as well - # well this is just temporary workaround - # can be safely removed when BZ 412201 is fixed - if channel['product_name'] =3D=3D 'proxy': - m =3D re.match(r'Red Hat Network Proxy \(v(\d+.\d+) .+\)', channel['n= ame']) - channel['channel_product'] =3D channel['product_name'] - channel['channel_product_version'] =3D m.group(1) - channel['channel_product_beta'] =3D 'N' - # end of safe remove in future = + channel['channel_product'] =3D channel['product_name'] + channel['channel_product_version'] =3D channel['product_version'] + channel['channel_product_beta'] =3D channel['product_beta'] channel['channel_product_id'] =3D self.lookupChannelProduct(channe= l) = statement =3D self.dbmodule.prepare(""" diff --git a/backend/server/importlib/channelImport.py b/backend/server/imp= ortlib/channelImport.py index 552df0f..1d96598 100644 --- a/backend/server/importlib/channelImport.py +++ b/backend/server/importlib/channelImport.py @@ -179,7 +179,7 @@ class ChannelImport(Import): continue = if (channel.has_key('channel_product') and channel['channel_pr= oduct']) \ - or (channel.has_key('product_name') and channel['product_n= ame'] =3D=3D 'proxy'): + or (channel.has_key('product_name') and channel['product_n= ame']): self.backend.processChannelProduct(channel) = # Sometimes we may want to turn commits off --===============0825794964571742339==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:39 2015 Content-Type: multipart/mixed; boundary="===============6328871634795368765==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: backend/satellite_exporter backend/satellite_tools backend/server Date: Tue, 16 Jun 2009 21:40:35 +0000 Message-ID: <20090616214035.E425312010C@lists.fedorahosted.org> --===============6328871634795368765== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/satellite_exporter/exporter/exportLib.py | 36 ++++++++++++++++++= +++++ backend/satellite_tools/exporter/exportLib.py | 35 ++++++++++++++++++= ++++ backend/server/importlib/backend.py | 12 +------ backend/server/importlib/channelImport.py | 2 - 4 files changed, 75 insertions(+), 10 deletions(-) New commits: commit 9d07a8b203c208f42d698815245e0739921c5450 Author: Pradeep Kilambi Date: Tue Jun 16 17:39:45 2009 -0400 506264 - This commit includes: = Fix for iss exporter to extract the ChannelProduct details and send it = down to the client. = Fix the importer to not hard code data and extract the exporter content= and populate rhnChannelProduct table for all channels instead of jus proxy. = Fix to populate rhnProductName table, product_name_id and channel_produ= ct_id in rhnChannel table. This should help the current issues specific to eus from satsync and UI= stand point diff --git a/backend/satellite_exporter/exporter/exportLib.py b/backend/sat= ellite_exporter/exporter/exportLib.py index 1008b14..3b0ce75 100644 --- a/backend/satellite_exporter/exporter/exportLib.py +++ b/backend/satellite_exporter/exporter/exportLib.py @@ -233,6 +233,14 @@ class ChannelDumper(BaseRowDumper): _dbtime2timestamp(self._row['last_modified'])) ) = + channel_product_details =3D self._get_channel_product_details() + arr.append(SimpleDumper(self._writer, 'rhn-channel-product-name', + channel_product_details[0])) + arr.append(SimpleDumper(self._writer, 'rhn-channel-product-version= ', + channel_product_details[1])) + arr.append(SimpleDumper(self._writer, 'rhn-channel-product-beta', + channel_product_details[2])) + h =3D rhnSQL.prepare(self._query_channel_families) h.execute(channel_id=3Dchannel_id) arr.append(ChannelFamiliesDumper(self._writer, data_iterator=3Dh, @@ -321,6 +329,34 @@ class ChannelDumper(BaseRowDumper): ks_trees.sort() return ks_trees = + _query_get_channel_product_details =3D rhnSQL.Statement(""" + select cp.product as name, + cp.version as version, + cp.beta + from rhnChannel c, + rhnChannelProduct cp + where c.id =3D :channel_id + and c.channel_product_id =3D cp.id + """) + + def _get_channel_product_details(self): + """ + Export rhnChannelProduct table content through ChannelDumper + + return a tuple containing (product name, product version, beta sta= tus) + or (None, None, None) if the information is missing + """ + + channel_id =3D self._row['id'] + + h =3D rhnSQL.prepare(self._query_get_channel_product_details) + h.execute(channel_id=3Dchannel_id) + row =3D h.fetchone_dict() + if not row: + return (None, None, None) + else: + return (row['name'], row['version'], row['beta']) + class ChannelSourcePackagesDumper(BaseDumper): # Dumps the erratum id and the last modified for an erratum in this # channel diff --git a/backend/satellite_tools/exporter/exportLib.py b/backend/satell= ite_tools/exporter/exportLib.py index 9afab1e..cd88b52 100644 --- a/backend/satellite_tools/exporter/exportLib.py +++ b/backend/satellite_tools/exporter/exportLib.py @@ -222,6 +222,13 @@ class _ChannelDumper(BaseRowDumper): arr.append(SimpleDumper(self._writer, 'rhn-channel-last-modified', = _dbtime2timestamp(self._row['last_modified'])) ) + channel_product_details =3D self._get_channel_product_details() + arr.append(SimpleDumper(self._writer, 'rhn-channel-product-name', + channel_product_details[0])) + arr.append(SimpleDumper(self._writer, 'rhn-channel-product-version= ', + channel_product_details[1])) + arr.append(SimpleDumper(self._writer, 'rhn-channel-product-beta', + channel_product_details[2])) = h =3D rhnSQL.prepare(self._query_channel_families) h.execute(channel_id=3Dchannel_id) @@ -306,6 +313,34 @@ class _ChannelDumper(BaseRowDumper): ks_trees.sort() return ks_trees = + _query_get_channel_product_details =3D rhnSQL.Statement(""" + select cp.product as name, + cp.version as version, + cp.beta + from rhnChannel c, + rhnChannelProduct cp + where c.id =3D :channel_id + and c.channel_product_id =3D cp.id + """) + + def _get_channel_product_details(self): + """ + Export rhnChannelProduct table content through ChannelDumper + + return a tuple containing (product name, product version, beta sta= tus) + or (None, None, None) if the information is missing + """ + + channel_id =3D self._row['id'] + + h =3D rhnSQL.prepare(self._query_get_channel_product_details) + h.execute(channel_id=3Dchannel_id) + row =3D h.fetchone_dict() + if not row: + return (None, None, None) + else: + return (row['name'], row['version'], row['beta']) + class ChannelSourcePackagesDumper(BaseDumper): # Dumps the erratum id and the last modified for an erratum in this # channel diff --git a/backend/server/importlib/backend.py b/backend/server/importlib= /backend.py index b1d7a5e..1d39047 100644 --- a/backend/server/importlib/backend.py +++ b/backend/server/importlib/backend.py @@ -1122,16 +1122,10 @@ class Backend: = def processChannelProduct(self, channel): """ Associate product with channel """ - # this should be probably done for others products as well - # well this is just temporary workaround - # can be safely removed when BZ 412201 is fixed - if channel['product_name'] =3D=3D 'proxy': - m =3D re.match(r'Red Hat Network Proxy \(v(\d+.\d+) .+\)', channel['n= ame']) - channel['channel_product'] =3D channel['product_name'] - channel['channel_product_version'] =3D m.group(1) - channel['channel_product_beta'] =3D 'N' - # end of safe remove in future = + channel['channel_product'] =3D channel['product_name'] + channel['channel_product_version'] =3D channel['product_version'] + channel['channel_product_beta'] =3D channel['product_beta'] channel['channel_product_id'] =3D self.lookupChannelProduct(channe= l) = statement =3D self.dbmodule.prepare(""" diff --git a/backend/server/importlib/channelImport.py b/backend/server/imp= ortlib/channelImport.py index 552df0f..1d96598 100644 --- a/backend/server/importlib/channelImport.py +++ b/backend/server/importlib/channelImport.py @@ -179,7 +179,7 @@ class ChannelImport(Import): continue = if (channel.has_key('channel_product') and channel['channel_pr= oduct']) \ - or (channel.has_key('product_name') and channel['product_n= ame'] =3D=3D 'proxy'): + or (channel.has_key('product_name') and channel['product_n= ame']): self.backend.processChannelProduct(channel) = # Sometimes we may want to turn commits off --===============6328871634795368765==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:39 2015 Content-Type: multipart/mixed; boundary="===============4493404662098049023==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: 7 commits - schema/spacewalk Date: Wed, 17 Jun 2009 11:12:30 +0000 Message-ID: <20090617111230.6454E1201EA@lists.fedorahosted.org> --===============4493404662098049023== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/001-rhnServerArch_dat= a-solaris-sun4v.sql | 15 + schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/002-rhnPackageArch_da= ta-solaris-sun4v.sql | 15 + schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/003-rhnChannelPackage= ArchCompat_data-solaris-sun4v.sql | 13 + schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/004-rhnCpuArch_data-s= olaris-sun4v.sql | 13 + schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/005-rhnServerChannelA= rchCompat_data-solaris-sun4v.sql | 13 + schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/007-rhnServerPackageA= rchCompat_data-solaris-sun4v.sql | 109 ++++++++-- schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/008-rhnServerServerGr= oupArchCompat_data-solaris-sun4v.sql | 26 ++ 7 files changed, 169 insertions(+), 35 deletions(-) New commits: commit 100c9fae0909e670084dc8f119e8fa0538525923 Author: Milan Zazrivec Date: Wed Jun 17 13:01:17 2009 +0200 506272 - insert rows only if they do not exist diff --git a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/008-rhnSe= rverServerGroupArchCompat_data-solaris-sun4v.sql b/schema/spacewalk/upgrade= /satellite-5.1-spacewalk-0.2/008-rhnServerServerGroupArchCompat_data-solari= s-sun4v.sql index 5f46238..aa5447f 100644 --- a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/008-rhnServerSer= verGroupArchCompat_data-solaris-sun4v.sql +++ b/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/008-rhnServerSer= verGroupArchCompat_data-solaris-sun4v.sql @@ -1,5 +1,23 @@ -insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_= type ) -values (lookup_server_arch('sparc-sun4v-solaris'), lookup_sg_type('enterpr= ise_entitled')); +insert into rhnServerServerGroupArchCompat (server_arch_id, server_group_t= ype) ( + select lookup_server_arch('sparc-sun4v-solaris'), lookup_sg_type('ente= rprise_entitled') + from dual + where not exists ( + select server_arch_id, + server_group_type + from rhnServerServerGroupArchCompat + where server_arch_id =3D lookup_server_arch('sparc-sun4v-solaris')= and + server_group_type =3D lookup_sg_type('enterprise_entitled') + ) +); = -insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_= type ) -values (lookup_server_arch('sparc-sun4v-solaris'), lookup_sg_type('provisi= oning_entitled')); +insert into rhnServerServerGroupArchCompat (server_arch_id, server_group_t= ype) ( + select lookup_server_arch('sparc-sun4v-solaris'), lookup_sg_type('prov= isioning_entitled') + from dual + where not exists ( + select server_arch_id, + server_group_type + from rhnServerServerGroupArchCompat + where server_arch_id =3D lookup_server_arch('sparc-sun4v-solaris')= and + server_group_type =3D lookup_sg_type('provisioning_entitled') + ) +); commit c3fe772fb1a214b0d414d8e5f999c06fdf640a9d Author: Milan Zazrivec Date: Wed Jun 17 12:57:17 2009 +0200 506272 - insert rows only if they do not exist diff --git a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/007-rhnSe= rverPackageArchCompat_data-solaris-sun4v.sql b/schema/spacewalk/upgrade/sat= ellite-5.1-spacewalk-0.2/007-rhnServerPackageArchCompat_data-solaris-sun4v.= sql index 8b5587a..d78834a 100644 --- a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/007-rhnServerPac= kageArchCompat_data-solaris-sun4v.sql +++ b/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/007-rhnServerPac= kageArchCompat_data-solaris-sun4v.sql @@ -1,27 +1,94 @@ -insert into rhnServerPackageArchCompat -(server_arch_id, package_arch_id, preference) values -(LOOKUP_SERVER_ARCH('sparc-sun4v-solaris'), LOOKUP_PACKAGE_ARCH('sparc.sun= 4v-solaris'), 10); +insert into rhnServerPackageArchCompat (server_arch_id, package_arch_id, p= reference) ( + select lookup_server_arch('sparc-sun4v-solaris'), lookup_package_arch(= 'sparc.sun4v-solaris'), 10 + from dual + where not exists ( + select server_arch_id, package_arch_id, preference + from rhnServerPackageArchCompat + where server_arch_id =3D lookup_server_arch('sparc-sun4v-solaris')= and + package_arch_id =3D lookup_package_arch('sparc.sun4v-solaris= ') and + preference =3D 10) +); = -insert into rhnServerPackageArchCompat -(server_arch_id, package_arch_id, preference) values -(LOOKUP_SERVER_ARCH('sparc-sun4v-solaris'), LOOKUP_PACKAGE_ARCH('sparc-sol= aris'), 100); +insert into rhnServerPackageArchCompat (server_arch_id, package_arch_id, p= reference) ( + select lookup_server_arch('sparc-sun4v-solaris'), + lookup_package_arch('sparc-solaris'), + 100 + from dual + where not exists ( + select server_arch_id, package_arch_id, preference + from rhnServerPackageArchCompat + where server_arch_id =3D lookup_server_arch('sparc-sun4v-solaris')= and + package_arch_id =3D lookup_package_arch('sparc-solaris') and + preference =3D 100 + ) +); = -insert into rhnServerPackageArchCompat -(server_arch_id, package_arch_id, preference) values -(LOOKUP_SERVER_ARCH('sparc-sun4v-solaris'), LOOKUP_PACKAGE_ARCH('sparc-sol= aris-patch'), 210); +insert into rhnServerPackageArchCompat (server_arch_id, package_arch_id, p= reference) ( + select lookup_server_arch('sparc-sun4v-solaris'), + lookup_package_arch('sparc-solaris-patch'), + 210 + from dual + where not exists ( + select server_arch_id, package_arch_id, preference + from rhnServerPackageArchCompat + where server_arch_id =3D lookup_server_arch('sparc-sun4v-solaris')= and + package_arch_id =3D lookup_package_arch('sparc-solaris-patch= ') and + preference =3D 210 + ) +); = -insert into rhnServerPackageArchCompat -(server_arch_id, package_arch_id, preference) values -(LOOKUP_SERVER_ARCH('sparc-sun4v-solaris'), LOOKUP_PACKAGE_ARCH('sparc-sol= aris-patch-cluster'), 310); +insert into rhnServerPackageArchCompat (server_arch_id, package_arch_id, p= reference) ( + select lookup_server_arch('sparc-sun4v-solaris'), + lookup_package_arch('sparc-solaris-patch-cluster'), + 310 + from dual + where not exists ( + select server_arch_id, package_arch_id, preference + from rhnServerPackageArchCompat + where server_arch_id =3D lookup_server_arch('sparc-sun4v-solaris')= and + package_arch_id =3D lookup_package_arch('sparc-solaris-patch= -cluster') and + preference =3D 310 + ) +); = -insert into rhnServerPackageArchCompat -(server_arch_id, package_arch_id, preference) values -(LOOKUP_SERVER_ARCH('sparc-sun4v-solaris'), LOOKUP_PACKAGE_ARCH('noarch-so= laris'), 410); +insert into rhnServerPackageArchCompat (server_arch_id, package_arch_id, p= reference) ( + select lookup_server_arch('sparc-sun4v-solaris'), + lookup_package_arch('noarch-solaris'), + 410 + from dual + where not exists ( + select server_arch_id, package_arch_id, preference + from rhnServerPackageArchCompat + where server_arch_id =3D lookup_server_arch('sparc-sun4v-solaris')= and + package_arch_id =3D lookup_package_arch('noarch-solaris') and + preference =3D 410 + ) +); = -insert into rhnServerPackageArchCompat -(server_arch_id, package_arch_id, preference) values -(LOOKUP_SERVER_ARCH('sparc-sun4v-solaris'), LOOKUP_PACKAGE_ARCH('noarch-so= laris-patch'), 510); +insert into rhnServerPackageArchCompat (server_arch_id, package_arch_id, p= reference) ( + select lookup_server_arch('sparc-sun4v-solaris'), + lookup_package_arch('noarch-solaris-patch'), + 510 + from dual + where not exists ( + select server_arch_id, package_arch_id, preference + from rhnServerPackageArchCompat + where server_arch_id =3D lookup_server_arch('sparc-sun4v-solaris')= and + package_arch_id =3D lookup_package_arch('noarch-solaris-patc= h') and + preference =3D 510 + ) +); = -insert into rhnServerPackageArchCompat -(server_arch_id, package_arch_id, preference) values -(LOOKUP_SERVER_ARCH('sparc-sun4v-solaris'), LOOKUP_PACKAGE_ARCH('noarch-so= laris-patch-cluster'), 610); +insert into rhnServerPackageArchCompat (server_arch_id, package_arch_id, p= reference) ( + select lookup_server_arch('sparc-sun4v-solaris'), + lookup_package_arch('noarch-solaris-patch-cluster'), + 610 + from dual + where not exists ( + select server_arch_id, package_arch_id, preference + from rhnServerPackageArchCompat + where server_arch_id =3D lookup_server_arch('sparc-sun4v-solaris')= and + package_arch_id =3D lookup_package_arch('noarch-solaris-patc= h-cluster') and + preference =3D 610 + ) +); commit 1065dca956a9b5e024557e876f76bf7962ef3f2b Author: Milan Zazrivec Date: Wed Jun 17 12:11:37 2009 +0200 506272 - insert row only if it does not exist diff --git a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/005-rhnSe= rverChannelArchCompat_data-solaris-sun4v.sql b/schema/spacewalk/upgrade/sat= ellite-5.1-spacewalk-0.2/005-rhnServerChannelArchCompat_data-solaris-sun4v.= sql index 58b997a..f990c26 100644 --- a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/005-rhnServerCha= nnelArchCompat_data-solaris-sun4v.sql +++ b/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/005-rhnServerCha= nnelArchCompat_data-solaris-sun4v.sql @@ -1,2 +1,11 @@ -insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) v= alues -(LOOKUP_SERVER_ARCH('sparc-sun4v-solaris'), LOOKUP_CHANNEL_ARCH('channel-s= parc-sun-solaris')); +insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) ( + select lookup_server_arch('sparc-sun4v-solaris'), + lookup_channel_arch('channel-sparc-sun-solaris') + from dual + where not exists ( + select server_arch_id, channel_arch_id + from rhnServerChannelArchCompat + where server_arch_id =3D lookup_server_arch('sparc-sun4v-solaris')= and + channel_arch_id =3D lookup_channel_arch('channel-sparc-sun-s= olaris') + ) +); commit e80744f3c0d0e69ef1555becc5ce22c5f0b8e71e Author: Milan Zazrivec Date: Wed Jun 17 12:09:15 2009 +0200 506272 - insert row only if it does not exist diff --git a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/004-rhnCp= uArch_data-solaris-sun4v.sql b/schema/spacewalk/upgrade/satellite-5.1-space= walk-0.2/004-rhnCpuArch_data-solaris-sun4v.sql index b13b454..2ceadc0 100644 --- a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/004-rhnCpuArch_d= ata-solaris-sun4v.sql +++ b/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/004-rhnCpuArch_d= ata-solaris-sun4v.sql @@ -1,2 +1,11 @@ -insert into rhnCpuArch (id, label, name) values -(rhn_cpu_arch_id_seq.nextval, 'sun4v', 'sun4v'); +insert into rhnCpuArch (id, label, name) ( + select rhn_cpu_arch_id_seq.nextval, + 'sun4v', + 'sun4v' + from dual + where not exists ( + select label, name + from rhnCpuArch + where label =3D 'sun4v' and + name =3D 'sun4v') +); commit afb63ccc8264145acd3e43367fe8cbd56c0a4908 Author: Milan Zazrivec Date: Wed Jun 17 12:03:35 2009 +0200 506272 - insert row only if it does not exist diff --git a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/003-rhnCh= annelPackageArchCompat_data-solaris-sun4v.sql b/schema/spacewalk/upgrade/sa= tellite-5.1-spacewalk-0.2/003-rhnChannelPackageArchCompat_data-solaris-sun4= v.sql index e3d309a..d5cf7f1 100644 --- a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/003-rhnChannelPa= ckageArchCompat_data-solaris-sun4v.sql +++ b/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/003-rhnChannelPa= ckageArchCompat_data-solaris-sun4v.sql @@ -1,2 +1,11 @@ -insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id) -values (LOOKUP_CHANNEL_ARCH('channel-sparc-sun-solaris'), LOOKUP_PACKAGE_A= RCH('sparc.sun4v-solaris')); +insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)= ( + select lookup_channel_arch('channel-sparc-sun-solaris'), + lookup_package_arch('sparc.sun4v-solaris') + from dual + where not exists ( + select channel_arch_id, package_arch_id + from rhnChannelPackageArchCompat + where channel_arch_id =3D lookup_channel_arch('channel-sparc-sun-s= olaris') and + package_arch_id =3D lookup_package_arch('sparc.sun4v-solaris= ') + ) +); commit 250e5a1536e0e62df0732145d216b56cbc7d21e9 Author: Milan Zazrivec Date: Wed Jun 17 11:59:14 2009 +0200 506272 - insert row only if it does not exist diff --git a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/002-rhnPa= ckageArch_data-solaris-sun4v.sql b/schema/spacewalk/upgrade/satellite-5.1-s= pacewalk-0.2/002-rhnPackageArch_data-solaris-sun4v.sql index 847b18b..14a70ac 100644 --- a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/002-rhnPackageAr= ch_data-solaris-sun4v.sql +++ b/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/002-rhnPackageAr= ch_data-solaris-sun4v.sql @@ -1,2 +1,13 @@ -insert into rhnPackageArch (id, label, name, arch_type_id) values -(rhn_package_arch_id_seq.nextval, 'sparc.sun4v-solaris', 'Sparc Solaris su= n4v', lookup_arch_type('sysv-solaris')); +insert into rhnPackageArch (id, label, name, arch_type_id) ( + select rhn_package_arch_id_seq.nextval, + 'sparc.sun4v-solaris', + 'Sparc Solaris sun4v', + lookup_arch_type('sysv-solaris') + from dual + where not exists ( + select id, label, name, arch_type_id + from rhnPackageArch + where label =3D 'sparc.sun4v-solaris' and + name =3D 'Sparc Solaris sun4v'and + arch_type_id =3D lookup_arch_type('sysv-solaris')) +); commit 20b52a6a94f44b24ca987dec98d19d8cb99445a9 Author: Milan Zazrivec Date: Wed Jun 17 11:55:03 2009 +0200 506272 - insert row only when it does not exist diff --git a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/001-rhnSe= rverArch_data-solaris-sun4v.sql b/schema/spacewalk/upgrade/satellite-5.1-sp= acewalk-0.2/001-rhnServerArch_data-solaris-sun4v.sql index ed20d11..03024f7 100644 --- a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/001-rhnServerArc= h_data-solaris-sun4v.sql +++ b/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/001-rhnServerArc= h_data-solaris-sun4v.sql @@ -1,2 +1,13 @@ -insert into rhnServerArch (id, label, name, arch_type_id) values -(rhn_server_arch_id_seq.nextval, 'sparc-sun4v-solaris', 'Sparc Solaris', l= ookup_arch_type('sysv-solaris')); +insert into rhnServerArch (id, label, name, arch_type_id) ( + select rhn_server_arch_id_seq.nextval, + 'sparc-sun4v-solaris', + 'Sparc Solaris', + lookup_arch_type('sysv-solaris') + from dual + where not exists ( + select label, name, arch_type_id + from rhnServerArch + where label =3D 'sparc-sun4v-solaris' and + name =3D 'Sparc Solaris' and + arch_type_id =3D lookup_arch_type('sysv-solaris')) +); --===============4493404662098049023==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:39 2015 Content-Type: multipart/mixed; boundary="===============6812340918689168181==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 7 commits - schema/spacewalk Date: Wed, 17 Jun 2009 11:14:25 +0000 Message-ID: <20090617111425.092261201EA@lists.fedorahosted.org> --===============6812340918689168181== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/001-rhnServerArch_dat= a-solaris-sun4v.sql | 15 + schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/002-rhnPackageArch_da= ta-solaris-sun4v.sql | 15 + schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/003-rhnChannelPackage= ArchCompat_data-solaris-sun4v.sql | 13 + schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/004-rhnCpuArch_data-s= olaris-sun4v.sql | 13 + schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/005-rhnServerChannelA= rchCompat_data-solaris-sun4v.sql | 13 + schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/007-rhnServerPackageA= rchCompat_data-solaris-sun4v.sql | 109 ++++++++-- schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/008-rhnServerServerGr= oupArchCompat_data-solaris-sun4v.sql | 26 ++ 7 files changed, 169 insertions(+), 35 deletions(-) New commits: commit 86d39c282d02515b6f5874e09b8518f6da58a9b9 Author: Milan Zazrivec Date: Wed Jun 17 13:01:17 2009 +0200 506272 - insert rows only if they do not exist diff --git a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/008-rhnSe= rverServerGroupArchCompat_data-solaris-sun4v.sql b/schema/spacewalk/upgrade= /satellite-5.1-spacewalk-0.2/008-rhnServerServerGroupArchCompat_data-solari= s-sun4v.sql index 5f46238..aa5447f 100644 --- a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/008-rhnServerSer= verGroupArchCompat_data-solaris-sun4v.sql +++ b/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/008-rhnServerSer= verGroupArchCompat_data-solaris-sun4v.sql @@ -1,5 +1,23 @@ -insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_= type ) -values (lookup_server_arch('sparc-sun4v-solaris'), lookup_sg_type('enterpr= ise_entitled')); +insert into rhnServerServerGroupArchCompat (server_arch_id, server_group_t= ype) ( + select lookup_server_arch('sparc-sun4v-solaris'), lookup_sg_type('ente= rprise_entitled') + from dual + where not exists ( + select server_arch_id, + server_group_type + from rhnServerServerGroupArchCompat + where server_arch_id =3D lookup_server_arch('sparc-sun4v-solaris')= and + server_group_type =3D lookup_sg_type('enterprise_entitled') + ) +); = -insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_= type ) -values (lookup_server_arch('sparc-sun4v-solaris'), lookup_sg_type('provisi= oning_entitled')); +insert into rhnServerServerGroupArchCompat (server_arch_id, server_group_t= ype) ( + select lookup_server_arch('sparc-sun4v-solaris'), lookup_sg_type('prov= isioning_entitled') + from dual + where not exists ( + select server_arch_id, + server_group_type + from rhnServerServerGroupArchCompat + where server_arch_id =3D lookup_server_arch('sparc-sun4v-solaris')= and + server_group_type =3D lookup_sg_type('provisioning_entitled') + ) +); commit 823cb97555a2d0459ba6a8ec0bd033fc4caa3a66 Author: Milan Zazrivec Date: Wed Jun 17 12:57:17 2009 +0200 506272 - insert rows only if they do not exist diff --git a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/007-rhnSe= rverPackageArchCompat_data-solaris-sun4v.sql b/schema/spacewalk/upgrade/sat= ellite-5.1-spacewalk-0.2/007-rhnServerPackageArchCompat_data-solaris-sun4v.= sql index 8b5587a..d78834a 100644 --- a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/007-rhnServerPac= kageArchCompat_data-solaris-sun4v.sql +++ b/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/007-rhnServerPac= kageArchCompat_data-solaris-sun4v.sql @@ -1,27 +1,94 @@ -insert into rhnServerPackageArchCompat -(server_arch_id, package_arch_id, preference) values -(LOOKUP_SERVER_ARCH('sparc-sun4v-solaris'), LOOKUP_PACKAGE_ARCH('sparc.sun= 4v-solaris'), 10); +insert into rhnServerPackageArchCompat (server_arch_id, package_arch_id, p= reference) ( + select lookup_server_arch('sparc-sun4v-solaris'), lookup_package_arch(= 'sparc.sun4v-solaris'), 10 + from dual + where not exists ( + select server_arch_id, package_arch_id, preference + from rhnServerPackageArchCompat + where server_arch_id =3D lookup_server_arch('sparc-sun4v-solaris')= and + package_arch_id =3D lookup_package_arch('sparc.sun4v-solaris= ') and + preference =3D 10) +); = -insert into rhnServerPackageArchCompat -(server_arch_id, package_arch_id, preference) values -(LOOKUP_SERVER_ARCH('sparc-sun4v-solaris'), LOOKUP_PACKAGE_ARCH('sparc-sol= aris'), 100); +insert into rhnServerPackageArchCompat (server_arch_id, package_arch_id, p= reference) ( + select lookup_server_arch('sparc-sun4v-solaris'), + lookup_package_arch('sparc-solaris'), + 100 + from dual + where not exists ( + select server_arch_id, package_arch_id, preference + from rhnServerPackageArchCompat + where server_arch_id =3D lookup_server_arch('sparc-sun4v-solaris')= and + package_arch_id =3D lookup_package_arch('sparc-solaris') and + preference =3D 100 + ) +); = -insert into rhnServerPackageArchCompat -(server_arch_id, package_arch_id, preference) values -(LOOKUP_SERVER_ARCH('sparc-sun4v-solaris'), LOOKUP_PACKAGE_ARCH('sparc-sol= aris-patch'), 210); +insert into rhnServerPackageArchCompat (server_arch_id, package_arch_id, p= reference) ( + select lookup_server_arch('sparc-sun4v-solaris'), + lookup_package_arch('sparc-solaris-patch'), + 210 + from dual + where not exists ( + select server_arch_id, package_arch_id, preference + from rhnServerPackageArchCompat + where server_arch_id =3D lookup_server_arch('sparc-sun4v-solaris')= and + package_arch_id =3D lookup_package_arch('sparc-solaris-patch= ') and + preference =3D 210 + ) +); = -insert into rhnServerPackageArchCompat -(server_arch_id, package_arch_id, preference) values -(LOOKUP_SERVER_ARCH('sparc-sun4v-solaris'), LOOKUP_PACKAGE_ARCH('sparc-sol= aris-patch-cluster'), 310); +insert into rhnServerPackageArchCompat (server_arch_id, package_arch_id, p= reference) ( + select lookup_server_arch('sparc-sun4v-solaris'), + lookup_package_arch('sparc-solaris-patch-cluster'), + 310 + from dual + where not exists ( + select server_arch_id, package_arch_id, preference + from rhnServerPackageArchCompat + where server_arch_id =3D lookup_server_arch('sparc-sun4v-solaris')= and + package_arch_id =3D lookup_package_arch('sparc-solaris-patch= -cluster') and + preference =3D 310 + ) +); = -insert into rhnServerPackageArchCompat -(server_arch_id, package_arch_id, preference) values -(LOOKUP_SERVER_ARCH('sparc-sun4v-solaris'), LOOKUP_PACKAGE_ARCH('noarch-so= laris'), 410); +insert into rhnServerPackageArchCompat (server_arch_id, package_arch_id, p= reference) ( + select lookup_server_arch('sparc-sun4v-solaris'), + lookup_package_arch('noarch-solaris'), + 410 + from dual + where not exists ( + select server_arch_id, package_arch_id, preference + from rhnServerPackageArchCompat + where server_arch_id =3D lookup_server_arch('sparc-sun4v-solaris')= and + package_arch_id =3D lookup_package_arch('noarch-solaris') and + preference =3D 410 + ) +); = -insert into rhnServerPackageArchCompat -(server_arch_id, package_arch_id, preference) values -(LOOKUP_SERVER_ARCH('sparc-sun4v-solaris'), LOOKUP_PACKAGE_ARCH('noarch-so= laris-patch'), 510); +insert into rhnServerPackageArchCompat (server_arch_id, package_arch_id, p= reference) ( + select lookup_server_arch('sparc-sun4v-solaris'), + lookup_package_arch('noarch-solaris-patch'), + 510 + from dual + where not exists ( + select server_arch_id, package_arch_id, preference + from rhnServerPackageArchCompat + where server_arch_id =3D lookup_server_arch('sparc-sun4v-solaris')= and + package_arch_id =3D lookup_package_arch('noarch-solaris-patc= h') and + preference =3D 510 + ) +); = -insert into rhnServerPackageArchCompat -(server_arch_id, package_arch_id, preference) values -(LOOKUP_SERVER_ARCH('sparc-sun4v-solaris'), LOOKUP_PACKAGE_ARCH('noarch-so= laris-patch-cluster'), 610); +insert into rhnServerPackageArchCompat (server_arch_id, package_arch_id, p= reference) ( + select lookup_server_arch('sparc-sun4v-solaris'), + lookup_package_arch('noarch-solaris-patch-cluster'), + 610 + from dual + where not exists ( + select server_arch_id, package_arch_id, preference + from rhnServerPackageArchCompat + where server_arch_id =3D lookup_server_arch('sparc-sun4v-solaris')= and + package_arch_id =3D lookup_package_arch('noarch-solaris-patc= h-cluster') and + preference =3D 610 + ) +); commit b46ba1d4a411670dcd7ba1b73bc99bd3ce1267f2 Author: Milan Zazrivec Date: Wed Jun 17 12:11:37 2009 +0200 506272 - insert row only if it does not exist diff --git a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/005-rhnSe= rverChannelArchCompat_data-solaris-sun4v.sql b/schema/spacewalk/upgrade/sat= ellite-5.1-spacewalk-0.2/005-rhnServerChannelArchCompat_data-solaris-sun4v.= sql index 58b997a..f990c26 100644 --- a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/005-rhnServerCha= nnelArchCompat_data-solaris-sun4v.sql +++ b/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/005-rhnServerCha= nnelArchCompat_data-solaris-sun4v.sql @@ -1,2 +1,11 @@ -insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) v= alues -(LOOKUP_SERVER_ARCH('sparc-sun4v-solaris'), LOOKUP_CHANNEL_ARCH('channel-s= parc-sun-solaris')); +insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) ( + select lookup_server_arch('sparc-sun4v-solaris'), + lookup_channel_arch('channel-sparc-sun-solaris') + from dual + where not exists ( + select server_arch_id, channel_arch_id + from rhnServerChannelArchCompat + where server_arch_id =3D lookup_server_arch('sparc-sun4v-solaris')= and + channel_arch_id =3D lookup_channel_arch('channel-sparc-sun-s= olaris') + ) +); commit a2703fff77f228a84e9650b848c0ea4ce904de67 Author: Milan Zazrivec Date: Wed Jun 17 12:09:15 2009 +0200 506272 - insert row only if it does not exist diff --git a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/004-rhnCp= uArch_data-solaris-sun4v.sql b/schema/spacewalk/upgrade/satellite-5.1-space= walk-0.2/004-rhnCpuArch_data-solaris-sun4v.sql index b13b454..2ceadc0 100644 --- a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/004-rhnCpuArch_d= ata-solaris-sun4v.sql +++ b/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/004-rhnCpuArch_d= ata-solaris-sun4v.sql @@ -1,2 +1,11 @@ -insert into rhnCpuArch (id, label, name) values -(rhn_cpu_arch_id_seq.nextval, 'sun4v', 'sun4v'); +insert into rhnCpuArch (id, label, name) ( + select rhn_cpu_arch_id_seq.nextval, + 'sun4v', + 'sun4v' + from dual + where not exists ( + select label, name + from rhnCpuArch + where label =3D 'sun4v' and + name =3D 'sun4v') +); commit 44bb771227bc8efcf871a24641137655a527bffa Author: Milan Zazrivec Date: Wed Jun 17 12:03:35 2009 +0200 506272 - insert row only if it does not exist diff --git a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/003-rhnCh= annelPackageArchCompat_data-solaris-sun4v.sql b/schema/spacewalk/upgrade/sa= tellite-5.1-spacewalk-0.2/003-rhnChannelPackageArchCompat_data-solaris-sun4= v.sql index e3d309a..d5cf7f1 100644 --- a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/003-rhnChannelPa= ckageArchCompat_data-solaris-sun4v.sql +++ b/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/003-rhnChannelPa= ckageArchCompat_data-solaris-sun4v.sql @@ -1,2 +1,11 @@ -insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id) -values (LOOKUP_CHANNEL_ARCH('channel-sparc-sun-solaris'), LOOKUP_PACKAGE_A= RCH('sparc.sun4v-solaris')); +insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)= ( + select lookup_channel_arch('channel-sparc-sun-solaris'), + lookup_package_arch('sparc.sun4v-solaris') + from dual + where not exists ( + select channel_arch_id, package_arch_id + from rhnChannelPackageArchCompat + where channel_arch_id =3D lookup_channel_arch('channel-sparc-sun-s= olaris') and + package_arch_id =3D lookup_package_arch('sparc.sun4v-solaris= ') + ) +); commit 4af98db7f511887ee028156aea674f3abc7a9017 Author: Milan Zazrivec Date: Wed Jun 17 11:59:14 2009 +0200 506272 - insert row only if it does not exist diff --git a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/002-rhnPa= ckageArch_data-solaris-sun4v.sql b/schema/spacewalk/upgrade/satellite-5.1-s= pacewalk-0.2/002-rhnPackageArch_data-solaris-sun4v.sql index 847b18b..14a70ac 100644 --- a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/002-rhnPackageAr= ch_data-solaris-sun4v.sql +++ b/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/002-rhnPackageAr= ch_data-solaris-sun4v.sql @@ -1,2 +1,13 @@ -insert into rhnPackageArch (id, label, name, arch_type_id) values -(rhn_package_arch_id_seq.nextval, 'sparc.sun4v-solaris', 'Sparc Solaris su= n4v', lookup_arch_type('sysv-solaris')); +insert into rhnPackageArch (id, label, name, arch_type_id) ( + select rhn_package_arch_id_seq.nextval, + 'sparc.sun4v-solaris', + 'Sparc Solaris sun4v', + lookup_arch_type('sysv-solaris') + from dual + where not exists ( + select id, label, name, arch_type_id + from rhnPackageArch + where label =3D 'sparc.sun4v-solaris' and + name =3D 'Sparc Solaris sun4v'and + arch_type_id =3D lookup_arch_type('sysv-solaris')) +); commit a54ab1609cdfbcbca12cdb0b7b6d5da79991e09c Author: Milan Zazrivec Date: Wed Jun 17 11:55:03 2009 +0200 506272 - insert row only when it does not exist diff --git a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/001-rhnSe= rverArch_data-solaris-sun4v.sql b/schema/spacewalk/upgrade/satellite-5.1-sp= acewalk-0.2/001-rhnServerArch_data-solaris-sun4v.sql index ed20d11..03024f7 100644 --- a/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/001-rhnServerArc= h_data-solaris-sun4v.sql +++ b/schema/spacewalk/upgrade/satellite-5.1-spacewalk-0.2/001-rhnServerArc= h_data-solaris-sun4v.sql @@ -1,2 +1,13 @@ -insert into rhnServerArch (id, label, name, arch_type_id) values -(rhn_server_arch_id_seq.nextval, 'sparc-sun4v-solaris', 'Sparc Solaris', l= ookup_arch_type('sysv-solaris')); +insert into rhnServerArch (id, label, name, arch_type_id) ( + select rhn_server_arch_id_seq.nextval, + 'sparc-sun4v-solaris', + 'Sparc Solaris', + lookup_arch_type('sysv-solaris') + from dual + where not exists ( + select label, name, arch_type_id + from rhnServerArch + where label =3D 'sparc-sun4v-solaris' and + name =3D 'Sparc Solaris' and + arch_type_id =3D lookup_arch_type('sysv-solaris')) +); --===============6812340918689168181==-- From partha at fedoraproject.org Thu Aug 20 11:57:39 2015 Content-Type: multipart/mixed; boundary="===============3341804892058582827==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Wed, 17 Jun 2009 16:10:23 +0000 Message-ID: <20090617161023.BB44B1202FA@lists.fedorahosted.org> --===============3341804892058582827== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralConfigA= ctionTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit bb6dcb8dcb99af8ad174cb980123c57850d060e1 Author: Partha Aji Date: Wed Jun 17 12:10:10 2009 -0400 Revert "fix unit test cases" The original commit was only meant for the master branch not vader. Since we changed the mechanism for those pages to get attached to the error key in master branch instead of the global messages key. = This reverts commit 49942078c920576babbeb2d8d486ee4ca589aa95. diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/Ge= neralConfigActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/s= atellite/test/GeneralConfigActionTest.java index af94a3d..72d64d0 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralCo= nfigActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralCo= nfigActionTest.java @@ -103,7 +103,10 @@ public class GeneralConfigActionTest extends RhnMockSt= rutsTestCase { assertEquals("testuser(a)redhat.com", Config.get().getString("trac= eback_mail")); assertEquals("testbox", Config.get().getString("server.jabber_serv= er")); = - verifyActionMessages(new String[] {"config.restartrequired"}); + = + // The 2 errors are from the 1st actionPerform() + verifyActionMessages(new String[] {"config.restartrequired", = + "errors.required", "errors.required"}); = = Config.get().setBoolean(TEST_CONFIG_BOOLEAN, new Boolean(origValue= ).toString()); --===============3341804892058582827==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:39 2015 Content-Type: multipart/mixed; boundary="===============1661319890903678897==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Wed, 17 Jun 2009 16:36:12 +0000 Message-ID: <20090617163612.A75211202FA@lists.fedorahosted.org> --===============1661319890903678897== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml = | 48 +- java/code/src/com/redhat/rhn/frontend/dto/EssentialChannelDto.java = | 12 = java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java = | 111 +++++- java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java = | 163 +++++++--- 4 files changed, 222 insertions(+), 112 deletions(-) New commits: commit 2a4a6f17828670572aad4ef4919d3483733b83e8 Author: Devan Goodwin Date: Wed Jun 17 12:06:54 2009 -0300 506296 - Repair EUS logic after removal of is_default column. = Losing this column has exposed several new and pre-existing issues, both with identifying default channels as well as severe problems with comparing the RHEL release, which is relied on more heavily now that the is_default column is gone. = Issues with comparing RHEL release include: - It is a "version" string comparison, i.e. 5.0.9 should be < 5.0.10, so a simple string compare will not work. - For RHEL 4 (only), release is usually something like "X" or possibly "X.Y", in this case we only want to compare based on "X". - For RHEL 5 and future releases, release is usually something like "W.X.Y.Z", and in this case we only want to compare based on "W.X.Y". diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_= queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel= _queries.xml index c13bad5..11cdbd5 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml @@ -781,10 +781,11 @@ SELECT C.id, C.name, C.label, 1 AS IS_CUSTOM = - + select unique c.id, c.label, c.name, + rcm.release, 0 AS IS_CUSTOM from rhnChannelPermissions cp, @@ -794,12 +795,12 @@ SELECT C.id, C.name, C.label, 1 AS IS_CUSTOM rhnReleaseChannelMap rcm, rhnProductName pn where - rcm.release >=3D :release - and rcm.version =3D :version + rcm.version =3D :version and scac.server_arch_id =3D sa.id and sa.label =3D :server_arch and scac.channel_arch_id =3D rcm.channel_arch_id and rcm.channel_id =3D c.id + and cp.channel_id =3D c.id and cp.org_id =3D :org_id and pn.id =3D c.product_name_id and pn.label =3D :product_name_label @@ -809,29 +810,6 @@ SELECT C.id, C.name, C.label, 1 AS IS_CUSTOM = - - - select unique c.id, - c.label, - c.name, - 0 AS IS_CUSTOM - from - rhnChannelPermissions cp = - inner join rhnChannel c on cp.channel_id =3D c.id - inner join rhnReleaseChannelMap rcm on rcm.channel_id =3D c.i= d = - inner join rhnProductName pn on pn.id =3D c.product_name_id = - where - rcm.release =3D :release - and rcm.version =3D :version - and rcm.channel_arch_id =3D :channel_arch_id - and cp.org_id =3D :org_id - and pn.label =3D :product_name_label - and rhn_channel.loose_user_role_check(c.id, :user_id, - 'subscribe') =3D 1 - - - @@ -848,7 +826,8 @@ SELECT C.id, C.name, C.label, 1 AS IS_CUSTOM where rcm.version =3D :version and rcm.channel_arch_id =3D :channel_arch_id - and rcm.channel_id =3D c.id = + and rcm.channel_id =3D c.id + and cp.channel_id =3D c.id and cp.org_id =3D :org_id and pn.id =3D c.product_name_id and pn.label =3D :product_name_label @@ -1026,6 +1005,21 @@ SELECT CP.package_id, CP.name_id, CP.evr_id, CP.pack= age_arch_id = + + +SELECT CP.package_id, CP.name_id, CP.evr_id, CP.package_arch_id + FROM rhnPackageName PN inner join + rhnChannelNewestPackage CP on CP.name_id =3D PN.id inner jo= in + rhnChannel C on C.id =3D Cp.channel_id inner join + rhnPackage P on P.id =3D CP.package_id inner join + rhnPackageEvr EVR on P.evr_id =3D EVR.id + WHERE ( C.id =3D :cid or C.parent_channel =3D :cid) + AND PN.name =3D :name + AND C.label not like '%beta%' + order by EVR.evr DESC + + + SELECT CP.package_id, CP.name_id, CP.evr_id diff --git a/java/code/src/com/redhat/rhn/frontend/dto/EssentialChannelDto.= java b/java/code/src/com/redhat/rhn/frontend/dto/EssentialChannelDto.java index a0c327d..f7e1b84 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/EssentialChannelDto.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/EssentialChannelDto.java @@ -21,8 +21,7 @@ import com.redhat.rhn.domain.channel.Channel; * EssentialChannelDto * @version $Rev$ */ -public class EssentialChannelDto extends BaseDto = - implements Comparable { +public class EssentialChannelDto extends BaseDto { = private Long id; private Long ownerId; @@ -151,13 +150,4 @@ public class EssentialChannelDto extends BaseDto this.ownerId =3D ownerIdIn; } = - /** - * compare to another EssentialChannelDto - * @param o the other object - * @return the compare - */ - public int compareTo(EssentialChannelDto o) { - return this.getRelease().compareTo(o.getRelease()); - } - } diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.ja= va b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java index e12c35e..2e851aa 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -98,6 +98,15 @@ public class ChannelManager extends BaseManager { public static final String QRY_ROLE_MANAGE =3D "manage"; public static final String QRY_ROLE_SUBSCRIBE =3D "subscribe"; = + // Valid RHEL 4 EUS Channel Versions (from rhnReleaseChannelMap): + public static final Set RHEL4_EUS_VERSIONS; + static { + RHEL4_EUS_VERSIONS =3D new HashSet(); + RHEL4_EUS_VERSIONS.add("4AS"); + RHEL4_EUS_VERSIONS.add("4ES"); + } + + // Product name (also sometimes referred to as OS) is unfortunately ve= ry // convoluted. For RHEL, in rhnDistChannelMap is appears as "Red Hat L= inux", in // rhnReleaseChannelMap it is "RHEL AS", and in rhnProductName it's la= bel is "rhel". @@ -255,8 +264,6 @@ public class ChannelManager extends BaseManager { return ret; } = - = - = /** * Returns a list channel entitlements for all orgs. * @param pc The PageControl @@ -1666,11 +1673,33 @@ public class ChannelManager extends BaseManager { * Convert redhat-release release values to those that are stored in t= he * rhnReleaseChannelMap table. * - * @param originalRelease Original package evr release. + * RHEL 4 release samples: 7.6, 8, 9 + * RHEL 5 release samples: 5.1.0.1, 5.2.0.2, 5.3.0.3 + * + * RHEL 4 must be treated specially, if the release is X.Y, we only wi= sh to look at + * the X portion. + * + * For RHEL 5 and presumably all future releases, we only look at the = W.X.Y portion of + * W.X.Y.Z. + * + * @param rhelVersion RHEL version we're comparing release for. (5Serv= er, 4AS, 4ES) + * @param originalRelease Original package release. * @return Release version for rhnReleaseChannelMap. */ - public static String normalizeRhelReleaseForMapping(String originalRel= ease) { + public static String normalizeRhelReleaseForMapping(String rhelVersion, + String originalRelease) { + String [] tokens =3D originalRelease.split("\\."); + + if (RHEL4_EUS_VERSIONS.contains(rhelVersion)) { + if (tokens.length <=3D 1) { + return originalRelease; + } + else { + return tokens[0]; + } + } + if (tokens.length <=3D 3) { return originalRelease; } @@ -1929,8 +1958,6 @@ public class ChannelManager extends BaseManager { return false; } = - log.debug("isDefaultBaseChannel()"); - log.debug(" version =3D " + version); Channel defaultBaseChan =3D getDefaultBaseChannel(version, = baseChan.getChannelArch()); if (defaultBaseChan =3D=3D null) { @@ -2091,10 +2118,11 @@ public class ChannelManager extends BaseManager { // that ALL entries in that table for the product/version/chan= nel arch // are valid replacement base channels: if (isDefaultBaseChannel(inChan, version)) { + log.debug("inChan is default base channel"); EssentialChannelDto latestEus =3D lookupLatestEusChannelFo= rRhelVersion(u, = version, inChan.getChannelArch().getId()); if (latestEus !=3D null) { - log.debug("inChan is default channel, including latest= EUS channel: " + = + log.debug("Including latest EUS channel: " + latestEus.getLabel()); eusBaseChans.add(latestEus); } @@ -2116,8 +2144,11 @@ public class ChannelManager extends BaseManager { // First make sure to add the default base channel, EUS sy= stems should // always be able to upgrade to the mainline RHEL release = for their = // version: + log.debug("Looking up default base channel for:"); + log.debug(" version =3D " + version); + log.debug(" channelArch =3D " + channelArch); Channel defaultBaseChan =3D getDefaultBaseChannel(version,= channelArch); - log.debug("Adding default base channel: " + defaultBaseCha= n.getLabel()); + log.debug("Adding default base channel: " + defaultBaseCha= n); retval.add(channelToEssentialChannelDto(defaultBaseChan, f= alse)); = eusBaseChans =3D listBaseEusChannelsByVersionReleaseAndCha= nnelArch( @@ -2188,6 +2219,10 @@ public class ChannelManager extends BaseManager { * Lookup the EUS base channels suitable for the given version, releas= e, and = * server arch. * = + * NOTE: Release not actually used in the database query, must filter = manually + * in application code due to some very specific requirements on how i= t must + * be compared. See normalizeRhelReleaseForMapping for more info. + * * @param user User performing the query. * @param version RHEL version. * @param release RHEL version release. @@ -2197,32 +2232,45 @@ public class ChannelManager extends BaseManager { public static List = listBaseEusChannelsByVersionReleaseAndServerArch(User user, = String version, String release, String serverArch) { - = + log.debug("listBaseEusChannelsByVersionReleaseAndServerArch()"); + log.debug(" version =3D " + version); + log.debug(" release =3D " + release); + log.debug(" serverArch =3D " + serverArch); SelectMode m =3D ModeFactory.getMode("Channel_queries", = "base_eus_channels_by_version_release_server_arch"); - release =3D normalizeRhelReleaseForMapping(release); Map params =3D new HashMap(); params.put("user_id", user.getId()); params.put("org_id", user.getOrg().getId()); - log.debug(" version =3D " + version); - log.debug(" release =3D " + release); - log.debug(" serverArch =3D " + serverArch); params.put("product_name_label", RHEL_PRODUCT_NAME); params.put("version", version); - params.put("release", release); params.put("server_arch", serverArch); - DataResult dr =3D makeDataResult(params, new HashMap(), null, m); - return dr; + DataResult dr =3D makeDataResult(params, new= HashMap(), + null, m); + + List result =3D new LinkedList(); + EusReleaseComparator comparator =3D new EusReleaseComparator(versi= on); + for (EssentialChannelDto dto : dr) { + log.debug(dto.getId()); + if (comparator.compare(dto.getRelease(), release) >=3D 0) { + result.add(dto); + } + } + + return result; } = /** * Lookup the EUS base channels suitable for the given version, releas= e, and = * channel arch. * = + * NOTE: Release not actually used in the database query, must filter = manually + * in application code due to some very specific requirements on how i= t must + * be compared. See normalizeRhelReleaseForMapping for more info. + * * @param user User performing the query. * @param version RHEL version. - * @param release RHEL version release. + * @param release RHEL release. * @param channelArchId Channel arch. * @return List of EssentialChannelDto's. */ @@ -2232,8 +2280,7 @@ public class ChannelManager extends BaseManager { = log.debug("listBaseEusChannelsByVersionReleaseAndChannelArch()"); SelectMode m =3D ModeFactory.getMode("Channel_queries", = - "base_eus_channels_by_version_release_channel_arch"); - release =3D normalizeRhelReleaseForMapping(release); + "base_eus_channels_by_version_channel_arch"); Map params =3D new HashMap(); params.put("user_id", user.getId()); params.put("org_id", user.getOrg().getId()); @@ -2242,16 +2289,25 @@ public class ChannelManager extends BaseManager { log.debug(" channelArch =3D " + channelArchId); params.put("product_name_label", RHEL_PRODUCT_NAME); params.put("version", version); - params.put("release", release); params.put("channel_arch_id", channelArchId); - DataResult dr =3D makeDataResult(params, new HashMap(), null, m); - return dr; + DataResult dr =3D makeDataResult(params, new= HashMap(), + null, m); + + List result =3D new LinkedList(); + EusReleaseComparator comparator =3D new EusReleaseComparator(versi= on); + for (EssentialChannelDto dto : dr) { + if (comparator.compare(dto.getRelease(), release) > 0) { + result.add(dto); + } + } + + return result; } = /** - * Lookup the latest EUS base channel for the given version and server= arch. Uses the - * is_default column of rhnReleaseChannelMap to locate the latest rele= ase. If no - * entry exists, null will be returned. + * Lookup the latest EUS base channel for the given version and server= arch. + * + * Sorts based on the release column. null will be returned if none fo= und. * = * @param user User performing the query. * @param rhelVersion RHEL version. @@ -2273,11 +2329,12 @@ public class ChannelManager extends BaseManager { params.put("product_name_label", RHEL_PRODUCT_NAME); params.put("version", rhelVersion); params.put("channel_arch_id", channelArchId); - DataResult dr =3D makeDataResult(params, new HashMap(), null, m); + DataResult dr =3D makeDataResult(params, new= HashMap(), + null, m); if (dr.size() =3D=3D 0) { return null; } - Collections.sort(dr); + Collections.sort(dr, new EusReleaseComparator(rhelVersion)); return (EssentialChannelDto) dr.get(dr.size() - 1); } = diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManag= erTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelMana= gerTest.java index b056d92..f7a496f 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java +++ b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java @@ -48,6 +48,7 @@ import com.redhat.rhn.frontend.dto.SystemsPerChannelDto; import com.redhat.rhn.frontend.xmlrpc.NoSuchChannelException; import com.redhat.rhn.manager.channel.ChannelEntitlementCounter; import com.redhat.rhn.manager.channel.ChannelManager; +import com.redhat.rhn.manager.channel.EusReleaseComparator; import com.redhat.rhn.manager.channel.MultipleChannelsWithPackageException; import com.redhat.rhn.manager.entitlement.EntitlementManager; import com.redhat.rhn.manager.errata.ErrataManager; @@ -403,73 +404,136 @@ public class ChannelManagerTest extends BaseTestCase= WithUser { } = public void testListBaseEusChannelsByVersionReleaseAndChannelArch() th= rows Exception { - Server s =3D ServerTestUtils.createTestSystem(user); String version =3D "5Server"; - String release =3D "5.0.0"; - = - s =3D ServerTestUtils.addRedhatReleasePackageToServer(user, s, ver= sion, release); = // Create some base channels and corresponding entries in rhnRelea= seChannelMap: - Channel base1 =3D ChannelFactoryTest.createBaseChannel(user); - Channel base2 =3D ChannelFactoryTest.createBaseChannel(user); + Channel rhel50 =3D ChannelFactoryTest.createBaseChannel(user); + Channel rhel51 =3D ChannelFactoryTest.createBaseChannel(user); + Channel rhel52 =3D ChannelFactoryTest.createBaseChannel(user); + Channel rhel53 =3D ChannelFactoryTest.createBaseChannel(user); + Channel rhel6 =3D ChannelFactoryTest.createBaseChannel(user); + Channel rhel4 =3D ChannelFactoryTest.createBaseChannel(user); ChannelFactoryTest.createBaseChannel(user); = - ChannelManagerTest.createReleaseChannelMap(base1, = - ChannelManager.RHEL_PRODUCT_NAME, version, "5.0.1"); - ChannelManagerTest.createReleaseChannelMap(base2, = - ChannelManager.RHEL_PRODUCT_NAME, version, "5.0.2"); - = + ChannelManagerTest.createReleaseChannelMap(rhel50, + ChannelManager.RHEL_PRODUCT_NAME, version, "5.0.0.0"); + ChannelManagerTest.createReleaseChannelMap(rhel51, + ChannelManager.RHEL_PRODUCT_NAME, version, "5.1.0.1"); + ChannelManagerTest.createReleaseChannelMap(rhel52, + ChannelManager.RHEL_PRODUCT_NAME, version, "5.2.0.2"); + ChannelManagerTest.createReleaseChannelMap(rhel53, + ChannelManager.RHEL_PRODUCT_NAME, version, "5.3.0.3"); + ChannelManagerTest.createReleaseChannelMap(rhel6, + ChannelManager.RHEL_PRODUCT_NAME, "6Server", "6.0.0.0"); + ChannelManagerTest.createReleaseChannelMap(rhel4, + ChannelManager.RHEL_PRODUCT_NAME, "4AS", "4.6.0"); + + // For a system with 5.0 already, they should only see RHEL 5 EUS = channels + // with a higher or equal release. List channels =3D ChannelManager. - listBaseEusChannelsByVersionReleaseAndChannelArch(user, versio= n, release, = - base1.getChannelArch().getId()); + listBaseEusChannelsByVersionReleaseAndChannelArch(user, versio= n, "5.1.0.1", + rhel51.getChannelArch().getId()); assertTrue(channels.size() >=3D 2); + + Set returnedIds =3D new HashSet(); + for (EssentialChannelDto c : channels) { + returnedIds.add(c.getId()); + } + + assertFalse(returnedIds.contains(rhel50.getId())); + assertFalse(returnedIds.contains(rhel51.getId())); + assertTrue(returnedIds.contains(rhel52.getId())); + assertTrue(returnedIds.contains(rhel53.getId())); + assertFalse(returnedIds.contains(rhel6.getId())); + assertFalse(returnedIds.contains(rhel4.getId())); } = - public void testLookupLatestEusChannelForRhelVersion() throws Exceptio= n { - Server s =3D ServerTestUtils.createTestSystem(user); - String version =3D "5Server"; - String release =3D "5.0.0"; - String release2 =3D "5.0.1"; - = - s =3D ServerTestUtils.addRedhatReleasePackageToServer(user, s, ver= sion, release); + public void testLookupLatestEusChannelForRhel5() throws Exception { + String el5version =3D "5Server"; + String release500 =3D "5.0.0"; + String release520 =3D "5.2.0.2"; + String release530 =3D "5.3.0.3"; = // Create some base channels and corresponding entries in rhnRelea= seChannelMap: - Channel base1 =3D ChannelFactoryTest.createBaseChannel(user); - Channel base2 =3D ChannelFactoryTest.createBaseChannel(user); - // not sure why we create this third one, but I'll leave it here. - // jesusr 2007/11/15 - ChannelFactoryTest.createBaseChannel(user); - ChannelManagerTest.createReleaseChannelMap(base1, = - ChannelManager.RHEL_PRODUCT_NAME, version, release); - ChannelManagerTest.createReleaseChannelMap(base2, = - ChannelManager.RHEL_PRODUCT_NAME, version, release2); + Channel rhel500Chan =3D ChannelFactoryTest.createBaseChannel(user); + Channel rhel530Chan =3D ChannelFactoryTest.createBaseChannel(user); + Channel rhel520Chan =3D ChannelFactoryTest.createBaseChannel(user); + + // Creating these in a random order to make sure most recent isn't= also + // most recently created and accidentally getting returned. + ChannelManagerTest.createReleaseChannelMap(rhel500Chan, + ChannelManager.RHEL_PRODUCT_NAME, el5version, release500); + ChannelManagerTest.createReleaseChannelMap(rhel530Chan, + ChannelManager.RHEL_PRODUCT_NAME, el5version, release530); + ChannelManagerTest.createReleaseChannelMap(rhel520Chan, + ChannelManager.RHEL_PRODUCT_NAME, el5version, release520); = EssentialChannelDto channel =3D ChannelManager. - lookupLatestEusChannelForRhelVersion(user, version, = - base1.getChannelArch().getId()); - assertEquals(base2.getId().longValue(), channel.getId().longValue(= )); + lookupLatestEusChannelForRhelVersion(user, el5version, + rhel500Chan.getChannelArch().getId()); + assertEquals(rhel530Chan.getId().longValue(), channel.getId().long= Value()); } = - public void testLookupLatestEusChannelForRhelVersionNoneFound() throws= Exception { - Server s =3D ServerTestUtils.createTestSystem(user); - String version =3D "5Server"; - String release =3D "5.0.0"; - String release2 =3D "5.0.1"; + // Test the problem with string version comparisons is being handled: + public void testLookupLatestEusChannelForRhel5WeirdVersionCompare() th= rows Exception { + String el5version =3D "5Server"; + String release5310 =3D "5.3.10.0"; // should appear as most recent + String release539 =3D "5.3.9.0"; = - s =3D ServerTestUtils.addRedhatReleasePackageToServer(user, s, ver= sion, release); + // Create some base channels and corresponding entries in rhnRelea= seChannelMap: + Channel rhel5310Chan =3D ChannelFactoryTest.createBaseChannel(user= ); + Channel rhel539Chan =3D ChannelFactoryTest.createBaseChannel(user); + + // Creating these in a random order to make sure most recent isn't= also + // most recently created and accidentally getting returned. + ChannelManagerTest.createReleaseChannelMap(rhel5310Chan, + ChannelManager.RHEL_PRODUCT_NAME, el5version, release5310); + ChannelManagerTest.createReleaseChannelMap(rhel539Chan, + ChannelManager.RHEL_PRODUCT_NAME, el5version, release539); = + EssentialChannelDto channel =3D ChannelManager. + lookupLatestEusChannelForRhelVersion(user, el5version, + rhel5310Chan.getChannelArch().getId()); + assertEquals(rhel5310Chan.getId().longValue(), channel.getId().lon= gValue()); + } + + public void testLookupLatestEusChannelForRhelVersionNoneFound() throws= Exception { // Create some base channels and corresponding entries in rhnRelea= seChannelMap: Channel base1 =3D ChannelFactoryTest.createBaseChannel(user); Channel base2 =3D ChannelFactoryTest.createBaseChannel(user); - ChannelManagerTest.createReleaseChannelMap(base1, TEST_OS, version= , = - release); - ChannelManagerTest.createReleaseChannelMap(base2, TEST_OS, version= , = - release2); + // Fake some EUS channels for RHEL 6, which should not appear in r= esults: + ChannelManagerTest.createReleaseChannelMap(base1, TEST_OS, "6Serve= r", + "6.0.0.0"); + ChannelManagerTest.createReleaseChannelMap(base2, TEST_OS, "6Serve= r", + "6.1.0.1"); = + // Should find nothing: EssentialChannelDto channel =3D ChannelManager. - lookupLatestEusChannelForRhelVersion(user, version, = + lookupLatestEusChannelForRhelVersion(user, "5Server", base1.getChannelArch().getId()); - assertEquals(base2.getId(), channel.getId()); + assertNull(channel); + } + + public void testEusReleaseCmpRhel4() { + EusReleaseComparator comparator =3D new EusReleaseComparator("4AS"= ); + assertEquals(0, comparator.compare("4.6", "4")); + assertEquals(0, comparator.compare("4.6", "4.2")); + assertEquals(1, comparator.compare("9", "8")); + assertEquals(-1, comparator.compare("8", "9")); + assertEquals(-1, comparator.compare("8.7", "9.5")); + assertEquals(-1, comparator.compare("8.7", "10.10")); + } + + public void testEusReleaseCmpRhel5() { + EusReleaseComparator comparator =3D new EusReleaseComparator("5Ser= ver"); + assertEquals(0, comparator.compare("5.3.0.1", "5.3.0.5")); + assertEquals(0, comparator.compare("5.3.0.1", "5.3.0.10")); + assertEquals(0, comparator.compare("5.3.0", "5.3.0")); + assertEquals(1, comparator.compare("5.3.1.1", "5.3.0.10")); + assertEquals(1, comparator.compare("5.4.1", "5.3.0.10")); + assertEquals(-1, comparator.compare("5.0.0.0", "5.3.0.3")); + assertEquals(-1, comparator.compare("5.0.9.0", "5.0.10.0")); + assertEquals(-1, comparator.compare("5.0.9.0", "5.0.10.0")); } = public void testIsChannelFree() throws Exception { @@ -685,9 +749,14 @@ public class ChannelManagerTest extends BaseTestCaseWi= thUser { } = public void testNormalizeRhelReleaseForMapping() { - assertEquals("5.0.0", ChannelManager.normalizeRhelReleaseForMappin= g("5.0.0.9")); - assertEquals("4.6", ChannelManager.normalizeRhelReleaseForMapping(= "4.6")); - assertEquals("3", ChannelManager.normalizeRhelReleaseForMapping("3= ")); + assertEquals("4", ChannelManager.normalizeRhelReleaseForMapping("4= AS", "4.6")); + assertEquals("4", ChannelManager.normalizeRhelReleaseForMapping("4= AS", "4.6.9")); + assertEquals("3", ChannelManager.normalizeRhelReleaseForMapping("4= AS", "3")); + + assertEquals("4.6.9", ChannelManager.normalizeRhelReleaseForMappin= g("5Server", + "4.6.9")); + assertEquals("5.0.0", ChannelManager.normalizeRhelReleaseForMappin= g("5Server", + "5.0.0.9")); } = public void testPackageSearch() { --===============1661319890903678897==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:39 2015 Content-Type: multipart/mixed; boundary="===============8367501399005658739==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Wed, 17 Jun 2009 16:37:05 +0000 Message-ID: <20090617163705.A66001202FA@lists.fedorahosted.org> --===============8367501399005658739== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml = | 33 -- java/code/src/com/redhat/rhn/frontend/dto/EssentialChannelDto.java = | 12 = java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java = | 111 +++++- java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java = | 163 +++++++--- 4 files changed, 207 insertions(+), 112 deletions(-) New commits: commit ac16f09d0e7c11e67bbe8b3961e70e54f3401e3f Author: Devan Goodwin Date: Wed Jun 17 12:06:54 2009 -0300 506296 - Repair EUS logic after removal of is_default column. = Losing this column has exposed several new and pre-existing issues, both with identifying default channels as well as severe problems with comparing the RHEL release, which is relied on more heavily now that the is_default column is gone. = Issues with comparing RHEL release include: - It is a "version" string comparison, i.e. 5.0.9 should be < 5.0.10, so a simple string compare will not work. - For RHEL 4 (only), release is usually something like "X" or possibly "X.Y", in this case we only want to compare based on "X". - For RHEL 5 and future releases, release is usually something like "W.X.Y.Z", and in this case we only want to compare based on "W.X.Y". diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_= queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel= _queries.xml index 5e9307b..11cdbd5 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml @@ -781,10 +781,11 @@ SELECT C.id, C.name, C.label, 1 AS IS_CUSTOM = - + select unique c.id, c.label, c.name, + rcm.release, 0 AS IS_CUSTOM from rhnChannelPermissions cp, @@ -794,12 +795,12 @@ SELECT C.id, C.name, C.label, 1 AS IS_CUSTOM rhnReleaseChannelMap rcm, rhnProductName pn where - rcm.release >=3D :release - and rcm.version =3D :version + rcm.version =3D :version and scac.server_arch_id =3D sa.id and sa.label =3D :server_arch and scac.channel_arch_id =3D rcm.channel_arch_id and rcm.channel_id =3D c.id + and cp.channel_id =3D c.id and cp.org_id =3D :org_id and pn.id =3D c.product_name_id and pn.label =3D :product_name_label @@ -809,29 +810,6 @@ SELECT C.id, C.name, C.label, 1 AS IS_CUSTOM = - - - select unique c.id, - c.label, - c.name, - 0 AS IS_CUSTOM - from - rhnChannelPermissions cp = - inner join rhnChannel c on cp.channel_id =3D c.id - inner join rhnReleaseChannelMap rcm on rcm.channel_id =3D c.i= d = - inner join rhnProductName pn on pn.id =3D c.product_name_id = - where - rcm.release =3D :release - and rcm.version =3D :version - and rcm.channel_arch_id =3D :channel_arch_id - and cp.org_id =3D :org_id - and pn.label =3D :product_name_label - and rhn_channel.loose_user_role_check(c.id, :user_id, - 'subscribe') =3D 1 - - - @@ -848,7 +826,8 @@ SELECT C.id, C.name, C.label, 1 AS IS_CUSTOM where rcm.version =3D :version and rcm.channel_arch_id =3D :channel_arch_id - and rcm.channel_id =3D c.id = + and rcm.channel_id =3D c.id + and cp.channel_id =3D c.id and cp.org_id =3D :org_id and pn.id =3D c.product_name_id and pn.label =3D :product_name_label diff --git a/java/code/src/com/redhat/rhn/frontend/dto/EssentialChannelDto.= java b/java/code/src/com/redhat/rhn/frontend/dto/EssentialChannelDto.java index a0c327d..f7e1b84 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/EssentialChannelDto.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/EssentialChannelDto.java @@ -21,8 +21,7 @@ import com.redhat.rhn.domain.channel.Channel; * EssentialChannelDto * @version $Rev$ */ -public class EssentialChannelDto extends BaseDto = - implements Comparable { +public class EssentialChannelDto extends BaseDto { = private Long id; private Long ownerId; @@ -151,13 +150,4 @@ public class EssentialChannelDto extends BaseDto this.ownerId =3D ownerIdIn; } = - /** - * compare to another EssentialChannelDto - * @param o the other object - * @return the compare - */ - public int compareTo(EssentialChannelDto o) { - return this.getRelease().compareTo(o.getRelease()); - } - } diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.ja= va b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java index 7c55ef7..5bc0da0 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -98,6 +98,15 @@ public class ChannelManager extends BaseManager { public static final String QRY_ROLE_MANAGE =3D "manage"; public static final String QRY_ROLE_SUBSCRIBE =3D "subscribe"; = + // Valid RHEL 4 EUS Channel Versions (from rhnReleaseChannelMap): + public static final Set RHEL4_EUS_VERSIONS; + static { + RHEL4_EUS_VERSIONS =3D new HashSet(); + RHEL4_EUS_VERSIONS.add("4AS"); + RHEL4_EUS_VERSIONS.add("4ES"); + } + + // Product name (also sometimes referred to as OS) is unfortunately ve= ry // convoluted. For RHEL, in rhnDistChannelMap is appears as "Red Hat L= inux", in // rhnReleaseChannelMap it is "RHEL AS", and in rhnProductName it's la= bel is "rhel". @@ -255,8 +264,6 @@ public class ChannelManager extends BaseManager { return ret; } = - = - = /** * Returns a list channel entitlements for all orgs. * @param pc The PageControl @@ -1689,11 +1696,33 @@ public class ChannelManager extends BaseManager { * Convert redhat-release release values to those that are stored in t= he * rhnReleaseChannelMap table. * - * @param originalRelease Original package evr release. + * RHEL 4 release samples: 7.6, 8, 9 + * RHEL 5 release samples: 5.1.0.1, 5.2.0.2, 5.3.0.3 + * + * RHEL 4 must be treated specially, if the release is X.Y, we only wi= sh to look at + * the X portion. + * + * For RHEL 5 and presumably all future releases, we only look at the = W.X.Y portion of + * W.X.Y.Z. + * + * @param rhelVersion RHEL version we're comparing release for. (5Serv= er, 4AS, 4ES) + * @param originalRelease Original package release. * @return Release version for rhnReleaseChannelMap. */ - public static String normalizeRhelReleaseForMapping(String originalRel= ease) { + public static String normalizeRhelReleaseForMapping(String rhelVersion, + String originalRelease) { + String [] tokens =3D originalRelease.split("\\."); + + if (RHEL4_EUS_VERSIONS.contains(rhelVersion)) { + if (tokens.length <=3D 1) { + return originalRelease; + } + else { + return tokens[0]; + } + } + if (tokens.length <=3D 3) { return originalRelease; } @@ -1952,8 +1981,6 @@ public class ChannelManager extends BaseManager { return false; } = - log.debug("isDefaultBaseChannel()"); - log.debug(" version =3D " + version); Channel defaultBaseChan =3D getDefaultBaseChannel(version, = baseChan.getChannelArch()); if (defaultBaseChan =3D=3D null) { @@ -2114,10 +2141,11 @@ public class ChannelManager extends BaseManager { // that ALL entries in that table for the product/version/chan= nel arch // are valid replacement base channels: if (isDefaultBaseChannel(inChan, version)) { + log.debug("inChan is default base channel"); EssentialChannelDto latestEus =3D lookupLatestEusChannelFo= rRhelVersion(u, = version, inChan.getChannelArch().getId()); if (latestEus !=3D null) { - log.debug("inChan is default channel, including latest= EUS channel: " + = + log.debug("Including latest EUS channel: " + latestEus.getLabel()); eusBaseChans.add(latestEus); } @@ -2139,8 +2167,11 @@ public class ChannelManager extends BaseManager { // First make sure to add the default base channel, EUS sy= stems should // always be able to upgrade to the mainline RHEL release = for their = // version: + log.debug("Looking up default base channel for:"); + log.debug(" version =3D " + version); + log.debug(" channelArch =3D " + channelArch); Channel defaultBaseChan =3D getDefaultBaseChannel(version,= channelArch); - log.debug("Adding default base channel: " + defaultBaseCha= n.getLabel()); + log.debug("Adding default base channel: " + defaultBaseCha= n); retval.add(channelToEssentialChannelDto(defaultBaseChan, f= alse)); = eusBaseChans =3D listBaseEusChannelsByVersionReleaseAndCha= nnelArch( @@ -2211,6 +2242,10 @@ public class ChannelManager extends BaseManager { * Lookup the EUS base channels suitable for the given version, releas= e, and = * server arch. * = + * NOTE: Release not actually used in the database query, must filter = manually + * in application code due to some very specific requirements on how i= t must + * be compared. See normalizeRhelReleaseForMapping for more info. + * * @param user User performing the query. * @param version RHEL version. * @param release RHEL version release. @@ -2220,32 +2255,45 @@ public class ChannelManager extends BaseManager { public static List = listBaseEusChannelsByVersionReleaseAndServerArch(User user, = String version, String release, String serverArch) { - = + log.debug("listBaseEusChannelsByVersionReleaseAndServerArch()"); + log.debug(" version =3D " + version); + log.debug(" release =3D " + release); + log.debug(" serverArch =3D " + serverArch); SelectMode m =3D ModeFactory.getMode("Channel_queries", = "base_eus_channels_by_version_release_server_arch"); - release =3D normalizeRhelReleaseForMapping(release); Map params =3D new HashMap(); params.put("user_id", user.getId()); params.put("org_id", user.getOrg().getId()); - log.debug(" version =3D " + version); - log.debug(" release =3D " + release); - log.debug(" serverArch =3D " + serverArch); params.put("product_name_label", RHEL_PRODUCT_NAME); params.put("version", version); - params.put("release", release); params.put("server_arch", serverArch); - DataResult dr =3D makeDataResult(params, new HashMap(), null, m); - return dr; + DataResult dr =3D makeDataResult(params, new= HashMap(), + null, m); + + List result =3D new LinkedList(); + EusReleaseComparator comparator =3D new EusReleaseComparator(versi= on); + for (EssentialChannelDto dto : dr) { + log.debug(dto.getId()); + if (comparator.compare(dto.getRelease(), release) >=3D 0) { + result.add(dto); + } + } + + return result; } = /** * Lookup the EUS base channels suitable for the given version, releas= e, and = * channel arch. * = + * NOTE: Release not actually used in the database query, must filter = manually + * in application code due to some very specific requirements on how i= t must + * be compared. See normalizeRhelReleaseForMapping for more info. + * * @param user User performing the query. * @param version RHEL version. - * @param release RHEL version release. + * @param release RHEL release. * @param channelArchId Channel arch. * @return List of EssentialChannelDto's. */ @@ -2255,8 +2303,7 @@ public class ChannelManager extends BaseManager { = log.debug("listBaseEusChannelsByVersionReleaseAndChannelArch()"); SelectMode m =3D ModeFactory.getMode("Channel_queries", = - "base_eus_channels_by_version_release_channel_arch"); - release =3D normalizeRhelReleaseForMapping(release); + "base_eus_channels_by_version_channel_arch"); Map params =3D new HashMap(); params.put("user_id", user.getId()); params.put("org_id", user.getOrg().getId()); @@ -2265,16 +2312,25 @@ public class ChannelManager extends BaseManager { log.debug(" channelArch =3D " + channelArchId); params.put("product_name_label", RHEL_PRODUCT_NAME); params.put("version", version); - params.put("release", release); params.put("channel_arch_id", channelArchId); - DataResult dr =3D makeDataResult(params, new HashMap(), null, m); - return dr; + DataResult dr =3D makeDataResult(params, new= HashMap(), + null, m); + + List result =3D new LinkedList(); + EusReleaseComparator comparator =3D new EusReleaseComparator(versi= on); + for (EssentialChannelDto dto : dr) { + if (comparator.compare(dto.getRelease(), release) > 0) { + result.add(dto); + } + } + + return result; } = /** - * Lookup the latest EUS base channel for the given version and server= arch. Uses the - * is_default column of rhnReleaseChannelMap to locate the latest rele= ase. If no - * entry exists, null will be returned. + * Lookup the latest EUS base channel for the given version and server= arch. + * + * Sorts based on the release column. null will be returned if none fo= und. * = * @param user User performing the query. * @param rhelVersion RHEL version. @@ -2296,11 +2352,12 @@ public class ChannelManager extends BaseManager { params.put("product_name_label", RHEL_PRODUCT_NAME); params.put("version", rhelVersion); params.put("channel_arch_id", channelArchId); - DataResult dr =3D makeDataResult(params, new HashMap(), null, m); + DataResult dr =3D makeDataResult(params, new= HashMap(), + null, m); if (dr.size() =3D=3D 0) { return null; } - Collections.sort(dr); + Collections.sort(dr, new EusReleaseComparator(rhelVersion)); return (EssentialChannelDto) dr.get(dr.size() - 1); } = diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManag= erTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelMana= gerTest.java index b056d92..f7a496f 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java +++ b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java @@ -48,6 +48,7 @@ import com.redhat.rhn.frontend.dto.SystemsPerChannelDto; import com.redhat.rhn.frontend.xmlrpc.NoSuchChannelException; import com.redhat.rhn.manager.channel.ChannelEntitlementCounter; import com.redhat.rhn.manager.channel.ChannelManager; +import com.redhat.rhn.manager.channel.EusReleaseComparator; import com.redhat.rhn.manager.channel.MultipleChannelsWithPackageException; import com.redhat.rhn.manager.entitlement.EntitlementManager; import com.redhat.rhn.manager.errata.ErrataManager; @@ -403,73 +404,136 @@ public class ChannelManagerTest extends BaseTestCase= WithUser { } = public void testListBaseEusChannelsByVersionReleaseAndChannelArch() th= rows Exception { - Server s =3D ServerTestUtils.createTestSystem(user); String version =3D "5Server"; - String release =3D "5.0.0"; - = - s =3D ServerTestUtils.addRedhatReleasePackageToServer(user, s, ver= sion, release); = // Create some base channels and corresponding entries in rhnRelea= seChannelMap: - Channel base1 =3D ChannelFactoryTest.createBaseChannel(user); - Channel base2 =3D ChannelFactoryTest.createBaseChannel(user); + Channel rhel50 =3D ChannelFactoryTest.createBaseChannel(user); + Channel rhel51 =3D ChannelFactoryTest.createBaseChannel(user); + Channel rhel52 =3D ChannelFactoryTest.createBaseChannel(user); + Channel rhel53 =3D ChannelFactoryTest.createBaseChannel(user); + Channel rhel6 =3D ChannelFactoryTest.createBaseChannel(user); + Channel rhel4 =3D ChannelFactoryTest.createBaseChannel(user); ChannelFactoryTest.createBaseChannel(user); = - ChannelManagerTest.createReleaseChannelMap(base1, = - ChannelManager.RHEL_PRODUCT_NAME, version, "5.0.1"); - ChannelManagerTest.createReleaseChannelMap(base2, = - ChannelManager.RHEL_PRODUCT_NAME, version, "5.0.2"); - = + ChannelManagerTest.createReleaseChannelMap(rhel50, + ChannelManager.RHEL_PRODUCT_NAME, version, "5.0.0.0"); + ChannelManagerTest.createReleaseChannelMap(rhel51, + ChannelManager.RHEL_PRODUCT_NAME, version, "5.1.0.1"); + ChannelManagerTest.createReleaseChannelMap(rhel52, + ChannelManager.RHEL_PRODUCT_NAME, version, "5.2.0.2"); + ChannelManagerTest.createReleaseChannelMap(rhel53, + ChannelManager.RHEL_PRODUCT_NAME, version, "5.3.0.3"); + ChannelManagerTest.createReleaseChannelMap(rhel6, + ChannelManager.RHEL_PRODUCT_NAME, "6Server", "6.0.0.0"); + ChannelManagerTest.createReleaseChannelMap(rhel4, + ChannelManager.RHEL_PRODUCT_NAME, "4AS", "4.6.0"); + + // For a system with 5.0 already, they should only see RHEL 5 EUS = channels + // with a higher or equal release. List channels =3D ChannelManager. - listBaseEusChannelsByVersionReleaseAndChannelArch(user, versio= n, release, = - base1.getChannelArch().getId()); + listBaseEusChannelsByVersionReleaseAndChannelArch(user, versio= n, "5.1.0.1", + rhel51.getChannelArch().getId()); assertTrue(channels.size() >=3D 2); + + Set returnedIds =3D new HashSet(); + for (EssentialChannelDto c : channels) { + returnedIds.add(c.getId()); + } + + assertFalse(returnedIds.contains(rhel50.getId())); + assertFalse(returnedIds.contains(rhel51.getId())); + assertTrue(returnedIds.contains(rhel52.getId())); + assertTrue(returnedIds.contains(rhel53.getId())); + assertFalse(returnedIds.contains(rhel6.getId())); + assertFalse(returnedIds.contains(rhel4.getId())); } = - public void testLookupLatestEusChannelForRhelVersion() throws Exceptio= n { - Server s =3D ServerTestUtils.createTestSystem(user); - String version =3D "5Server"; - String release =3D "5.0.0"; - String release2 =3D "5.0.1"; - = - s =3D ServerTestUtils.addRedhatReleasePackageToServer(user, s, ver= sion, release); + public void testLookupLatestEusChannelForRhel5() throws Exception { + String el5version =3D "5Server"; + String release500 =3D "5.0.0"; + String release520 =3D "5.2.0.2"; + String release530 =3D "5.3.0.3"; = // Create some base channels and corresponding entries in rhnRelea= seChannelMap: - Channel base1 =3D ChannelFactoryTest.createBaseChannel(user); - Channel base2 =3D ChannelFactoryTest.createBaseChannel(user); - // not sure why we create this third one, but I'll leave it here. - // jesusr 2007/11/15 - ChannelFactoryTest.createBaseChannel(user); - ChannelManagerTest.createReleaseChannelMap(base1, = - ChannelManager.RHEL_PRODUCT_NAME, version, release); - ChannelManagerTest.createReleaseChannelMap(base2, = - ChannelManager.RHEL_PRODUCT_NAME, version, release2); + Channel rhel500Chan =3D ChannelFactoryTest.createBaseChannel(user); + Channel rhel530Chan =3D ChannelFactoryTest.createBaseChannel(user); + Channel rhel520Chan =3D ChannelFactoryTest.createBaseChannel(user); + + // Creating these in a random order to make sure most recent isn't= also + // most recently created and accidentally getting returned. + ChannelManagerTest.createReleaseChannelMap(rhel500Chan, + ChannelManager.RHEL_PRODUCT_NAME, el5version, release500); + ChannelManagerTest.createReleaseChannelMap(rhel530Chan, + ChannelManager.RHEL_PRODUCT_NAME, el5version, release530); + ChannelManagerTest.createReleaseChannelMap(rhel520Chan, + ChannelManager.RHEL_PRODUCT_NAME, el5version, release520); = EssentialChannelDto channel =3D ChannelManager. - lookupLatestEusChannelForRhelVersion(user, version, = - base1.getChannelArch().getId()); - assertEquals(base2.getId().longValue(), channel.getId().longValue(= )); + lookupLatestEusChannelForRhelVersion(user, el5version, + rhel500Chan.getChannelArch().getId()); + assertEquals(rhel530Chan.getId().longValue(), channel.getId().long= Value()); } = - public void testLookupLatestEusChannelForRhelVersionNoneFound() throws= Exception { - Server s =3D ServerTestUtils.createTestSystem(user); - String version =3D "5Server"; - String release =3D "5.0.0"; - String release2 =3D "5.0.1"; + // Test the problem with string version comparisons is being handled: + public void testLookupLatestEusChannelForRhel5WeirdVersionCompare() th= rows Exception { + String el5version =3D "5Server"; + String release5310 =3D "5.3.10.0"; // should appear as most recent + String release539 =3D "5.3.9.0"; = - s =3D ServerTestUtils.addRedhatReleasePackageToServer(user, s, ver= sion, release); + // Create some base channels and corresponding entries in rhnRelea= seChannelMap: + Channel rhel5310Chan =3D ChannelFactoryTest.createBaseChannel(user= ); + Channel rhel539Chan =3D ChannelFactoryTest.createBaseChannel(user); + + // Creating these in a random order to make sure most recent isn't= also + // most recently created and accidentally getting returned. + ChannelManagerTest.createReleaseChannelMap(rhel5310Chan, + ChannelManager.RHEL_PRODUCT_NAME, el5version, release5310); + ChannelManagerTest.createReleaseChannelMap(rhel539Chan, + ChannelManager.RHEL_PRODUCT_NAME, el5version, release539); = + EssentialChannelDto channel =3D ChannelManager. + lookupLatestEusChannelForRhelVersion(user, el5version, + rhel5310Chan.getChannelArch().getId()); + assertEquals(rhel5310Chan.getId().longValue(), channel.getId().lon= gValue()); + } + + public void testLookupLatestEusChannelForRhelVersionNoneFound() throws= Exception { // Create some base channels and corresponding entries in rhnRelea= seChannelMap: Channel base1 =3D ChannelFactoryTest.createBaseChannel(user); Channel base2 =3D ChannelFactoryTest.createBaseChannel(user); - ChannelManagerTest.createReleaseChannelMap(base1, TEST_OS, version= , = - release); - ChannelManagerTest.createReleaseChannelMap(base2, TEST_OS, version= , = - release2); + // Fake some EUS channels for RHEL 6, which should not appear in r= esults: + ChannelManagerTest.createReleaseChannelMap(base1, TEST_OS, "6Serve= r", + "6.0.0.0"); + ChannelManagerTest.createReleaseChannelMap(base2, TEST_OS, "6Serve= r", + "6.1.0.1"); = + // Should find nothing: EssentialChannelDto channel =3D ChannelManager. - lookupLatestEusChannelForRhelVersion(user, version, = + lookupLatestEusChannelForRhelVersion(user, "5Server", base1.getChannelArch().getId()); - assertEquals(base2.getId(), channel.getId()); + assertNull(channel); + } + + public void testEusReleaseCmpRhel4() { + EusReleaseComparator comparator =3D new EusReleaseComparator("4AS"= ); + assertEquals(0, comparator.compare("4.6", "4")); + assertEquals(0, comparator.compare("4.6", "4.2")); + assertEquals(1, comparator.compare("9", "8")); + assertEquals(-1, comparator.compare("8", "9")); + assertEquals(-1, comparator.compare("8.7", "9.5")); + assertEquals(-1, comparator.compare("8.7", "10.10")); + } + + public void testEusReleaseCmpRhel5() { + EusReleaseComparator comparator =3D new EusReleaseComparator("5Ser= ver"); + assertEquals(0, comparator.compare("5.3.0.1", "5.3.0.5")); + assertEquals(0, comparator.compare("5.3.0.1", "5.3.0.10")); + assertEquals(0, comparator.compare("5.3.0", "5.3.0")); + assertEquals(1, comparator.compare("5.3.1.1", "5.3.0.10")); + assertEquals(1, comparator.compare("5.4.1", "5.3.0.10")); + assertEquals(-1, comparator.compare("5.0.0.0", "5.3.0.3")); + assertEquals(-1, comparator.compare("5.0.9.0", "5.0.10.0")); + assertEquals(-1, comparator.compare("5.0.9.0", "5.0.10.0")); } = public void testIsChannelFree() throws Exception { @@ -685,9 +749,14 @@ public class ChannelManagerTest extends BaseTestCaseWi= thUser { } = public void testNormalizeRhelReleaseForMapping() { - assertEquals("5.0.0", ChannelManager.normalizeRhelReleaseForMappin= g("5.0.0.9")); - assertEquals("4.6", ChannelManager.normalizeRhelReleaseForMapping(= "4.6")); - assertEquals("3", ChannelManager.normalizeRhelReleaseForMapping("3= ")); + assertEquals("4", ChannelManager.normalizeRhelReleaseForMapping("4= AS", "4.6")); + assertEquals("4", ChannelManager.normalizeRhelReleaseForMapping("4= AS", "4.6.9")); + assertEquals("3", ChannelManager.normalizeRhelReleaseForMapping("4= AS", "3")); + + assertEquals("4.6.9", ChannelManager.normalizeRhelReleaseForMappin= g("5Server", + "4.6.9")); + assertEquals("5.0.0", ChannelManager.normalizeRhelReleaseForMappin= g("5Server", + "5.0.0.9")); } = public void testPackageSearch() { --===============8367501399005658739==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:39 2015 Content-Type: multipart/mixed; boundary="===============6496203671266899213==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Wed, 17 Jun 2009 16:58:45 +0000 Message-ID: <20090617165845.0A3B41202FA@lists.fedorahosted.org> --===============6496203671266899213== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml = | 38 ++++++++++ java/code/src/com/redhat/rhn/frontend/action/SearchAction.java = | 2 = java/code/src/com/redhat/rhn/frontend/action/channel/PackageNameOverviewAc= tion.java | 19 ++++- java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.j= ava | 3 = java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java = | 24 ++++++ java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp = | 2 = java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.jsp = | 1 = 7 files changed, 85 insertions(+), 4 deletions(-) New commits: commit f8fa6418f879f21050a6478da18180363a51cf77 Author: John Matthews Date: Wed Jun 17 12:49:12 2009 -0400 506492, 506139 - PackageSearch default quick search to searching all ar= ches & fix no result if systems aren't registered Also relates to 504804, prior to change, if searching on a channel whic= h was not part of a channel with a subscribed system, we would get back no results on the packages/NameOverview.do pa= ge. diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_= queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package= _queries.xml index cbf3315..14459dd 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries= .xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries= .xml @@ -1581,6 +1581,44 @@ ORDER BY CHANNEL_NAME DESC, EVR DESC = + + + + +SELECT NVREA, PACKAGE_ID, CHANNEL_NAME, CHANNEL_ID + FROM (SELECT DISTINCT + PE.evr AS EVR, + PN.name || '-' || PE.evr.as_vre_simple() || '.' || PA.label= AS NVREA, + C.name AS CHANNEL_NAME, + P.ID AS PACKAGE_ID, + C.id AS CHANNEL_ID + FROM rhnPackageArch PA, + rhnChannel C, + rhnPackageName PN, + rhnPackageEVR PE, + rhnPackage P, + rhnChannelPackage CP, + rhnAvailableChannels AC + WHERE AC.org_id =3D :org_id + AND PN.name =3D :package_name + AND CP.channel_id =3D :channel_id + AND PN.id =3D P.name_id + AND PE.id =3D P.evr_id + AND AC.channel_id =3D CP.channel_id + AND P.id =3D CP.package_id + AND C.id =3D AC.channel_id + AND PA.id =3D P.package_arch_id + ) +ORDER BY CHANNEL_NAME DESC, EVR DESC + + + + + + SELECT P.id AS ID, diff --git a/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java= b/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java index 317d68d..1bb28e8 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java @@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action; import com.redhat.rhn.common.util.ServletUtils; import com.redhat.rhn.domain.org.OrgFactory; import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.action.channel.PackageSearchAction; import com.redhat.rhn.frontend.action.common.BadParameterException; import com.redhat.rhn.frontend.action.systems.SystemSearchSetupAction; import com.redhat.rhn.frontend.struts.RequestContext; @@ -98,6 +99,7 @@ public class SearchAction extends RhnAction { HashMap attributes =3D new HashMap(); attributes.put("view_mode", "search_name_and_summary"); attributes.put(SystemSearchSetupAction.SEARCH_STRING, sear= chString); + attributes.put(PackageSearchAction.WHERE_CRITERIA, "archit= ecture"); = // select all the arches to make a better search List defaultArches =3D new ArrayList(); diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageNa= meOverviewAction.java b/java/code/src/com/redhat/rhn/frontend/action/channe= l/PackageNameOverviewAction.java index 29804be..779c3d7 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageNameOverv= iewAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageNameOverv= iewAction.java @@ -21,6 +21,7 @@ import com.redhat.rhn.frontend.taglibs.list.ListTagHelper; import com.redhat.rhn.manager.rhnpackage.PackageManager; = import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; @@ -37,12 +38,14 @@ import javax.servlet.http.HttpServletResponse; * @version $Rev$ */ public class PackageNameOverviewAction extends RhnAction { + private static Logger log =3D Logger.getLogger(PackageNameOverviewActi= on.class); = /** {@inheritDoc} */ public ActionForward execute(ActionMapping mapping, ActionForm form, = HttpServletRequest request, HttpServletResponse response) { String pkgName =3D request.getParameter("package_name"); String subscribedChannels =3D request.getParameter("search_subscri= bed_channels"); + String channelFilter =3D request.getParameter("channel_filter"); String[] channelArches =3D request.getParameterValues("channel_arc= h"); request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestU= RI()); = @@ -50,10 +53,24 @@ public class PackageNameOverviewAction extends RhnActio= n { User user =3D ctx.getLoggedInUser(); = List dr =3D Collections.EMPTY_LIST; - if (!StringUtils.isEmpty(subscribedChannels)) { + if (StringUtils.equals(subscribedChannels, "yes")) { dr =3D PackageManager.lookupPackageNameOverview( user.getOrg(), pkgName); } + else if (!StringUtils.isEmpty(channelFilter) && + StringUtils.equals(subscribedChannels, "no") && + channelArches =3D=3D null) { + Long filterChannelId =3D null; + try { + filterChannelId =3D Long.parseLong(channelFilter); + dr =3D PackageManager.lookupPackageNameOverviewInChannel(u= ser.getOrg(), + pkgName, filterChannelId); + } + catch (NumberFormatException e) { + log.warn("Exception caught, unable to parse channel ID: " = + channelFilter); + dr =3D Collections.EMPTY_LIST; + } + } else if (channelArches !=3D null && channelArches.length > 0) { dr =3D PackageManager.lookupPackageNameOverview( user.getOrg(), pkgName, channelArches); diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSe= archAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/Pack= ageSearchAction.java index ef6be3a..d553c0a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAct= ion.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAct= ion.java @@ -63,6 +63,7 @@ public class PackageSearchAction extends RhnAction { "channel-alpha", "channel-iSeries", "channel-pSeries"= }; + public static final String WHERE_CRITERIA =3D "whereCriteria"; = /** {@inheritDoc} */ public ActionForward execute(ActionMapping mapping, ActionForm formIn, = @@ -161,7 +162,7 @@ public class PackageSearchAction extends RhnAction { RequestContext ctx =3D new RequestContext(request); String searchString =3D form.getString("search_string"); String viewmode =3D form.getString("view_mode"); - String searchCriteria =3D request.getParameter("whereCriteria"); + String searchCriteria =3D request.getParameter(WHERE_CRITERIA); String[] selectedArches =3D null; Long filterChannelId =3D null; boolean relevantFlag =3D false; diff --git a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager= .java b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java index 6e7851c..79a3fc3 100644 --- a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java +++ b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java @@ -931,7 +931,29 @@ public class PackageManager extends BaseManager { return m.execute(params); } } - = + + /** + * Returns package metadata for all packages named 'packageName' and e= xist + * in passed in channelID if the ORG has access.. + * @param org The users Org. + * @param packageName Name of package being sought. + * @param channelID Id of the channel to lookup package in + * + * @return package metadata for all packages named 'packageName' and e= xist + * in the channels which which the orgId is subscribed. + */ + public static DataResult lookupPackageNameOverviewInChannel(Org org, S= tring packageName, + Long channelID) { + Map params =3D new HashMap(); + params.put("org_id", org.getId()); + params.put("package_name", packageName); + params.put("channel_id", channelID); + + SelectMode m =3D ModeFactory.getMode( + "Package_queries", "packages_by_name_cid"); + return m.execute(params); + } + /** * list patch sets for a specific channel * @param cid the channel id diff --git a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp b/jav= a/code/webapp/WEB-INF/pages/channel/packagesearch.jsp index ed50a22..4d1aa5a 100644 --- a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp @@ -104,7 +104,7 @@ filter=3D"com.redhat.rhn.frontend.action.channel.PackageNameF= ilter"> - + ${current.packageName} diff --git a/java/code/webapp/WEB-INF/pages/software/packages/packagenameov= erview.jsp b/java/code/webapp/WEB-INF/pages/software/packages/packagenameov= erview.jsp index 03f39c5..96ae3e4 100644 --- a/java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.= jsp +++ b/java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.= jsp @@ -40,6 +40,7 @@ + --===============6496203671266899213==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:39 2015 Content-Type: multipart/mixed; boundary="===============2093849770452518598==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Wed, 17 Jun 2009 16:59:27 +0000 Message-ID: <20090617165927.0CF291202FA@lists.fedorahosted.org> --===============2093849770452518598== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml = | 38 ++++++++++ java/code/src/com/redhat/rhn/frontend/action/SearchAction.java = | 2 = java/code/src/com/redhat/rhn/frontend/action/channel/PackageNameOverviewAc= tion.java | 19 ++++- java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.j= ava | 3 = java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java = | 24 ++++++ java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp = | 2 = java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.jsp = | 1 = 7 files changed, 85 insertions(+), 4 deletions(-) New commits: commit cb6d4fb4d55283dc4a38cc9db1d89598cd41113e Author: John Matthews Date: Wed Jun 17 12:49:12 2009 -0400 506492, 506139 - PackageSearch default quick search to searching all ar= ches & fix no result if systems aren't registered Also relates to 504804, prior to change, if searching on a channel whic= h was not part of a channel with a subscribed system, we would get back no results on the packages/NameOverview.do pa= ge. diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_= queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package= _queries.xml index cbf3315..14459dd 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries= .xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries= .xml @@ -1581,6 +1581,44 @@ ORDER BY CHANNEL_NAME DESC, EVR DESC = + + + + +SELECT NVREA, PACKAGE_ID, CHANNEL_NAME, CHANNEL_ID + FROM (SELECT DISTINCT + PE.evr AS EVR, + PN.name || '-' || PE.evr.as_vre_simple() || '.' || PA.label= AS NVREA, + C.name AS CHANNEL_NAME, + P.ID AS PACKAGE_ID, + C.id AS CHANNEL_ID + FROM rhnPackageArch PA, + rhnChannel C, + rhnPackageName PN, + rhnPackageEVR PE, + rhnPackage P, + rhnChannelPackage CP, + rhnAvailableChannels AC + WHERE AC.org_id =3D :org_id + AND PN.name =3D :package_name + AND CP.channel_id =3D :channel_id + AND PN.id =3D P.name_id + AND PE.id =3D P.evr_id + AND AC.channel_id =3D CP.channel_id + AND P.id =3D CP.package_id + AND C.id =3D AC.channel_id + AND PA.id =3D P.package_arch_id + ) +ORDER BY CHANNEL_NAME DESC, EVR DESC + + + + + + SELECT P.id AS ID, diff --git a/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java= b/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java index 317d68d..1bb28e8 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java @@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action; import com.redhat.rhn.common.util.ServletUtils; import com.redhat.rhn.domain.org.OrgFactory; import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.action.channel.PackageSearchAction; import com.redhat.rhn.frontend.action.common.BadParameterException; import com.redhat.rhn.frontend.action.systems.SystemSearchSetupAction; import com.redhat.rhn.frontend.struts.RequestContext; @@ -98,6 +99,7 @@ public class SearchAction extends RhnAction { HashMap attributes =3D new HashMap(); attributes.put("view_mode", "search_name_and_summary"); attributes.put(SystemSearchSetupAction.SEARCH_STRING, sear= chString); + attributes.put(PackageSearchAction.WHERE_CRITERIA, "archit= ecture"); = // select all the arches to make a better search List defaultArches =3D new ArrayList(); diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageNa= meOverviewAction.java b/java/code/src/com/redhat/rhn/frontend/action/channe= l/PackageNameOverviewAction.java index 29804be..779c3d7 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageNameOverv= iewAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageNameOverv= iewAction.java @@ -21,6 +21,7 @@ import com.redhat.rhn.frontend.taglibs.list.ListTagHelper; import com.redhat.rhn.manager.rhnpackage.PackageManager; = import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; @@ -37,12 +38,14 @@ import javax.servlet.http.HttpServletResponse; * @version $Rev$ */ public class PackageNameOverviewAction extends RhnAction { + private static Logger log =3D Logger.getLogger(PackageNameOverviewActi= on.class); = /** {@inheritDoc} */ public ActionForward execute(ActionMapping mapping, ActionForm form, = HttpServletRequest request, HttpServletResponse response) { String pkgName =3D request.getParameter("package_name"); String subscribedChannels =3D request.getParameter("search_subscri= bed_channels"); + String channelFilter =3D request.getParameter("channel_filter"); String[] channelArches =3D request.getParameterValues("channel_arc= h"); request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestU= RI()); = @@ -50,10 +53,24 @@ public class PackageNameOverviewAction extends RhnActio= n { User user =3D ctx.getLoggedInUser(); = List dr =3D Collections.EMPTY_LIST; - if (!StringUtils.isEmpty(subscribedChannels)) { + if (StringUtils.equals(subscribedChannels, "yes")) { dr =3D PackageManager.lookupPackageNameOverview( user.getOrg(), pkgName); } + else if (!StringUtils.isEmpty(channelFilter) && + StringUtils.equals(subscribedChannels, "no") && + channelArches =3D=3D null) { + Long filterChannelId =3D null; + try { + filterChannelId =3D Long.parseLong(channelFilter); + dr =3D PackageManager.lookupPackageNameOverviewInChannel(u= ser.getOrg(), + pkgName, filterChannelId); + } + catch (NumberFormatException e) { + log.warn("Exception caught, unable to parse channel ID: " = + channelFilter); + dr =3D Collections.EMPTY_LIST; + } + } else if (channelArches !=3D null && channelArches.length > 0) { dr =3D PackageManager.lookupPackageNameOverview( user.getOrg(), pkgName, channelArches); diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSe= archAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/Pack= ageSearchAction.java index ef6be3a..d553c0a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAct= ion.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAct= ion.java @@ -63,6 +63,7 @@ public class PackageSearchAction extends RhnAction { "channel-alpha", "channel-iSeries", "channel-pSeries"= }; + public static final String WHERE_CRITERIA =3D "whereCriteria"; = /** {@inheritDoc} */ public ActionForward execute(ActionMapping mapping, ActionForm formIn, = @@ -161,7 +162,7 @@ public class PackageSearchAction extends RhnAction { RequestContext ctx =3D new RequestContext(request); String searchString =3D form.getString("search_string"); String viewmode =3D form.getString("view_mode"); - String searchCriteria =3D request.getParameter("whereCriteria"); + String searchCriteria =3D request.getParameter(WHERE_CRITERIA); String[] selectedArches =3D null; Long filterChannelId =3D null; boolean relevantFlag =3D false; diff --git a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager= .java b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java index 6e7851c..79a3fc3 100644 --- a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java +++ b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java @@ -931,7 +931,29 @@ public class PackageManager extends BaseManager { return m.execute(params); } } - = + + /** + * Returns package metadata for all packages named 'packageName' and e= xist + * in passed in channelID if the ORG has access.. + * @param org The users Org. + * @param packageName Name of package being sought. + * @param channelID Id of the channel to lookup package in + * + * @return package metadata for all packages named 'packageName' and e= xist + * in the channels which which the orgId is subscribed. + */ + public static DataResult lookupPackageNameOverviewInChannel(Org org, S= tring packageName, + Long channelID) { + Map params =3D new HashMap(); + params.put("org_id", org.getId()); + params.put("package_name", packageName); + params.put("channel_id", channelID); + + SelectMode m =3D ModeFactory.getMode( + "Package_queries", "packages_by_name_cid"); + return m.execute(params); + } + /** * list patch sets for a specific channel * @param cid the channel id diff --git a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp b/jav= a/code/webapp/WEB-INF/pages/channel/packagesearch.jsp index ed50a22..4d1aa5a 100644 --- a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp @@ -104,7 +104,7 @@ filter=3D"com.redhat.rhn.frontend.action.channel.PackageNameF= ilter"> - + ${current.packageName} diff --git a/java/code/webapp/WEB-INF/pages/software/packages/packagenameov= erview.jsp b/java/code/webapp/WEB-INF/pages/software/packages/packagenameov= erview.jsp index 03f39c5..96ae3e4 100644 --- a/java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.= jsp +++ b/java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.= jsp @@ -40,6 +40,7 @@ + --===============2093849770452518598==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:39 2015 Content-Type: multipart/mixed; boundary="===============0431610140099526064==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Wed, 17 Jun 2009 18:26:56 +0000 Message-ID: <20090617182656.731BD1202FA@lists.fedorahosted.org> --===============0431610140099526064== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/channel/EusReleaseComparator.java | = 84 ++++++++++ 1 file changed, 84 insertions(+) New commits: commit adf8ac4c332f93002be3667884193772099c9388 Author: Devan Goodwin Date: Wed Jun 17 15:25:26 2009 -0300 Adding missed EusReleaseComparator file. diff --git a/java/code/src/com/redhat/rhn/manager/channel/EusReleaseCompara= tor.java b/java/code/src/com/redhat/rhn/manager/channel/EusReleaseComparato= r.java new file mode 100644 index 0000000..f8517c6 --- /dev/null +++ b/java/code/src/com/redhat/rhn/manager/channel/EusReleaseComparator.java @@ -0,0 +1,84 @@ +/** + * Copyright (c) 2009 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.manager.channel; + +import com.redhat.rhn.common.util.RpmVersionComparator; + +import com.redhat.rhn.frontend.dto.EssentialChannelDto; + +import java.util.Comparator; + +import org.apache.commons.lang.StringUtils; + +/** + * EusReleaseComparator + * + * Compare two RHEL releases, where the behavior can differ depending on w= hich version + * of RHEL we're dealing with. (RHEL 4 in particular needs special attenti= on.) + * + * "Release" in this context ends up appearing more like what we'd call a = version, + * i.e. 5.3.0.3. Thus a simple string comparison will not suffice. (5.10 >= 5.9) + * + * Additionally, for all versions of RHEL, we may need to trim pieces of t= he version + * off to do the comparison. + * + * Sample releases: + * RHEL 4: 7.6, 8, 9 + * RHEL 5: 5.1.0.1, 5.2.0.2, 5.3.0.3 + */ +public class EusReleaseComparator implements Comparator { + private final String rhelVersion; + + /** + * Constructor + * + * @param rhelVersionIn RHEL version we're comparing release for. (5Se= rver, 4AS, 4ES) + */ + public EusReleaseComparator(String rhelVersionIn) { + this.rhelVersion =3D rhelVersionIn; + } + + /** + * Compare two EUS channel releases. + * + * @param chan1 First channel. + * @param chan2 Second channel. + * @return 1 if first is > second, 0 if they are equal, -1 is first is= < second. + */ + public int compare(EssentialChannelDto chan1, EssentialChannelDto chan= 2) { + return compare(chan1.getRelease(), chan2.getRelease()); + } + + /** + * Compare two EUS channel releases. + * + * @param rhelRelease1 First channel release. + * @param rhelRelease2 Second channel release. + * @return 1 if first is > second, 0 if they are equal, -1 is first is= < second. + */ + public int compare(String rhelRelease1, String rhelRelease2) { + // Here we normalize the release to drop extra parts of the versio= n: + rhelRelease1 =3D ChannelManager.normalizeRhelReleaseForMapping(rhe= lVersion, + rhelRelease1); + rhelRelease2 =3D ChannelManager.normalizeRhelReleaseForMapping(rhe= lVersion, + rhelRelease2); + + RpmVersionComparator cmp =3D new RpmVersionComparator(); + int c =3D cmp.compare(StringUtils.defaultString(rhelRelease1), + StringUtils.defaultString(rhelRelease2)); + return c; + } +} --===============0431610140099526064==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:39 2015 Content-Type: multipart/mixed; boundary="===============4727555765759561658==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Wed, 17 Jun 2009 18:27:39 +0000 Message-ID: <20090617182739.07C801202FA@lists.fedorahosted.org> --===============4727555765759561658== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/channel/EusReleaseComparator.java | = 84 ++++++++++ 1 file changed, 84 insertions(+) New commits: commit dbaa3be8ca02281efcea9251b9ebde6663f45163 Author: Devan Goodwin Date: Wed Jun 17 15:25:26 2009 -0300 Adding missed EusReleaseComparator file. diff --git a/java/code/src/com/redhat/rhn/manager/channel/EusReleaseCompara= tor.java b/java/code/src/com/redhat/rhn/manager/channel/EusReleaseComparato= r.java new file mode 100644 index 0000000..f8517c6 --- /dev/null +++ b/java/code/src/com/redhat/rhn/manager/channel/EusReleaseComparator.java @@ -0,0 +1,84 @@ +/** + * Copyright (c) 2009 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.manager.channel; + +import com.redhat.rhn.common.util.RpmVersionComparator; + +import com.redhat.rhn.frontend.dto.EssentialChannelDto; + +import java.util.Comparator; + +import org.apache.commons.lang.StringUtils; + +/** + * EusReleaseComparator + * + * Compare two RHEL releases, where the behavior can differ depending on w= hich version + * of RHEL we're dealing with. (RHEL 4 in particular needs special attenti= on.) + * + * "Release" in this context ends up appearing more like what we'd call a = version, + * i.e. 5.3.0.3. Thus a simple string comparison will not suffice. (5.10 >= 5.9) + * + * Additionally, for all versions of RHEL, we may need to trim pieces of t= he version + * off to do the comparison. + * + * Sample releases: + * RHEL 4: 7.6, 8, 9 + * RHEL 5: 5.1.0.1, 5.2.0.2, 5.3.0.3 + */ +public class EusReleaseComparator implements Comparator { + private final String rhelVersion; + + /** + * Constructor + * + * @param rhelVersionIn RHEL version we're comparing release for. (5Se= rver, 4AS, 4ES) + */ + public EusReleaseComparator(String rhelVersionIn) { + this.rhelVersion =3D rhelVersionIn; + } + + /** + * Compare two EUS channel releases. + * + * @param chan1 First channel. + * @param chan2 Second channel. + * @return 1 if first is > second, 0 if they are equal, -1 is first is= < second. + */ + public int compare(EssentialChannelDto chan1, EssentialChannelDto chan= 2) { + return compare(chan1.getRelease(), chan2.getRelease()); + } + + /** + * Compare two EUS channel releases. + * + * @param rhelRelease1 First channel release. + * @param rhelRelease2 Second channel release. + * @return 1 if first is > second, 0 if they are equal, -1 is first is= < second. + */ + public int compare(String rhelRelease1, String rhelRelease2) { + // Here we normalize the release to drop extra parts of the versio= n: + rhelRelease1 =3D ChannelManager.normalizeRhelReleaseForMapping(rhe= lVersion, + rhelRelease1); + rhelRelease2 =3D ChannelManager.normalizeRhelReleaseForMapping(rhe= lVersion, + rhelRelease2); + + RpmVersionComparator cmp =3D new RpmVersionComparator(); + int c =3D cmp.compare(StringUtils.defaultString(rhelRelease1), + StringUtils.defaultString(rhelRelease2)); + return c; + } +} --===============4727555765759561658==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:39 2015 Content-Type: multipart/mixed; boundary="===============2237948230626183289==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: branding/styles java/code Date: Wed, 17 Jun 2009 19:41:14 +0000 Message-ID: <20090617194114.5791E1202FA@lists.fedorahosted.org> --===============2237948230626183289== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable branding/styles/navbar_top.txt | 4 +--- branding/styles/navbar_top_sat.txt | 4 +--- java/code/webapp/WEB-INF/includes/header.jsp | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) New commits: commit fa63f42b10fee3e0921ef8476b0ed01fdb662d5f Author: Brad Buckingham Date: Wed Jun 17 15:40:34 2009 -0400 506489 - remove the link associated with the org name present in the UI= header = Currently, the UI includes information on what organization the user is logged in to (e.g. Organization: myOrg) and the user can click on the name to go to the org details page. While this works for a Satelli= te admin, other users do not have permission to access this page; therefor= e, removing the link. diff --git a/branding/styles/navbar_top.txt b/branding/styles/navbar_top.txt index 6a36411..14d4a77 100644 --- a/branding/styles/navbar_top.txt +++ b/branding/styles/navbar_top.txt @@ -15,9 +15,7 @@ class=3D"navPipe">| Documentation=

                                      User: [login]| - Organization: [org]| + Organization: [org]| Preferences|Sign Out= = diff --git a/branding/styles/navbar_top_sat.txt b/branding/styles/navbar_to= p_sat.txt index 4e1e22d..1ee2c25 100644 --- a/branding/styles/navbar_top_sat.txt +++ b/branding/styles/navbar_top_sat.txt @@ -15,9 +15,7 @@ class=3D"navPipe">| Documentatio= n

                                      User: [login]| - Organization: [org]| + Organization: [org]| Preferences|Sign Out= = diff --git a/java/code/webapp/WEB-INF/includes/header.jsp b/java/code/webap= p/WEB-INF/includes/header.jsp index 2d8e9c0..be77870 100644 --- a/java/code/webapp/WEB-INF/includes/header.jsp +++ b/java/code/webapp/WEB-INF/includes/header.jsp @@ -15,7 +15,7 @@

                                      - = |= = || + = |= = ||

                                      --===============2237948230626183289==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:40 2015 Content-Type: multipart/mixed; boundary="===============2997954602270204884==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - branding/styles java/code Date: Wed, 17 Jun 2009 19:43:30 +0000 Message-ID: <20090617194330.058141202FA@lists.fedorahosted.org> --===============2997954602270204884== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable branding/styles/navbar_top.txt | 4 +--- branding/styles/navbar_top_sat.txt | 4 +--- java/code/webapp/WEB-INF/includes/header.jsp | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) New commits: commit b254ec45eb63bda0aa5c54bb837d45d57a20f4fe Author: Brad Buckingham Date: Wed Jun 17 15:40:34 2009 -0400 506489 - remove the link associated with the org name present in the UI= header = Currently, the UI includes information on what organization the user is logged in to (e.g. Organization: myOrg) and the user can click on the name to go to the org details page. While this works for a Satelli= te admin, other users do not have permission to access this page; therefor= e, removing the link. diff --git a/branding/styles/navbar_top.txt b/branding/styles/navbar_top.txt index 6a36411..14d4a77 100644 --- a/branding/styles/navbar_top.txt +++ b/branding/styles/navbar_top.txt @@ -15,9 +15,7 @@ class=3D"navPipe">| Documentation=

                                      User: [login]| - Organization: [org]| + Organization: [org]| Preferences|Sign Out= = diff --git a/branding/styles/navbar_top_sat.txt b/branding/styles/navbar_to= p_sat.txt index 4e1e22d..1ee2c25 100644 --- a/branding/styles/navbar_top_sat.txt +++ b/branding/styles/navbar_top_sat.txt @@ -15,9 +15,7 @@ class=3D"navPipe">| Documentatio= n

                                      User: [login]| - Organization: [org]| + Organization: [org]| Preferences|Sign Out= = diff --git a/java/code/webapp/WEB-INF/includes/header.jsp b/java/code/webap= p/WEB-INF/includes/header.jsp index 2d8e9c0..be77870 100644 --- a/java/code/webapp/WEB-INF/includes/header.jsp +++ b/java/code/webapp/WEB-INF/includes/header.jsp @@ -15,7 +15,7 @@

                                      - = |= = || + = |= = ||

                                      --===============2997954602270204884==-- From mmraka at fedoraproject.org Thu Aug 20 11:57:40 2015 Content-Type: multipart/mixed; boundary="===============8751924362583663278==" MIME-Version: 1.0 From: Michael Mraka To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - proxy/installer Date: Wed, 17 Jun 2009 19:44:39 +0000 Message-ID: <20090617194439.EED451202FA@lists.fedorahosted.org> --===============8751924362583663278== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/installer/rhn-proxy-activate.sgml | 2 ++ proxy/installer/spacewalk-proxy-installer.spec | 4 ++++ 2 files changed, 6 insertions(+) New commits: commit 6c3725f695ffc7640ff8d0e86f8e1460517c8b25 Author: Michael Mraka Date: Wed Jun 17 19:46:30 2009 +0200 fixed sgml errors in rpm %build = nsgmls:/builddir/build/BUILD/spacewalk-proxy-installer-0.6.14/r= hn-proxy-activate.sgml:68:10:E: end tag for "PARA" omitted, but OMITTAG NO = was specified nsgmls:/builddir/build/BUILD/spacewalk-proxy-installer-0.6.14/r= hn-proxy-activate.sgml:65:0: start tag was here nsgmls:/builddir/build/BUILD/spacewalk-proxy-installer-0.6.14/r= hn-proxy-activate.sgml:84:10:E: end tag for "VARIABLELIST" omitted, but OMI= TTAG NO was specified nsgmls:/builddir/build/BUILD/spacewalk-proxy-installer-0.6.14/r= hn-proxy-activate.sgml:71:0: start tag was here diff --git a/proxy/installer/rhn-proxy-activate.sgml b/proxy/installer/rhn-= proxy-activate.sgml index 1d68882..d01e04c 100644 --- a/proxy/installer/rhn-proxy-activate.sgml +++ b/proxy/installer/rhn-proxy-activate.sgml @@ -65,6 +65,7 @@ Without any command specified, this script will activate Spacewalk Pro= xy. For other possibility see COMMANDS section. + = COMMANDS @@ -81,6 +82,7 @@ List available versions of RHN Proxy on parent. + = Options commit b18e3a9813f9b0fdda14980ac25cd2f54bf0529a Author: Michael Mraka Date: Wed Jun 17 14:37:16 2009 +0200 remove access_log directive on RHEL4 diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/install= er/spacewalk-proxy-installer.spec index 34edf77..82d3271 100644 --- a/proxy/installer/spacewalk-proxy-installer.spec +++ b/proxy/installer/spacewalk-proxy-installer.spec @@ -42,6 +42,10 @@ Run configure-proxy.sh after installation to configure p= roxy. /usr/bin/gzip rhn-proxy-activate.8 /usr/bin/docbook2man configure-proxy.sh.sgml /usr/bin/gzip configure-proxy.sh.8 +# default access_log is already set on RHEL4 +%if 0%{?rhel} =3D=3D 4 +perl -i -pe 's/access_log \S+ squid//;' squid.conf +%endif = %install rm -rf $RPM_BUILD_ROOT --===============8751924362583663278==-- From mmraka at fedoraproject.org Thu Aug 20 11:57:40 2015 Content-Type: multipart/mixed; boundary="===============2392660388718428676==" MIME-Version: 1.0 From: Michael Mraka To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 2 commits - proxy/installer Date: Wed, 17 Jun 2009 19:45:24 +0000 Message-ID: <20090617194524.5E68C1202FA@lists.fedorahosted.org> --===============2392660388718428676== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/installer/rhn-proxy-activate.sgml | 2 ++ proxy/installer/spacewalk-proxy-installer.spec | 4 ++++ 2 files changed, 6 insertions(+) New commits: commit 90b8c1aee87f209409cd4dca030e7e18ecabf816 Author: Michael Mraka Date: Wed Jun 17 19:46:30 2009 +0200 fixed sgml errors in rpm %build = nsgmls:/builddir/build/BUILD/spacewalk-proxy-installer-0.6.14/r= hn-proxy-activate.sgml:68:10:E: end tag for "PARA" omitted, but OMITTAG NO = was specified nsgmls:/builddir/build/BUILD/spacewalk-proxy-installer-0.6.14/r= hn-proxy-activate.sgml:65:0: start tag was here nsgmls:/builddir/build/BUILD/spacewalk-proxy-installer-0.6.14/r= hn-proxy-activate.sgml:84:10:E: end tag for "VARIABLELIST" omitted, but OMI= TTAG NO was specified nsgmls:/builddir/build/BUILD/spacewalk-proxy-installer-0.6.14/r= hn-proxy-activate.sgml:71:0: start tag was here diff --git a/proxy/installer/rhn-proxy-activate.sgml b/proxy/installer/rhn-= proxy-activate.sgml index 1d68882..d01e04c 100644 --- a/proxy/installer/rhn-proxy-activate.sgml +++ b/proxy/installer/rhn-proxy-activate.sgml @@ -65,6 +65,7 @@ Without any command specified, this script will activate Spacewalk Pro= xy. For other possibility see COMMANDS section. + = COMMANDS @@ -81,6 +82,7 @@ List available versions of RHN Proxy on parent. + = Options commit 4e559c13850c692084aa7c1330bf7bfa7052ec5e Author: Michael Mraka Date: Wed Jun 17 14:37:16 2009 +0200 remove access_log directive on RHEL4 diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/install= er/spacewalk-proxy-installer.spec index a15ab49..1348952 100644 --- a/proxy/installer/spacewalk-proxy-installer.spec +++ b/proxy/installer/spacewalk-proxy-installer.spec @@ -42,6 +42,10 @@ Run configure-proxy.sh after installation to configure p= roxy. /usr/bin/gzip rhn-proxy-activate.8 /usr/bin/docbook2man configure-proxy.sh.sgml /usr/bin/gzip configure-proxy.sh.8 +# default access_log is already set on RHEL4 +%if 0%{?rhel} =3D=3D 4 +perl -i -pe 's/access_log \S+ squid//;' squid.conf +%endif = %install rm -rf $RPM_BUILD_ROOT --===============2392660388718428676==-- From mmraka at fedoraproject.org Thu Aug 20 11:57:40 2015 Content-Type: multipart/mixed; boundary="===============0244117536195046898==" MIME-Version: 1.0 From: Michael Mraka To: spacewalk-commits at lists.fedorahosted.org Subject: proxy/installer rel-eng/packages Date: Wed, 17 Jun 2009 19:47:19 +0000 Message-ID: <20090617194719.568C11202FA@lists.fedorahosted.org> --===============0244117536195046898== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/installer/spacewalk-proxy-installer.spec | 6 +++++- rel-eng/packages/spacewalk-proxy-installer | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 40e2aa69a80ec165bc080f623c73ee325602c18a Author: Michael Mraka Date: Wed Jun 17 21:46:46 2009 +0200 Automatic commit of package [spacewalk-proxy-installer] release [0.6.15= -1]. diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/install= er/spacewalk-proxy-installer.spec index 82d3271..e91efdf 100644 --- a/proxy/installer/spacewalk-proxy-installer.spec +++ b/proxy/installer/spacewalk-proxy-installer.spec @@ -2,7 +2,7 @@ Name: spacewalk-proxy-installer Summary: Spacewalk Proxy Server Installer Group: Applications/Internet License: GPLv2 -Version: 0.6.14 +Version: 0.6.15 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz @@ -88,6 +88,10 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE answers.txt = %changelog +* Wed Jun 17 2009 Michael Mraka 0.6.15-1 +- fixed sgml errors in %%build +- removed access_log directive on RHEL4 + * Tue Jun 16 2009 Miroslav Suchy 0.6.14-1 - 499399 - print scout shared key on output = diff --git a/rel-eng/packages/spacewalk-proxy-installer b/rel-eng/packages/= spacewalk-proxy-installer index a07628b..94a1a15 100644 --- a/rel-eng/packages/spacewalk-proxy-installer +++ b/rel-eng/packages/spacewalk-proxy-installer @@ -1 +1 @@ -0.6.14-1 proxy/installer/ +0.6.15-1 proxy/installer/ --===============0244117536195046898==-- From mmraka at fedoraproject.org Thu Aug 20 11:57:40 2015 Content-Type: multipart/mixed; boundary="===============6364383244450074045==" MIME-Version: 1.0 From: Michael Mraka To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-proxy-installer-0.6.15-1' Date: Wed, 17 Jun 2009 19:47:24 +0000 Message-ID: <20090617194724.BCE80120325@lists.fedorahosted.org> --===============6364383244450074045== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-proxy-installer-0.6.15-1' created by Michael Mraka at 2009-06-17 19:46 +0000 Tagging package [spacewalk-proxy-installer] version [0.6.15-1] in directory= [proxy/installer/]. Changes since rhn-custom-info-5.4.0-1-14: --- 0 files changed --- --===============6364383244450074045==-- From jdob at fedoraproject.org Thu Aug 20 11:57:40 2015 Content-Type: multipart/mixed; boundary="===============6327254953094718279==" MIME-Version: 1.0 From: jdob To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Wed, 17 Jun 2009 19:48:08 +0000 Message-ID: <20090617194808.660551202FA@lists.fedorahosted.org> --===============6327254953094718279== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/security/acl/PackageAclHandler.java | = 23 ++++-- java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java | = 34 +++++----- 2 files changed, 32 insertions(+), 25 deletions(-) New commits: commit 3bb101ec6b46754611762c302647817cb3c105a5 Author: Jason Dobies Date: Wed Jun 17 15:41:52 2009 -0400 495406 - Changed package arch lookup for ACLs to use arch labels instea= d of hibernate objects. diff --git a/java/code/src/com/redhat/rhn/common/security/acl/PackageAclHan= dler.java b/java/code/src/com/redhat/rhn/common/security/acl/PackageAclHand= ler.java index be32e45..47b5c32 100644 --- a/java/code/src/com/redhat/rhn/common/security/acl/PackageAclHandler.ja= va +++ b/java/code/src/com/redhat/rhn/common/security/acl/PackageAclHandler.ja= va @@ -24,8 +24,9 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.rhnpackage.PackageManager; = -import java.util.List; import java.util.Map; +import java.util.Set; + import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.Log; = @@ -62,10 +63,11 @@ public class PackageAclHandler extends BaseHandler impl= ements AclHandler { } = /** - * Is the package of a certain type - * @param ctx Context Map to pass in - * @param params Parameters to use to fetch from Context - * @return true if the only param matches the package's arch type = + * Tests to determine if the requested package is capable with the giv= en ACLs. + * = + * @param ctx context map describing the request + * @param params Parameters to use to fetch from context + * @return true if the the package passes the ACL = */ public boolean aclPackageTypeCapable(Object ctx, String[] params) { = @@ -85,13 +87,16 @@ public class PackageAclHandler extends BaseHandler impl= ements AclHandler { } = ArchType type =3D pack.getPackageArch().getArchType(); - Map> capMap =3D PackageFactory.getPackageCa= pabilityMap(); + String archTypeLabel =3D type.getLabel(); + Map> capMap =3D PackageFactory.getPackageCapab= ilityMap(); = - if (capMap.get(type) =3D=3D null) { + if (capMap.get(archTypeLabel) =3D=3D null) { return false; } - = - boolean capFound =3D capMap.get(type).contains(cap); + + Set capabilities =3D capMap.get(archTypeLabel); + + boolean capFound =3D capabilities.contains(cap); return capFound; } = diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.= java b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java index 38c36f6..5576d91 100644 --- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java +++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java @@ -36,6 +36,8 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.HashSet; = /** * PackageFactory @@ -48,12 +50,11 @@ public class PackageFactory extends HibernateFactory { = public static final PackageKeyType PACKAGE_KEY_TYPE_GPG =3D lookupKeyT= ypeByLabel("gpg"); = - public static final ArchType ARCH_TYPE_RPM =3D lookupArchTypeByLabel("= rpm"); - public static final ArchType ARCH_TYPE_SYSV =3D lookupArchTypeByLabel(= "sysv-solaris"); - public static final ArchType ARCH_TYPE_TAR =3D lookupArchTypeByLabel("= tar"); - public static final ArchType ARCH_TYPE_PATCH =3D lookupArchTypeByLabel= ("solaris-patch"); - public static final ArchType ARCH_TYPE_PATCH_CLUSTER =3D lookupArchTyp= eByLabel( - "solaris-patch-cluster"); + public static final String ARCH_TYPE_RPM =3D "rpm"; + public static final String ARCH_TYPE_SYSV =3D "sysv-solaris"; + public static final String ARCH_TYPE_TAR =3D "tar"; + public static final String ARCH_TYPE_PATCH =3D "solaris-patch"; + public static final String ARCH_TYPE_PATCH_CLUSTER =3D "solaris-patch-= cluster"; = private PackageFactory() { super(); @@ -412,15 +413,16 @@ public class PackageFactory extends HibernateFactory { } = /** - * Provides a mapping of arch types to lists of capabilities From the = if - * statement mess in package_type_capable of Package.pm This should re= ally - * be in the DB, but it's not :{ and it needs to be ported from perl - * @return the map of ArchType -> List of capabilities + * Provides a mapping of arch type labels to sets of capabilities (por= ted from the if + * statement mess in package_type_capable of Package.pm). This should = really + * be in the DB, but it's not :{ and it needs to be ported from perl. + * = + * @return the map of arch label -> set of capabilities */ - public static Map> getPackageCapabilityMap() { - Map> map =3D new HashMap>(); + public static Map> getPackageCapabilityMap() { + Map> map =3D new HashMap>(= ); = - List rpmCaps =3D new ArrayList(); + Set rpmCaps =3D new HashSet(); rpmCaps.add("dependencies"); rpmCaps.add("change_log"); rpmCaps.add("file_list"); @@ -429,17 +431,17 @@ public class PackageFactory extends HibernateFactory { rpmCaps.add("rpm"); map.put(PackageFactory.ARCH_TYPE_RPM, rpmCaps); = - List patchCaps =3D new ArrayList(); + Set patchCaps =3D new HashSet(); patchCaps.add("dependencies"); patchCaps.add("solaris_patch"); patchCaps.add("remove"); map.put(PackageFactory.ARCH_TYPE_PATCH, patchCaps); = - List patchSetCaps =3D new ArrayList(); + Set patchSetCaps =3D new HashSet(); patchSetCaps.add("solaris_patchset"); map.put(PackageFactory.ARCH_TYPE_PATCH_CLUSTER, patchSetCaps); = - List sysVCaps =3D new ArrayList(); + Set sysVCaps =3D new HashSet(); sysVCaps.add("deploy_answer_file"); sysVCaps.add("remove"); sysVCaps.add("package_map"); --===============6327254953094718279==-- From jdob at fedoraproject.org Thu Aug 20 11:57:40 2015 Content-Type: multipart/mixed; boundary="===============5091581192805373258==" MIME-Version: 1.0 From: jdob To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Wed, 17 Jun 2009 19:49:02 +0000 Message-ID: <20090617194902.85BA91202FA@lists.fedorahosted.org> --===============5091581192805373258== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/security/acl/PackageAclHandler.java | = 23 ++++-- java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java | = 34 +++++----- 2 files changed, 32 insertions(+), 25 deletions(-) New commits: commit 273bb0b0e9439a8e3e54bc8a62842ea6843d12db Author: Jason Dobies Date: Wed Jun 17 15:41:52 2009 -0400 495406 - Changed package arch lookup for ACLs to use arch labels instea= d of hibernate objects. diff --git a/java/code/src/com/redhat/rhn/common/security/acl/PackageAclHan= dler.java b/java/code/src/com/redhat/rhn/common/security/acl/PackageAclHand= ler.java index be32e45..47b5c32 100644 --- a/java/code/src/com/redhat/rhn/common/security/acl/PackageAclHandler.ja= va +++ b/java/code/src/com/redhat/rhn/common/security/acl/PackageAclHandler.ja= va @@ -24,8 +24,9 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.rhnpackage.PackageManager; = -import java.util.List; import java.util.Map; +import java.util.Set; + import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.Log; = @@ -62,10 +63,11 @@ public class PackageAclHandler extends BaseHandler impl= ements AclHandler { } = /** - * Is the package of a certain type - * @param ctx Context Map to pass in - * @param params Parameters to use to fetch from Context - * @return true if the only param matches the package's arch type = + * Tests to determine if the requested package is capable with the giv= en ACLs. + * = + * @param ctx context map describing the request + * @param params Parameters to use to fetch from context + * @return true if the the package passes the ACL = */ public boolean aclPackageTypeCapable(Object ctx, String[] params) { = @@ -85,13 +87,16 @@ public class PackageAclHandler extends BaseHandler impl= ements AclHandler { } = ArchType type =3D pack.getPackageArch().getArchType(); - Map> capMap =3D PackageFactory.getPackageCa= pabilityMap(); + String archTypeLabel =3D type.getLabel(); + Map> capMap =3D PackageFactory.getPackageCapab= ilityMap(); = - if (capMap.get(type) =3D=3D null) { + if (capMap.get(archTypeLabel) =3D=3D null) { return false; } - = - boolean capFound =3D capMap.get(type).contains(cap); + + Set capabilities =3D capMap.get(archTypeLabel); + + boolean capFound =3D capabilities.contains(cap); return capFound; } = diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.= java b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java index 38c36f6..5576d91 100644 --- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java +++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java @@ -36,6 +36,8 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.HashSet; = /** * PackageFactory @@ -48,12 +50,11 @@ public class PackageFactory extends HibernateFactory { = public static final PackageKeyType PACKAGE_KEY_TYPE_GPG =3D lookupKeyT= ypeByLabel("gpg"); = - public static final ArchType ARCH_TYPE_RPM =3D lookupArchTypeByLabel("= rpm"); - public static final ArchType ARCH_TYPE_SYSV =3D lookupArchTypeByLabel(= "sysv-solaris"); - public static final ArchType ARCH_TYPE_TAR =3D lookupArchTypeByLabel("= tar"); - public static final ArchType ARCH_TYPE_PATCH =3D lookupArchTypeByLabel= ("solaris-patch"); - public static final ArchType ARCH_TYPE_PATCH_CLUSTER =3D lookupArchTyp= eByLabel( - "solaris-patch-cluster"); + public static final String ARCH_TYPE_RPM =3D "rpm"; + public static final String ARCH_TYPE_SYSV =3D "sysv-solaris"; + public static final String ARCH_TYPE_TAR =3D "tar"; + public static final String ARCH_TYPE_PATCH =3D "solaris-patch"; + public static final String ARCH_TYPE_PATCH_CLUSTER =3D "solaris-patch-= cluster"; = private PackageFactory() { super(); @@ -412,15 +413,16 @@ public class PackageFactory extends HibernateFactory { } = /** - * Provides a mapping of arch types to lists of capabilities From the = if - * statement mess in package_type_capable of Package.pm This should re= ally - * be in the DB, but it's not :{ and it needs to be ported from perl - * @return the map of ArchType -> List of capabilities + * Provides a mapping of arch type labels to sets of capabilities (por= ted from the if + * statement mess in package_type_capable of Package.pm). This should = really + * be in the DB, but it's not :{ and it needs to be ported from perl. + * = + * @return the map of arch label -> set of capabilities */ - public static Map> getPackageCapabilityMap() { - Map> map =3D new HashMap>(); + public static Map> getPackageCapabilityMap() { + Map> map =3D new HashMap>(= ); = - List rpmCaps =3D new ArrayList(); + Set rpmCaps =3D new HashSet(); rpmCaps.add("dependencies"); rpmCaps.add("change_log"); rpmCaps.add("file_list"); @@ -429,17 +431,17 @@ public class PackageFactory extends HibernateFactory { rpmCaps.add("rpm"); map.put(PackageFactory.ARCH_TYPE_RPM, rpmCaps); = - List patchCaps =3D new ArrayList(); + Set patchCaps =3D new HashSet(); patchCaps.add("dependencies"); patchCaps.add("solaris_patch"); patchCaps.add("remove"); map.put(PackageFactory.ARCH_TYPE_PATCH, patchCaps); = - List patchSetCaps =3D new ArrayList(); + Set patchSetCaps =3D new HashSet(); patchSetCaps.add("solaris_patchset"); map.put(PackageFactory.ARCH_TYPE_PATCH_CLUSTER, patchSetCaps); = - List sysVCaps =3D new ArrayList(); + Set sysVCaps =3D new HashSet(); sysVCaps.add("deploy_answer_file"); sysVCaps.add("remove"); sysVCaps.add("package_map"); --===============5091581192805373258==-- From partha at fedoraproject.org Thu Aug 20 11:57:40 2015 Content-Type: multipart/mixed; boundary="===============6796146714971479474==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - spacewalk/setup Date: Wed, 17 Jun 2009 20:24:54 +0000 Message-ID: <20090617202454.6A8871202FA@lists.fedorahosted.org> --===============6796146714971479474== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/setup/bin/cobbler-setup | 23 +++++++++++++++++++---- spacewalk/setup/bin/spacewalk-setup | 16 +++++++++++++++- spacewalk/setup/lib/Spacewalk/Setup.pm | 13 +++++++++++-- 3 files changed, 45 insertions(+), 7 deletions(-) New commits: commit bf603adbb91c20e22186786b16b54bf0cd04db08 Author: Partha Aji Date: Wed Jun 17 16:27:37 2009 -0400 506405 - fixed cobbler-setup for non-interactive installs = Basically added a --enable-tftp option to cobbler-setup and had it auto= matically set to yes if its a non-interactive install. So user won;t be prompted for questions if answers file contains enable= -tftp=3Dy or enable-tftp=3Dn diff --git a/spacewalk/setup/bin/cobbler-setup b/spacewalk/setup/bin/cobble= r-setup index 8dd084e..a08b6f3 100755 --- a/spacewalk/setup/bin/cobbler-setup +++ b/spacewalk/setup/bin/cobbler-setup @@ -7,6 +7,7 @@ from os.path import exists, join, dirname, basename, isdir,= isfile from os import system import sys import re +import optparse = sys.path.append('/usr/share/rhn') import common @@ -46,11 +47,28 @@ def ask_yes_no(question, default_val =3D None): = return ans.lower() =3D=3D 'y' = +def setup_pxe_services(options): + enable =3D "yes" =3D=3D options.tftp + if not options.tftp: + q =3D "Cobbler requires tftp and xinetd services be turned on for = PXE provisioning functionality. Enable these services" = + enable =3D ask_yes_no(q, 'y') + if enable: + system("chkconfig tftp on") + system('chkconfig xinetd on') + def gen_template(template, answers, output): t =3D Template(file=3Dtemplate, searchList=3Danswers) open(output,"w").write(t.respond()) = +def setup_options(parser): + parser.add_option("-t", "--enable-tftp", dest=3D"tftp", type=3D"choice= ", choices=3D["yes","no"], + help=3D"Enables tftp and xinetd services required for Co= bbler PXE provisioning functionality (yes or no)") + + def main(): + parser =3D optparse.OptionParser() + setup_options(parser) + options, args =3D parser.parse_args() answers =3D dict(loadFile(DEFAULTS)) answers['server'] =3D gethostname() answers['next_server'] =3D answers['server'] @@ -67,10 +85,7 @@ def main(): if not m.search(conf_lines): system ("echo 'cobbler.host =3D %s' >> %s " % (answers['server'], common.rhnConfig._CONFIG_FILE)) - q =3D "Cobbler requires tftp and xinetd services be turned on for PXE = provisioning functionality. Enable these services" = - if ask_yes_no(q, 'y'): - system("chkconfig tftp on") - system('chkconfig xinetd on') + setup_pxe_services(options) = system("cobbler sync") = = diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spac= ewalk-setup old mode 100644 new mode 100755 index df3a956..01074a1 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -243,7 +243,21 @@ sub remove_old_jvm { sub setup_cobbler { my $opts =3D shift; my $answers =3D shift; - my $status =3D system(COBBLER_COMMAND); + if ($opts{'enable-tftp'}) { + $answers{'enable-tftp'} =3D $opts{'enable-tftp'}; + } = + if ($answers{'enable-tftp'} =3D~ /^[Yy]/ ) { + system(COBBLER_COMMAND . " --enable-tftp=3Dyes"); + } + elsif ($answers{'enable-tftp'}) { + system(COBBLER_COMMAND . " --enable-tftp=3Dno"); + } + elsif ($opts{"non-interactive"}) { + system(COBBLER_COMMAND . " --enable-tftp=3Dyes"); + } + else { + system(COBBLER_COMMAND); + } = } = sub setup_admin_email { diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/S= pacewalk/Setup.pm index 03f5b50..43252ae 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -103,12 +103,13 @@ sub parse_options { "non-interactive", "upgrade", "run-updater:s", - "run-cobbler" + "run-cobbler", + "enable-tftp:s", ); = my $usage =3D loc("usage: %s %s\n", $0, - "[ --help ] [ --answer-file=3D ] [ --non-interactive ] [ --s= kip-system-version-test ] [ --skip-selinux-test ] [ --skip-fqdn-test ] [ --= skip-db-install ] [ --skip-db-diskspace-check ] [ --skip-db-population ] [ = --skip-gpg-key-import ] [ --skip-ssl-cert-generation ] [--skip-ssl-vhost-se= tup] [ --skip-services-check ] [ --clear-db ] [ --re-register ] [ --disconn= ected ] [ --upgrade ] [ --run-updater=3D] [--run-cobbler]"); + "[ --help ] [ --answer-file=3D ] [ --non-interactive ] [ --s= kip-system-version-test ] [ --skip-selinux-test ] [ --skip-fqdn-test ] [ --= skip-db-install ] [ --skip-db-diskspace-check ] [ --skip-db-population ] [ = --skip-gpg-key-import ] [ --skip-ssl-cert-generation ] [--skip-ssl-vhost-se= tup] [ --skip-services-check ] [ --clear-db ] [ --re-register ] [ --disconn= ected ] [ --upgrade ] [ --run-updater=3D] [--run-cobbler] [ --enabl= e-tftp=3D]" ); = # Terminate if any errors were encountered parsing the command line args: my %opts; @@ -1401,6 +1402,14 @@ Proceed with upgrade if services are already stopped. = Set to 'yes' to automatically install needed packages from RHN, provided t= he system is registered. Set to 'no' to terminate the installer if any need= ed packages are missing. = +=3Ditem B<--run-cobbler> + +Only runs the necessary steps to setup cobbler + +=3Ditem B<--enable-tftp=3D> + +Set to 'yes' to automatically enable tftp and xinetd services needed for C= obbler PXE provisioning functionality. Set to 'no' if you do not want the i= nstaller to enable these services. + =3Dback = =3Dhead1 SEE ALSO --===============6796146714971479474==-- From partha at fedoraproject.org Thu Aug 20 11:57:40 2015 Content-Type: multipart/mixed; boundary="===============1375487010947477420==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: spacewalk/setup Date: Wed, 17 Jun 2009 20:25:49 +0000 Message-ID: <20090617202549.BCDE91202FA@lists.fedorahosted.org> --===============1375487010947477420== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/setup/bin/cobbler-setup | 23 +++++++++++++++++++---- spacewalk/setup/bin/spacewalk-setup | 16 +++++++++++++++- spacewalk/setup/lib/Spacewalk/Setup.pm | 13 +++++++++++-- 3 files changed, 45 insertions(+), 7 deletions(-) New commits: commit f2dfc55fb40254c6bffbccac796b4ceb08dd2abc Author: Partha Aji Date: Wed Jun 17 16:27:37 2009 -0400 506405 - fixed cobbler-setup for non-interactive installs = Basically added a --enable-tftp option to cobbler-setup and had it auto= matically set to yes if its a non-interactive install. So user won;t be prompted for questions if answers file contains enable= -tftp=3Dy or enable-tftp=3Dn diff --git a/spacewalk/setup/bin/cobbler-setup b/spacewalk/setup/bin/cobble= r-setup index 8dd084e..a08b6f3 100755 --- a/spacewalk/setup/bin/cobbler-setup +++ b/spacewalk/setup/bin/cobbler-setup @@ -7,6 +7,7 @@ from os.path import exists, join, dirname, basename, isdir,= isfile from os import system import sys import re +import optparse = sys.path.append('/usr/share/rhn') import common @@ -46,11 +47,28 @@ def ask_yes_no(question, default_val =3D None): = return ans.lower() =3D=3D 'y' = +def setup_pxe_services(options): + enable =3D "yes" =3D=3D options.tftp + if not options.tftp: + q =3D "Cobbler requires tftp and xinetd services be turned on for = PXE provisioning functionality. Enable these services" = + enable =3D ask_yes_no(q, 'y') + if enable: + system("chkconfig tftp on") + system('chkconfig xinetd on') + def gen_template(template, answers, output): t =3D Template(file=3Dtemplate, searchList=3Danswers) open(output,"w").write(t.respond()) = +def setup_options(parser): + parser.add_option("-t", "--enable-tftp", dest=3D"tftp", type=3D"choice= ", choices=3D["yes","no"], + help=3D"Enables tftp and xinetd services required for Co= bbler PXE provisioning functionality (yes or no)") + + def main(): + parser =3D optparse.OptionParser() + setup_options(parser) + options, args =3D parser.parse_args() answers =3D dict(loadFile(DEFAULTS)) answers['server'] =3D gethostname() answers['next_server'] =3D answers['server'] @@ -67,10 +85,7 @@ def main(): if not m.search(conf_lines): system ("echo 'cobbler.host =3D %s' >> %s " % (answers['server'], common.rhnConfig._CONFIG_FILE)) - q =3D "Cobbler requires tftp and xinetd services be turned on for PXE = provisioning functionality. Enable these services" = - if ask_yes_no(q, 'y'): - system("chkconfig tftp on") - system('chkconfig xinetd on') + setup_pxe_services(options) = system("cobbler sync") = = diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spac= ewalk-setup old mode 100644 new mode 100755 index df3a956..01074a1 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -243,7 +243,21 @@ sub remove_old_jvm { sub setup_cobbler { my $opts =3D shift; my $answers =3D shift; - my $status =3D system(COBBLER_COMMAND); + if ($opts{'enable-tftp'}) { + $answers{'enable-tftp'} =3D $opts{'enable-tftp'}; + } = + if ($answers{'enable-tftp'} =3D~ /^[Yy]/ ) { + system(COBBLER_COMMAND . " --enable-tftp=3Dyes"); + } + elsif ($answers{'enable-tftp'}) { + system(COBBLER_COMMAND . " --enable-tftp=3Dno"); + } + elsif ($opts{"non-interactive"}) { + system(COBBLER_COMMAND . " --enable-tftp=3Dyes"); + } + else { + system(COBBLER_COMMAND); + } = } = sub setup_admin_email { diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/S= pacewalk/Setup.pm index f32c249..a77e980 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -103,12 +103,13 @@ sub parse_options { "non-interactive", "upgrade", "run-updater:s", - "run-cobbler" + "run-cobbler", + "enable-tftp:s", ); = my $usage =3D loc("usage: %s %s\n", $0, - "[ --help ] [ --answer-file=3D ] [ --non-interactive ] [ --s= kip-system-version-test ] [ --skip-selinux-test ] [ --skip-fqdn-test ] [ --= skip-db-install ] [ --skip-db-diskspace-check ] [ --skip-db-population ] [ = --skip-gpg-key-import ] [ --skip-ssl-cert-generation ] [--skip-ssl-vhost-se= tup] [ --skip-services-check ] [ --clear-db ] [ --re-register ] [ --disconn= ected ] [ --upgrade ] [ --run-updater=3D] [--run-cobbler]"); + "[ --help ] [ --answer-file=3D ] [ --non-interactive ] [ --s= kip-system-version-test ] [ --skip-selinux-test ] [ --skip-fqdn-test ] [ --= skip-db-install ] [ --skip-db-diskspace-check ] [ --skip-db-population ] [ = --skip-gpg-key-import ] [ --skip-ssl-cert-generation ] [--skip-ssl-vhost-se= tup] [ --skip-services-check ] [ --clear-db ] [ --re-register ] [ --disconn= ected ] [ --upgrade ] [ --run-updater=3D] [--run-cobbler] [ --enabl= e-tftp=3D]" ); = # Terminate if any errors were encountered parsing the command line args: my %opts; @@ -1401,6 +1402,14 @@ Proceed with upgrade if services are already stopped. = Set to 'yes' to automatically install needed packages from RHN, provided t= he system is registered. Set to 'no' to terminate the installer if any need= ed packages are missing. = +=3Ditem B<--run-cobbler> + +Only runs the necessary steps to setup cobbler + +=3Ditem B<--enable-tftp=3D> + +Set to 'yes' to automatically enable tftp and xinetd services needed for C= obbler PXE provisioning functionality. Set to 'no' if you do not want the i= nstaller to enable these services. + =3Dback = =3Dhead1 SEE ALSO --===============1375487010947477420==-- From shughes at fedoraproject.org Thu Aug 20 11:57:40 2015 Content-Type: multipart/mixed; boundary="===============6856430845783347810==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Wed, 17 Jun 2009 20:54:39 +0000 Message-ID: <20090617205439.3F1F11202FA@lists.fedorahosted.org> --===============6856430845783347810== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml = | 4 ++-- java/code/src/com/redhat/rhn/frontend/action/multiorg/ChannelProvideAction= .java | 5 ++--- java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java = | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) New commits: commit 260ea162c12c9374fae4b8752bdd4054e7159efc Author: Shannon Hughes Date: Wed Jun 17 16:47:03 2009 -0400 506341 - fix system count for provided shared channels diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_= queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel= _queries.xml index 11cdbd5..d9ab364 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml @@ -529,8 +529,8 @@ SELECT CFO.id, CFO.org_id, CFO.name, CFO.label, CFO.cur= rent_members, CFO.max_mem FROM rhnSharedChannelView V inner join rhnUserChannel UC on UC.channel_id =3D V.id = where 1=3D1 - and v.org_trust_id =3D :org_id2 - AND v.org_id =3D :org_id + and v.org_trust_id =3D :org_id + AND v.org_id =3D :org_id2 AND UC.user_id =3D :user_id
                                      diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/ChannelP= rovideAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/C= hannelProvideAction.java index 763248f..d3af581 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/ChannelProvideA= ction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/ChannelProvideA= ction.java @@ -20,7 +20,6 @@ import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.org.OrgFactory; import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.domain.user.UserFactory; import com.redhat.rhn.frontend.action.channel.BaseChannelTreeAction; import com.redhat.rhn.frontend.listview.ListControl; import com.redhat.rhn.frontend.struts.RequestContext; @@ -39,8 +38,8 @@ public class ChannelProvideAction extends BaseChannelTree= Action { = Long oid =3D requestContext.getParamAsLong(RequestContext.ORG_ID); //grab the trusted org id passed in - Org provideOrg =3D OrgFactory.lookupById(oid); = - User user =3D UserFactory.findRandomOrgAdmin(provideOrg); + Org provideOrg =3D OrgFactory.lookupById(oid); + User user =3D requestContext.getCurrentUser(); Org org =3D requestContext.getCurrentUser().getOrg(); = /* reverse thinking here, the providing org becomes the supply org= for query diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.ja= va b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java index 5bc0da0..53406d1 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -526,9 +526,9 @@ public class ChannelManager extends BaseManager { SelectMode m =3D ModeFactory.getMode("Channel_queries", "trust_cha= nnel_consume"); = Map params =3D new HashMap(); = - params.put("org_id", org.getId()); + params.put("org_id", trustOrg.getId()); params.put("user_id", user.getId()); - params.put("org_id2", trustOrg.getId()); = + params.put("org_id2", org.getId()); DataResult dr =3D makeDataResult(params, params, lc, m); return dr; } --===============6856430845783347810==-- From shughes at fedoraproject.org Thu Aug 20 11:57:40 2015 Content-Type: multipart/mixed; boundary="===============7685937507433123236==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Wed, 17 Jun 2009 20:55:26 +0000 Message-ID: <20090617205526.B79A71202FA@lists.fedorahosted.org> --===============7685937507433123236== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml = | 4 ++-- java/code/src/com/redhat/rhn/frontend/action/multiorg/ChannelProvideAction= .java | 5 ++--- java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java = | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) New commits: commit 29982d90a23b8b35365bec2fc9ab723724722e1e Author: Shannon Hughes Date: Wed Jun 17 16:47:03 2009 -0400 506341 - fix system count for provided shared channels diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_= queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel= _queries.xml index 11cdbd5..d9ab364 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml @@ -529,8 +529,8 @@ SELECT CFO.id, CFO.org_id, CFO.name, CFO.label, CFO.cur= rent_members, CFO.max_mem FROM rhnSharedChannelView V inner join rhnUserChannel UC on UC.channel_id =3D V.id = where 1=3D1 - and v.org_trust_id =3D :org_id2 - AND v.org_id =3D :org_id + and v.org_trust_id =3D :org_id + AND v.org_id =3D :org_id2 AND UC.user_id =3D :user_id diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/ChannelP= rovideAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/C= hannelProvideAction.java index 763248f..d3af581 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/ChannelProvideA= ction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/ChannelProvideA= ction.java @@ -20,7 +20,6 @@ import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.org.OrgFactory; import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.domain.user.UserFactory; import com.redhat.rhn.frontend.action.channel.BaseChannelTreeAction; import com.redhat.rhn.frontend.listview.ListControl; import com.redhat.rhn.frontend.struts.RequestContext; @@ -39,8 +38,8 @@ public class ChannelProvideAction extends BaseChannelTree= Action { = Long oid =3D requestContext.getParamAsLong(RequestContext.ORG_ID); //grab the trusted org id passed in - Org provideOrg =3D OrgFactory.lookupById(oid); = - User user =3D UserFactory.findRandomOrgAdmin(provideOrg); + Org provideOrg =3D OrgFactory.lookupById(oid); + User user =3D requestContext.getCurrentUser(); Org org =3D requestContext.getCurrentUser().getOrg(); = /* reverse thinking here, the providing org becomes the supply org= for query diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.ja= va b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java index 2e851aa..5b677b2 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -526,9 +526,9 @@ public class ChannelManager extends BaseManager { SelectMode m =3D ModeFactory.getMode("Channel_queries", "trust_cha= nnel_consume"); = Map params =3D new HashMap(); = - params.put("org_id", org.getId()); + params.put("org_id", trustOrg.getId()); params.put("user_id", user.getId()); - params.put("org_id2", trustOrg.getId()); = + params.put("org_id2", org.getId()); DataResult dr =3D makeDataResult(params, params, lc, m); return dr; } --===============7685937507433123236==-- From shughes at fedoraproject.org Thu Aug 20 11:57:40 2015 Content-Type: multipart/mixed; boundary="===============9018310127636955545==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Wed, 17 Jun 2009 21:35:15 +0000 Message-ID: <20090617213515.13D5F1202FA@lists.fedorahosted.org> --===============9018310127636955545== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml = | 3 ++- java/code/src/com/redhat/rhn/frontend/action/multiorg/ChannelConsumeAction= .java | 7 +++++-- java/code/webapp/WEB-INF/pages/common/fragments/channel/channel_tree_syste= ms.jspf | 5 ++++- 3 files changed, 11 insertions(+), 4 deletions(-) New commits: commit 1798a9bab077e3cf2023b543165fbcc14c0b51c7 Author: Shannon Hughes Date: Wed Jun 17 17:27:52 2009 -0400 506342 - fix system count for consumed channel sharing diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_= queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel= _queries.xml index d9ab364..88cecb1 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml @@ -520,7 +520,8 @@ SELECT CFO.id, CFO.org_id, CFO.name, CFO.label, CFO.cur= rent_members, CFO.max_mem SELECT DISTINCT V.id, = - V.name, = + V.name, + 0 as accessible, V.parent_channel as parent_id, (SELECT COUNT(P.package_id) FROM rhnChannelPackage P diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/ChannelC= onsumeAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/C= hannelConsumeAction.java index 6132b1b..8e788aa 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/ChannelConsumeA= ction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/ChannelConsumeA= ction.java @@ -20,6 +20,7 @@ import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.org.OrgFactory; import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.domain.user.UserFactory; import com.redhat.rhn.frontend.action.channel.BaseChannelTreeAction; import com.redhat.rhn.frontend.listview.ListControl; import com.redhat.rhn.frontend.struts.RequestContext; @@ -39,8 +40,10 @@ public class ChannelConsumeAction extends BaseChannelTre= eAction { Long oid =3D requestContext.getParamAsLong(RequestContext.ORG_ID); //grab the trusted org id passed in Org trustOrg =3D OrgFactory.lookupById(oid); - User user =3D requestContext.getCurrentUser(); - Org org =3D user.getOrg(); + //User user =3D requestContext.getCurrentUser(); + User user =3D UserFactory.findRandomOrgAdmin(trustOrg); + //Org org =3D user.getOrg(); + Org org =3D requestContext.getCurrentUser().getOrg(); = return ChannelManager.trustChannelConsume(org, trustOrg, user, lc); } diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/channel/channe= l_tree_systems.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/chann= el/channel_tree_systems.jspf index dff3692..5162a42 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/channel/channel_tree_= systems.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/channel/channel_tree_= systems.jspf @@ -16,7 +16,10 @@ header=3D"channels.overview.systems" = usesRefactoredList=3D"true" style=3D"text-align: right;"> - ${current.systemCount} + + 0 + ${current.systemCount} + = \ No newline at end of file --===============9018310127636955545==-- From shughes at fedoraproject.org Thu Aug 20 11:57:40 2015 Content-Type: multipart/mixed; boundary="===============7950623981390356106==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Wed, 17 Jun 2009 21:36:22 +0000 Message-ID: <20090617213622.E00B91202FA@lists.fedorahosted.org> --===============7950623981390356106== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml = | 3 ++- java/code/src/com/redhat/rhn/frontend/action/multiorg/ChannelConsumeAction= .java | 7 +++++-- java/code/webapp/WEB-INF/pages/common/fragments/channel/channel_tree_syste= ms.jspf | 5 ++++- 3 files changed, 11 insertions(+), 4 deletions(-) New commits: commit 0c8e0d874d632b4aa3ba6a39bc8303690c6ea753 Author: Shannon Hughes Date: Wed Jun 17 17:27:52 2009 -0400 506342 - fix system count for consumed channel sharing diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_= queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel= _queries.xml index d9ab364..88cecb1 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries= .xml @@ -520,7 +520,8 @@ SELECT CFO.id, CFO.org_id, CFO.name, CFO.label, CFO.cur= rent_members, CFO.max_mem SELECT DISTINCT V.id, = - V.name, = + V.name, + 0 as accessible, V.parent_channel as parent_id, (SELECT COUNT(P.package_id) FROM rhnChannelPackage P diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/ChannelC= onsumeAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/C= hannelConsumeAction.java index 6132b1b..8e788aa 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/ChannelConsumeA= ction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/ChannelConsumeA= ction.java @@ -20,6 +20,7 @@ import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.org.OrgFactory; import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.domain.user.UserFactory; import com.redhat.rhn.frontend.action.channel.BaseChannelTreeAction; import com.redhat.rhn.frontend.listview.ListControl; import com.redhat.rhn.frontend.struts.RequestContext; @@ -39,8 +40,10 @@ public class ChannelConsumeAction extends BaseChannelTre= eAction { Long oid =3D requestContext.getParamAsLong(RequestContext.ORG_ID); //grab the trusted org id passed in Org trustOrg =3D OrgFactory.lookupById(oid); - User user =3D requestContext.getCurrentUser(); - Org org =3D user.getOrg(); + //User user =3D requestContext.getCurrentUser(); + User user =3D UserFactory.findRandomOrgAdmin(trustOrg); + //Org org =3D user.getOrg(); + Org org =3D requestContext.getCurrentUser().getOrg(); = return ChannelManager.trustChannelConsume(org, trustOrg, user, lc); } diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/channel/channe= l_tree_systems.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/chann= el/channel_tree_systems.jspf index dff3692..5162a42 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/channel/channel_tree_= systems.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/channel/channel_tree_= systems.jspf @@ -16,7 +16,10 @@ header=3D"channels.overview.systems" = usesRefactoredList=3D"true" style=3D"text-align: right;"> - ${current.systemCount} + + 0 + ${current.systemCount} + = \ No newline at end of file --===============7950623981390356106==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:40 2015 Content-Type: multipart/mixed; boundary="===============1246111194886650083==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: spacewalk/setup Date: Thu, 18 Jun 2009 07:46:21 +0000 Message-ID: <20090618074621.2993C120374@lists.fedorahosted.org> --===============1246111194886650083== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/setup/lib/Spacewalk/Setup.pm | 1 - 1 file changed, 1 deletion(-) New commits: commit 185df7dfe18ceb46f9bf4640cd5fd8cad5ab7e38 Author: Milan Zazrivec Date: Thu Jun 18 09:42:20 2009 +0200 Do not start embedded db during upgrade = There's no need to start embedded database before the database upgrade procedure. The database is always started later from db upgrade scripts in upgrade mode. diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/S= pacewalk/Setup.pm index a77e980..3a7a277 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -651,7 +651,6 @@ sub oracle_setup_db { my $answers =3D shift; = oracle_upgrade_setup_oratab($opts); - oracle_upgrade_start_db($opts); = print loc("* Setting up Oracle environment.\n"); = --===============1246111194886650083==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:40 2015 Content-Type: multipart/mixed; boundary="===============0020174516077659824==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - spacewalk/setup Date: Thu, 18 Jun 2009 07:47:30 +0000 Message-ID: <20090618074730.B8D90120374@lists.fedorahosted.org> --===============0020174516077659824== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/setup/lib/Spacewalk/Setup.pm | 1 - 1 file changed, 1 deletion(-) New commits: commit 64b7fd3f88554a1bfb09b813d7ae676001b11e4e Author: Milan Zazrivec Date: Thu Jun 18 09:42:20 2009 +0200 Do not start embedded db during upgrade = There's no need to start embedded database before the database upgrade procedure. The database is always started later from db upgrade scripts in upgrade mode. diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/S= pacewalk/Setup.pm index 43252ae..4d65ea4 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -651,7 +651,6 @@ sub oracle_setup_db { my $answers =3D shift; = oracle_upgrade_setup_oratab($opts); - oracle_upgrade_start_db($opts); = print loc("* Setting up Oracle environment.\n"); = --===============0020174516077659824==-- From adelton at fedoraproject.org Thu Aug 20 11:57:40 2015 Content-Type: multipart/mixed; boundary="===============4493613433787039296==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: selinux/oracle-selinux Date: Thu, 18 Jun 2009 07:50:24 +0000 Message-ID: <20090618075024.94969120374@lists.fedorahosted.org> --===============4493613433787039296== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable selinux/oracle-selinux/oracle-nofcontext-selinux-enable | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 3b5d857ed88d6309adcaf7e1d44aa4b35fc4f812 Author: Jan Pazdziora Date: Thu Jun 18 09:47:22 2009 +0200 oracle-nofcontext-selinux-enable: do semodule -l first to see if we hav= e the store. = This allows us to run the semodule -i without > /dev/null, so that erro= rs become visible. diff --git a/selinux/oracle-selinux/oracle-nofcontext-selinux-enable b/seli= nux/oracle-selinux/oracle-nofcontext-selinux-enable index 8d96d95..7d755b2 100644 --- a/selinux/oracle-selinux/oracle-nofcontext-selinux-enable +++ b/selinux/oracle-selinux/oracle-nofcontext-selinux-enable @@ -3,8 +3,9 @@ # Install SELinux policy modules for selinuxvariant in mls strict targeted do - /usr/sbin/semodule -s ${selinuxvariant} -i \ - /usr/share/selinux/${selinuxvariant}/oracle-nofcontext.pp &> /dev/nu= ll || : + /usr/sbin/semodule -s ${selinuxvariant} -l > /dev/null 2>&1 \ + && /usr/sbin/semodule -s ${selinuxvariant} -i \ + /usr/share/selinux/${selinuxvariant}/oracle-nofcontext.pp || : done = # add an oracle port if it does not already exist --===============4493613433787039296==-- From adelton at fedoraproject.org Thu Aug 20 11:57:40 2015 Content-Type: multipart/mixed; boundary="===============6589341830953929311==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - selinux/oracle-selinux Date: Thu, 18 Jun 2009 07:50:55 +0000 Message-ID: <20090618075055.E7CA0120374@lists.fedorahosted.org> --===============6589341830953929311== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable selinux/oracle-selinux/oracle-nofcontext-selinux-enable | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 8a19a9a5d5d5541aecba1bd4dac855d18f7ae57a Author: Jan Pazdziora Date: Thu Jun 18 09:47:22 2009 +0200 oracle-nofcontext-selinux-enable: do semodule -l first to see if we hav= e the store. = This allows us to run the semodule -i without > /dev/null, so that erro= rs become visible. (cherry picked from commit 3b5d857ed88d6309adcaf7e1d44aa4b35fc4f812) diff --git a/selinux/oracle-selinux/oracle-nofcontext-selinux-enable b/seli= nux/oracle-selinux/oracle-nofcontext-selinux-enable index 8d96d95..7d755b2 100644 --- a/selinux/oracle-selinux/oracle-nofcontext-selinux-enable +++ b/selinux/oracle-selinux/oracle-nofcontext-selinux-enable @@ -3,8 +3,9 @@ # Install SELinux policy modules for selinuxvariant in mls strict targeted do - /usr/sbin/semodule -s ${selinuxvariant} -i \ - /usr/share/selinux/${selinuxvariant}/oracle-nofcontext.pp &> /dev/nu= ll || : + /usr/sbin/semodule -s ${selinuxvariant} -l > /dev/null 2>&1 \ + && /usr/sbin/semodule -s ${selinuxvariant} -i \ + /usr/share/selinux/${selinuxvariant}/oracle-nofcontext.pp || : done = # add an oracle port if it does not already exist --===============6589341830953929311==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:40 2015 Content-Type: multipart/mixed; boundary="===============5566101826481404548==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: 4 commits - monitoring/SatConfig rel-eng/packages Date: Thu, 18 Jun 2009 08:07:26 +0000 Message-ID: <20090618080726.E85E212037D@lists.fedorahosted.org> --===============5566101826481404548== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable monitoring/SatConfig/general/MonitoringScout.pm | 7 +------ monitoring/SatConfig/general/SatConfig-general.spec | 5 ++++- monitoring/SatConfig/general/SysVStep.pm | 14 ++++++++++---- rel-eng/packages/SatConfig-general | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-) New commits: commit 4f7851939f9ce7df1e86f7aa7686f77be180f6f1 Author: Miroslav Such=C3=BD Date: Thu Jun 18 10:07:11 2009 +0200 Automatic commit of package [SatConfig-general] release [1.216.11-1]. diff --git a/monitoring/SatConfig/general/SatConfig-general.spec b/monitori= ng/SatConfig/general/SatConfig-general.spec index 5e78dda..9f857ca 100644 --- a/monitoring/SatConfig/general/SatConfig-general.spec +++ b/monitoring/SatConfig/general/SatConfig-general.spec @@ -2,7 +2,7 @@ %define hb_res_dir %{_sysconfdir}/ha.d/resource.d %define installed_dir %sysv_dir/installed Name: SatConfig-general -Version: 1.216.10 +Version: 1.216.11 Release: 1%{?dist} Summary: Satellite Configuration System - general setup, used by many= packages URL: https://fedorahosted.org/spacewalk @@ -61,6 +61,9 @@ ln -s ../../rc.d/np.d/hbResource $RPM_BUILD_ROOT%hb_res_d= ir/ClusterLeader rm -rf $RPM_BUILD_ROOT = %changelog +* Thu Jun 18 2009 Miroslav Such=C3=BD 1.216.11-1 +- 499564 - ignore already started/stopped service for InstallSoftwareConfig + * Fri Jun 05 2009 jesus m. rodriguez 1.216.10-1 - remove unused code (msuchy(a)redhat.com) - fix formating (msuchy(a)redhat.com) diff --git a/rel-eng/packages/SatConfig-general b/rel-eng/packages/SatConfi= g-general index 2157fe1..79a8f7c 100644 --- a/rel-eng/packages/SatConfig-general +++ b/rel-eng/packages/SatConfig-general @@ -1 +1 @@ -1.216.10-1 monitoring/SatConfig/general/ +1.216.11-1 monitoring/SatConfig/general/ commit 25b65886b80c0d7c8be19abf58e622a57f522efa Author: Miroslav Such=C3=BD Date: Thu Jun 18 10:04:48 2009 +0200 make output of start/stop of Monitoring little bit nicer diff --git a/monitoring/SatConfig/general/SysVStep.pm b/monitoring/SatConfi= g/general/SysVStep.pm index f2fa799..865e836 100644 --- a/monitoring/SatConfig/general/SysVStep.pm +++ b/monitoring/SatConfig/general/SysVStep.pm @@ -274,8 +274,11 @@ sub isRunning sub startStep { my $self =3D shift(); + $is_not_subsystem =3D -f '/etc/rc.d/init.d/'.ref($self); if ((! $self->isStarted) || $self->get_force) { + print "\t" unless $is_not_subsystem; print "Starting ", $self->get_name, " ... "; + print "\n" if $is_not_subsystem; if ($self->get_force) { $self->clearStopActions; } @@ -288,7 +291,7 @@ sub startStep } else { print "[ OK ]\n"; } - if (-f '/etc/rc.d/init.d/'.ref($self)) { + if ($is_not_subsystem) { # This is for RH "rc" script - won't kill if this isn't here open(FILE,'>/var/lock/subsys/'.ref($self)); print FILE 'running'; @@ -305,8 +308,11 @@ sub startStep sub stopStep { my $self =3D shift(); + $is_not_subsystem =3D -f '/etc/rc.d/init.d/'.ref($self); if ($self->isStarted || $self->get_force) { + print "\t" unless $is_not_subsystem; print 'Stopping ', $self->get_name, " ... "; + print "\n" if $is_not_subsystem; $self->clearLastActionErrors; $self->stopActions; $self->set_lastAction('stop'); @@ -316,7 +322,7 @@ sub stopStep } else { print "[ OK ]\n"; } - if ( -f '/var/lock/subsys/'.ref($self)) { + if ($is_not_subsystem) { # This is for RH "rc" script - won't kill if this isn't here unlink('/var/lock/subsys/'.ref($self)); } commit e088970f12b2366996a6de723357237a08ae0552 Author: Miroslav Such=C3=BD Date: Thu Jun 18 09:59:57 2009 +0200 499564 - ignore already started/stopped for InstallSoftwareConfig = It is run under both Monitoring and MonitoringScout and since it is act= ually not real service we can safely ignore it diff --git a/monitoring/SatConfig/general/SysVStep.pm b/monitoring/SatConfi= g/general/SysVStep.pm index 40c57d6..f2fa799 100644 --- a/monitoring/SatConfig/general/SysVStep.pm +++ b/monitoring/SatConfig/general/SysVStep.pm @@ -296,7 +296,7 @@ sub startStep } return $self->hasErrors; } else { - print "[ FAIL ]\n"; + print "Starting ", $self->get_name, " ... [ ALREADY RUNNING ]\n" if ($s= elf->get_name !=3D 'InstallSoftwareConfig'); $self->dprint(1,'ALREADY RUNNING'); return 1; } @@ -322,7 +322,7 @@ sub stopStep } return $self->hasErrors; } else { - print "[ FAIL ]\n"; + print "Stopping ", $self->get_name, " ... [ ALREADY STOPPED ]\n" if ($s= elf->get_name !=3D 'InstallSoftwareConfig'); $self->dprint(1,'ALREADY STOPPED'); return 1; } commit bdc486fe000f32351d049844e81cc79cd01825fd Author: Miroslav Such=C3=BD Date: Thu Jun 18 09:53:58 2009 +0200 Revert "499564 - start InstallSoftwareConfig only when it's due" = It do not work on proxy. The condition is never met, so it InstallSoftw= areConfig will never run when started as Monitoring Scout. = This reverts commit 18d0598b263ab20d04cad9d0bf6ccf001199ac84. diff --git a/monitoring/SatConfig/general/MonitoringScout.pm b/monitoring/S= atConfig/general/MonitoringScout.pm index 300980e..f4bd53d 100644 --- a/monitoring/SatConfig/general/MonitoringScout.pm +++ b/monitoring/SatConfig/general/MonitoringScout.pm @@ -51,13 +51,8 @@ sub startActions my $configIsInstalled; = if ( $startMIABServices or $startScoutServices ) { - $configIsInstalled =3D $self->addStatusModule(InstallSoftwareConfig); = - if (! $configIsInstalled) { - $configIsInstalled =3D $self->startModule(InstallSoftwareConfig); - } - - if (! $configIsInstalled ) { + if (!($configIsInstalled =3D $self->startModule(InstallSoftwareConfig)))= { $self->addError("Monitoring configuration load failed"); } } --===============5566101826481404548==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:40 2015 Content-Type: multipart/mixed; boundary="===============5178721408288845378==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/SatConfig-general-1.216.11-1' Date: Thu, 18 Jun 2009 08:07:35 +0000 Message-ID: <20090618080735.E8BAA12037D@lists.fedorahosted.org> --===============5178721408288845378== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'SatConfig-general-1.216.11-1' created by Miroslav Such=C3=BD at 2009-06-18 08:07 +0000 Tagging package [SatConfig-general] version [1.216.11-1] in directory [moni= toring/SatConfig/general/]. Changes since spacewalk-proxy-installer-0.6.15-1-9: --- 0 files changed --- --===============5178721408288845378==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:40 2015 Content-Type: multipart/mixed; boundary="===============1721908415471358908==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 3 commits - monitoring/SatConfig Date: Thu, 18 Jun 2009 08:22:54 +0000 Message-ID: <20090618082254.8B57D12037D@lists.fedorahosted.org> --===============1721908415471358908== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable monitoring/SatConfig/general/MonitoringScout.pm | 7 +------ monitoring/SatConfig/general/SysVStep.pm | 14 ++++++++++---- 2 files changed, 11 insertions(+), 10 deletions(-) New commits: commit 49d2915150baa29a4f7ca76f1b30898dd7d9eee3 Author: Miroslav Such=C3=BD Date: Thu Jun 18 10:04:48 2009 +0200 make output of start/stop of Monitoring little bit nicer (cherry picked from commit 25b65886b80c0d7c8be19abf58e622a57f522efa) diff --git a/monitoring/SatConfig/general/SysVStep.pm b/monitoring/SatConfi= g/general/SysVStep.pm index f2fa799..865e836 100644 --- a/monitoring/SatConfig/general/SysVStep.pm +++ b/monitoring/SatConfig/general/SysVStep.pm @@ -274,8 +274,11 @@ sub isRunning sub startStep { my $self =3D shift(); + $is_not_subsystem =3D -f '/etc/rc.d/init.d/'.ref($self); if ((! $self->isStarted) || $self->get_force) { + print "\t" unless $is_not_subsystem; print "Starting ", $self->get_name, " ... "; + print "\n" if $is_not_subsystem; if ($self->get_force) { $self->clearStopActions; } @@ -288,7 +291,7 @@ sub startStep } else { print "[ OK ]\n"; } - if (-f '/etc/rc.d/init.d/'.ref($self)) { + if ($is_not_subsystem) { # This is for RH "rc" script - won't kill if this isn't here open(FILE,'>/var/lock/subsys/'.ref($self)); print FILE 'running'; @@ -305,8 +308,11 @@ sub startStep sub stopStep { my $self =3D shift(); + $is_not_subsystem =3D -f '/etc/rc.d/init.d/'.ref($self); if ($self->isStarted || $self->get_force) { + print "\t" unless $is_not_subsystem; print 'Stopping ', $self->get_name, " ... "; + print "\n" if $is_not_subsystem; $self->clearLastActionErrors; $self->stopActions; $self->set_lastAction('stop'); @@ -316,7 +322,7 @@ sub stopStep } else { print "[ OK ]\n"; } - if ( -f '/var/lock/subsys/'.ref($self)) { + if ($is_not_subsystem) { # This is for RH "rc" script - won't kill if this isn't here unlink('/var/lock/subsys/'.ref($self)); } commit cfbabf967571a0774ca289f0b45f0eae99a09716 Author: Miroslav Such=C3=BD Date: Thu Jun 18 09:59:57 2009 +0200 499564 - ignore already started/stopped for InstallSoftwareConfig = It is run under both Monitoring and MonitoringScout and since it is act= ually not real service we can safely ignore it (cherry picked from commit e088970f12b2366996a6de723357237a08ae0552) diff --git a/monitoring/SatConfig/general/SysVStep.pm b/monitoring/SatConfi= g/general/SysVStep.pm index 40c57d6..f2fa799 100644 --- a/monitoring/SatConfig/general/SysVStep.pm +++ b/monitoring/SatConfig/general/SysVStep.pm @@ -296,7 +296,7 @@ sub startStep } return $self->hasErrors; } else { - print "[ FAIL ]\n"; + print "Starting ", $self->get_name, " ... [ ALREADY RUNNING ]\n" if ($s= elf->get_name !=3D 'InstallSoftwareConfig'); $self->dprint(1,'ALREADY RUNNING'); return 1; } @@ -322,7 +322,7 @@ sub stopStep } return $self->hasErrors; } else { - print "[ FAIL ]\n"; + print "Stopping ", $self->get_name, " ... [ ALREADY STOPPED ]\n" if ($s= elf->get_name !=3D 'InstallSoftwareConfig'); $self->dprint(1,'ALREADY STOPPED'); return 1; } commit 6e7965a16a43144325cd2b0ce194dbe7935e351e Author: Miroslav Such=C3=BD Date: Thu Jun 18 09:53:58 2009 +0200 Revert "499564 - start InstallSoftwareConfig only when it's due" = It do not work on proxy. The condition is never met, so it InstallSoftw= areConfig will never run when started as Monitoring Scout. = This reverts commit 18d0598b263ab20d04cad9d0bf6ccf001199ac84. (cherry picked from commit bdc486fe000f32351d049844e81cc79cd01825fd) diff --git a/monitoring/SatConfig/general/MonitoringScout.pm b/monitoring/S= atConfig/general/MonitoringScout.pm index 300980e..f4bd53d 100644 --- a/monitoring/SatConfig/general/MonitoringScout.pm +++ b/monitoring/SatConfig/general/MonitoringScout.pm @@ -51,13 +51,8 @@ sub startActions my $configIsInstalled; = if ( $startMIABServices or $startScoutServices ) { - $configIsInstalled =3D $self->addStatusModule(InstallSoftwareConfig); = - if (! $configIsInstalled) { - $configIsInstalled =3D $self->startModule(InstallSoftwareConfig); - } - - if (! $configIsInstalled ) { + if (!($configIsInstalled =3D $self->startModule(InstallSoftwareConfig)))= { $self->addError("Monitoring configuration load failed"); } } --===============1721908415471358908==-- From adelton at fedoraproject.org Thu Aug 20 11:57:40 2015 Content-Type: multipart/mixed; boundary="===============8099723271714279696==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: 8 commits - client/tools selinux/jabberd-selinux selinux/oracle-rhnsat-selinux selinux/oracle-selinux selinux/spacewalk-monitoring-selinux selinux/spacewalk-proxy-selinux selinux/spacewalk-selinux Date: Thu, 18 Jun 2009 10:08:45 +0000 Message-ID: <20090618100845.44A21120374@lists.fedorahosted.org> --===============8099723271714279696== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/osad/osad.spec | = 3 +++ selinux/jabberd-selinux/jabberd-selinux.spec | = 3 +++ selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux-enable | = 5 +++-- selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | = 3 +++ selinux/oracle-selinux/oracle-selinux.spec | = 3 +++ selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | = 3 +++ selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec | = 3 +++ selinux/spacewalk-selinux/spacewalk-selinux.spec | = 3 +++ 8 files changed, 24 insertions(+), 2 deletions(-) New commits: commit 09bba513a9d2ea32f2a559c06b3947068969439e Author: Jan Pazdziora Date: Thu Jun 18 10:33:55 2009 +0200 505606 - Require at least selinux-policy 2.4.6-80 on RHEL 5.0. = Addressing error libsepol.permission_copy_callback: Module oracle-rhnsat depends on perm= ission dccp_recv in class node, not satisfied diff --git a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec b/sel= inux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec index 7ff91c9..394f01d 100644 --- a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec +++ b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec @@ -21,6 +21,9 @@ BuildArch: noarch %if "%{selinux_policyver}" !=3D "" Requires: selinux-policy >=3D %{selinux_policyver} %endif +%if 0%{?rhel} =3D=3D 5 +Requires: selinux-policy >=3D 2.4.6-80 +%endif Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/selinuxe= nabled Requires(postun): /usr/sbin/semodule, /sbin/restorecon Requires: oracle-server >=3D 10.2.0.3 commit 3198a1279d36c670d7f8e9dae373d481f3e6c369 Author: Jan Pazdziora Date: Thu Jun 18 10:33:55 2009 +0200 505606 - Require at least selinux-policy 2.4.6-80 on RHEL 5.0. = Addressing error libsepol.permission_copy_callback: Module spacewalk-proxy depends on pe= rmission dccp_recv in class node, not satisfied diff --git a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec b= /selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec index a00dca9..744a237 100644 --- a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec +++ b/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec @@ -28,6 +28,9 @@ BuildArch: noarch %if "%{selinux_policyver}" !=3D "" Requires: selinux-policy >=3D %{selinux_policyver} %endif +%if 0%{?rhel} =3D=3D 5 +Requires: selinux-policy >=3D 2.4.6-80 +%endif Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/setseboo= l, /usr/sbin/selinuxenabled Requires(postun): /usr/sbin/semodule, /sbin/restorecon Requires: spacewalk-proxy-management commit 8cca587a8923d9f7ecb71431fb436e9d52e538f4 Author: Jan Pazdziora Date: Thu Jun 18 10:33:55 2009 +0200 505606 - Require at least selinux-policy 2.4.6-80 on RHEL 5.0. = Addressing error libsepol.permission_copy_callback: Module spacewalk depends on permissi= on dccp_recv in class node, not satisfied diff --git a/selinux/spacewalk-selinux/spacewalk-selinux.spec b/selinux/spa= cewalk-selinux/spacewalk-selinux.spec index 717b07b..c68588c 100644 --- a/selinux/spacewalk-selinux/spacewalk-selinux.spec +++ b/selinux/spacewalk-selinux/spacewalk-selinux.spec @@ -26,6 +26,9 @@ BuildArch: noarch %if "%{selinux_policyver}" !=3D "" Requires: selinux-policy >=3D %{selinux_policyver} %endif +%if 0%{?rhel} =3D=3D 5 +Requires: selinux-policy >=3D 2.4.6-80 +%endif Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/setseboo= l, /usr/sbin/semanage, /usr/sbin/selinuxenabled Requires(postun): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/semanage Requires: spacewalk-config commit f5a8986da23ee4aaf10e60599601a1b900563eeb Author: Jan Pazdziora Date: Thu Jun 18 10:33:55 2009 +0200 505606 - Require at least selinux-policy 2.4.6-80 on RHEL 5.0. = Addressing error libsepol.permission_copy_callback: Module spacewalk-monitoring depends = on permission dccp_recv in class node, not satisfied diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-seli= nux.spec b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinu= x.spec index c75dd55..32cb4c3 100644 --- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec +++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec @@ -28,6 +28,9 @@ BuildArch: noarch %if "%{selinux_policyver}" !=3D "" Requires: selinux-policy >=3D %{selinux_policyver} %endif +%if 0%{?rhel} =3D=3D 5 +Requires: selinux-policy >=3D 2.4.6-80 +%endif Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/selinuxe= nabled Requires(postun): /usr/sbin/semodule, /sbin/restorecon Requires: oracle-instantclient-selinux commit f90ce419722d038bbb95c29d2896b131fc138181 Author: Jan Pazdziora Date: Thu Jun 18 10:33:55 2009 +0200 505606 - Require at least selinux-policy 2.4.6-80 on RHEL 5.0. = Addressing error libsepol.permission_copy_callback: Module osa-dispatcher depends on per= mission dccp_recv in class node, not satisfied diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index 9abb0c5..385841b 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -77,6 +77,9 @@ Requires: spacewalk-selinux %if "%{selinux_policyver}" !=3D "" Requires: selinux-policy >=3D %{selinux_policyver} %endif +%if 0%{?rhel} =3D=3D 5 +Requires: selinux-policy >=3D 2.4.6-80 +%endif Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/selinuxena= bled Requires(postun): /usr/sbin/semodule, /sbin/restorecon Requires: osa-dispatcher commit 48b84a40d6b7bc27ff30e3a6476a2482a26d7213 Author: Jan Pazdziora Date: Thu Jun 18 10:33:55 2009 +0200 505606 - Require at least selinux-policy 2.4.6-80 on RHEL 5.0. = Addressing error libsepol.permission_copy_callback: Module jabber depends on permission = dccp_recv in class node, not satisfied diff --git a/selinux/jabberd-selinux/jabberd-selinux.spec b/selinux/jabberd= -selinux/jabberd-selinux.spec index c30869c..3ee16d7 100644 --- a/selinux/jabberd-selinux/jabberd-selinux.spec +++ b/selinux/jabberd-selinux/jabberd-selinux.spec @@ -24,6 +24,9 @@ BuildArch: noarch %if "%{selinux_policyver}" !=3D "" Requires: selinux-policy >=3D %{selinux_policyver} %endif +%if 0%{?rhel} =3D=3D 5 +Requires: selinux-policy >=3D 2.4.6-80 +%endif Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/setseboo= l, /usr/sbin/selinuxenabled Requires(postun): /usr/sbin/semodule, /sbin/restorecon Requires: jabberd commit 49d7a457607e3ae95ac77bd20667419024cf9910 Author: Jan Pazdziora Date: Thu Jun 18 10:33:55 2009 +0200 505606 - Require at least selinux-policy 2.4.6-80 on RHEL 5.0. = Addressing error libsepol.permission_copy_callback: Module oracle-nofcontext depends on = permission dccp_recv in class node, not satisfied diff --git a/selinux/oracle-selinux/oracle-selinux.spec b/selinux/oracle-se= linux/oracle-selinux.spec index 4a66248..c8485cb 100644 --- a/selinux/oracle-selinux/oracle-selinux.spec +++ b/selinux/oracle-selinux/oracle-selinux.spec @@ -49,6 +49,9 @@ Group: System Environment/Base %if "%{selinux_policyver}" !=3D "" Requires: selinux-policy >=3D %{selinux_policyver} %endif +%if 0%{?rhel} =3D=3D 5 +Requires: selinux-policy >=3D 2.4.6-80 +%endif Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/selinuxe= nabled Requires(postun): /usr/sbin/semodule, /sbin/restorecon Conflicts: oracle-selinux commit 1c99a998598723485cef26c9197005878d5fca25 Author: Jan Pazdziora Date: Thu Jun 18 09:47:22 2009 +0200 oracle-rhnsat-selinux-enable: do semodule -l first to see if we have th= e store. = This allows us to run the semodule -i without > /dev/null, so that erro= rs become visible. diff --git a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux-enable b/s= elinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux-enable index a52b5f6..0391547 100644 --- a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux-enable +++ b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux-enable @@ -3,8 +3,9 @@ # Install SELinux policy modules for selinuxvariant in mls strict targeted do - /usr/sbin/semodule -s ${selinuxvariant} -i \ - /usr/share/selinux/${selinuxvariant}/oracle-rhnsat.pp &> /dev/null |= | : + /usr/sbin/semodule -s ${selinuxvariant} -l > /dev/null 2>&1 \ + && /usr/sbin/semodule -s ${selinuxvariant} -i \ + /usr/share/selinux/${selinuxvariant}/oracle-rhnsat.pp || : done = # Fix up oracle-server-arch files --===============8099723271714279696==-- From adelton at fedoraproject.org Thu Aug 20 11:57:40 2015 Content-Type: multipart/mixed; boundary="===============2574488130332911557==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - selinux/oracle-rhnsat-selinux Date: Thu, 18 Jun 2009 10:09:21 +0000 Message-ID: <20090618100921.ED702120374@lists.fedorahosted.org> --===============2574488130332911557== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux-enable | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 069979f7ced658e7287a93e396c6003271c888dc Author: Jan Pazdziora Date: Thu Jun 18 09:47:22 2009 +0200 oracle-rhnsat-selinux-enable: do semodule -l first to see if we have th= e store. = This allows us to run the semodule -i without > /dev/null, so that erro= rs become visible. (cherry picked from commit 1c99a998598723485cef26c9197005878d5fca25) diff --git a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux-enable b/s= elinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux-enable index a52b5f6..0391547 100644 --- a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux-enable +++ b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux-enable @@ -3,8 +3,9 @@ # Install SELinux policy modules for selinuxvariant in mls strict targeted do - /usr/sbin/semodule -s ${selinuxvariant} -i \ - /usr/share/selinux/${selinuxvariant}/oracle-rhnsat.pp &> /dev/null |= | : + /usr/sbin/semodule -s ${selinuxvariant} -l > /dev/null 2>&1 \ + && /usr/sbin/semodule -s ${selinuxvariant} -i \ + /usr/share/selinux/${selinuxvariant}/oracle-rhnsat.pp || : done = # Fix up oracle-server-arch files --===============2574488130332911557==-- From adelton at fedoraproject.org Thu Aug 20 11:57:41 2015 Content-Type: multipart/mixed; boundary="===============6929681521163087899==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 4 commits - client/tools selinux/jabberd-selinux selinux/oracle-selinux selinux/spacewalk-monitoring-selinux Date: Thu, 18 Jun 2009 10:09:51 +0000 Message-ID: <20090618100951.D07AE120374@lists.fedorahosted.org> --===============6929681521163087899== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/osad/osad.spec | = 3 +++ selinux/jabberd-selinux/jabberd-selinux.spec | = 3 +++ selinux/oracle-selinux/oracle-selinux.spec | = 3 +++ selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | = 3 +++ 4 files changed, 12 insertions(+) New commits: commit c6a51eab50bccfbffcc55e2adf82720e98390316 Author: Jan Pazdziora Date: Thu Jun 18 10:33:55 2009 +0200 505606 - Require at least selinux-policy 2.4.6-80 on RHEL 5.0. = Addressing error libsepol.permission_copy_callback: Module spacewalk-monitoring depends = on permission dccp_recv in class node, not satisfied (cherry picked from commit f5a8986da23ee4aaf10e60599601a1b900563eeb) diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-seli= nux.spec b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinu= x.spec index a92c013..40a0055 100644 --- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec +++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec @@ -28,6 +28,9 @@ BuildArch: noarch %if "%{selinux_policyver}" !=3D "" Requires: selinux-policy >=3D %{selinux_policyver} %endif +%if 0%{?rhel} =3D=3D 5 +Requires: selinux-policy >=3D 2.4.6-80 +%endif Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/selinuxe= nabled Requires(postun): /usr/sbin/semodule, /sbin/restorecon Requires: oracle-instantclient-selinux commit 210a155703963c949be0200f07e865c2e668798a Author: Jan Pazdziora Date: Thu Jun 18 10:33:55 2009 +0200 505606 - Require at least selinux-policy 2.4.6-80 on RHEL 5.0. = Addressing error libsepol.permission_copy_callback: Module osa-dispatcher depends on per= mission dccp_recv in class node, not satisfied (cherry picked from commit f90ce419722d038bbb95c29d2896b131fc138181) diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index 08293df..b3abc03 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -77,6 +77,9 @@ Requires: spacewalk-selinux %if "%{selinux_policyver}" !=3D "" Requires: selinux-policy >=3D %{selinux_policyver} %endif +%if 0%{?rhel} =3D=3D 5 +Requires: selinux-policy >=3D 2.4.6-80 +%endif Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/selinuxena= bled Requires(postun): /usr/sbin/semodule, /sbin/restorecon Requires: osa-dispatcher commit eccc2e890495acea6da20257b4bf865b4b108013 Author: Jan Pazdziora Date: Thu Jun 18 10:33:55 2009 +0200 505606 - Require at least selinux-policy 2.4.6-80 on RHEL 5.0. = Addressing error libsepol.permission_copy_callback: Module jabber depends on permission = dccp_recv in class node, not satisfied (cherry picked from commit 48b84a40d6b7bc27ff30e3a6476a2482a26d7213) diff --git a/selinux/jabberd-selinux/jabberd-selinux.spec b/selinux/jabberd= -selinux/jabberd-selinux.spec index 1562418..fce1211 100644 --- a/selinux/jabberd-selinux/jabberd-selinux.spec +++ b/selinux/jabberd-selinux/jabberd-selinux.spec @@ -24,6 +24,9 @@ BuildArch: noarch %if "%{selinux_policyver}" !=3D "" Requires: selinux-policy >=3D %{selinux_policyver} %endif +%if 0%{?rhel} =3D=3D 5 +Requires: selinux-policy >=3D 2.4.6-80 +%endif Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/setseboo= l, /usr/sbin/selinuxenabled Requires(postun): /usr/sbin/semodule, /sbin/restorecon Requires: jabberd commit f6a5f413b4430e6ba9329fa249500b4e0a3f884d Author: Jan Pazdziora Date: Thu Jun 18 10:33:55 2009 +0200 505606 - Require at least selinux-policy 2.4.6-80 on RHEL 5.0. = Addressing error libsepol.permission_copy_callback: Module oracle-nofcontext depends on = permission dccp_recv in class node, not satisfied (cherry picked from commit 49d7a457607e3ae95ac77bd20667419024cf9910) diff --git a/selinux/oracle-selinux/oracle-selinux.spec b/selinux/oracle-se= linux/oracle-selinux.spec index fb239ed..35b96c8 100644 --- a/selinux/oracle-selinux/oracle-selinux.spec +++ b/selinux/oracle-selinux/oracle-selinux.spec @@ -49,6 +49,9 @@ Group: System Environment/Base %if "%{selinux_policyver}" !=3D "" Requires: selinux-policy >=3D %{selinux_policyver} %endif +%if 0%{?rhel} =3D=3D 5 +Requires: selinux-policy >=3D 2.4.6-80 +%endif Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/selinuxe= nabled Requires(postun): /usr/sbin/semodule, /sbin/restorecon Conflicts: oracle-selinux --===============6929681521163087899==-- From adelton at fedoraproject.org Thu Aug 20 11:57:41 2015 Content-Type: multipart/mixed; boundary="===============3090975862689051169==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 3 commits - selinux/oracle-rhnsat-selinux selinux/spacewalk-proxy-selinux selinux/spacewalk-selinux Date: Thu, 18 Jun 2009 10:10:17 +0000 Message-ID: <20090618101017.7FAA0120374@lists.fedorahosted.org> --===============3090975862689051169== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | 3 +++ selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec | 3 +++ selinux/spacewalk-selinux/spacewalk-selinux.spec | 3 +++ 3 files changed, 9 insertions(+) New commits: commit 06fed2b84e3648f22a075ea5e395481d5d6daa04 Author: Jan Pazdziora Date: Thu Jun 18 10:33:55 2009 +0200 505606 - Require at least selinux-policy 2.4.6-80 on RHEL 5.0. = Addressing error libsepol.permission_copy_callback: Module oracle-rhnsat depends on perm= ission dccp_recv in class node, not satisfied (cherry picked from commit 09bba513a9d2ea32f2a559c06b3947068969439e) diff --git a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec b/sel= inux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec index ecc991d..3177f78 100644 --- a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec +++ b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec @@ -21,6 +21,9 @@ BuildArch: noarch %if "%{selinux_policyver}" !=3D "" Requires: selinux-policy >=3D %{selinux_policyver} %endif +%if 0%{?rhel} =3D=3D 5 +Requires: selinux-policy >=3D 2.4.6-80 +%endif Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/selinuxe= nabled Requires(postun): /usr/sbin/semodule, /sbin/restorecon Requires: oracle-server >=3D 10.2.0.3 commit 3e636050e2bf4d1d47a7f2c1e2d1914285358126 Author: Jan Pazdziora Date: Thu Jun 18 10:33:55 2009 +0200 505606 - Require at least selinux-policy 2.4.6-80 on RHEL 5.0. = Addressing error libsepol.permission_copy_callback: Module spacewalk-proxy depends on pe= rmission dccp_recv in class node, not satisfied (cherry picked from commit 3198a1279d36c670d7f8e9dae373d481f3e6c369) diff --git a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec b= /selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec index 395310f..9515dde 100644 --- a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec +++ b/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec @@ -28,6 +28,9 @@ BuildArch: noarch %if "%{selinux_policyver}" !=3D "" Requires: selinux-policy >=3D %{selinux_policyver} %endif +%if 0%{?rhel} =3D=3D 5 +Requires: selinux-policy >=3D 2.4.6-80 +%endif Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/setseboo= l, /usr/sbin/selinuxenabled Requires(postun): /usr/sbin/semodule, /sbin/restorecon Requires: spacewalk-proxy-management commit a959c25ecefef372235f006f438b3fffa83474a7 Author: Jan Pazdziora Date: Thu Jun 18 10:33:55 2009 +0200 505606 - Require at least selinux-policy 2.4.6-80 on RHEL 5.0. = Addressing error libsepol.permission_copy_callback: Module spacewalk depends on permissi= on dccp_recv in class node, not satisfied (cherry picked from commit 8cca587a8923d9f7ecb71431fb436e9d52e538f4) diff --git a/selinux/spacewalk-selinux/spacewalk-selinux.spec b/selinux/spa= cewalk-selinux/spacewalk-selinux.spec index 875a2f0..04a59e9 100644 --- a/selinux/spacewalk-selinux/spacewalk-selinux.spec +++ b/selinux/spacewalk-selinux/spacewalk-selinux.spec @@ -26,6 +26,9 @@ BuildArch: noarch %if "%{selinux_policyver}" !=3D "" Requires: selinux-policy >=3D %{selinux_policyver} %endif +%if 0%{?rhel} =3D=3D 5 +Requires: selinux-policy >=3D 2.4.6-80 +%endif Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/setseboo= l, /usr/sbin/semanage, /usr/sbin/selinuxenabled Requires(postun): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/semanage Requires: spacewalk-config --===============3090975862689051169==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:41 2015 Content-Type: multipart/mixed; boundary="===============8964710453144131641==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - monitoring/nocpulse-common monitoring/SputLite Date: Thu, 18 Jun 2009 10:16:29 +0000 Message-ID: <20090618101629.5BCDB12037D@lists.fedorahosted.org> --===============8964710453144131641== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable monitoring/SputLite/SputLite.spec | 4 +++- monitoring/nocpulse-common/nocpulse-common.spec | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) New commits: commit c5ee5dca89a858508ad330c23aab5db360412e4f Author: Milan Zazrivec Date: Thu Jun 18 11:39:12 2009 +0200 Don't move execute_commands.log to /var/log/nocpulse = /home/nocpulse/var/commands/execute_commands.log is a symlink already pointing to /var/log/nocpulse/execute_commands.log diff --git a/monitoring/SputLite/SputLite.spec b/monitoring/SputLite/SputLi= te.spec index be7d2ec..fe920dc 100644 --- a/monitoring/SputLite/SputLite.spec +++ b/monitoring/SputLite/SputLite.spec @@ -75,7 +75,9 @@ mkdir -p $RPM_BUILD_ROOT%vardir/queue/commands = %post client if [ $1 -eq 2 ]; then - ls /home/nocpulse/var/commands/* 2>/dev/null | xargs -I file mv file %{v= ardir}/commands + ls /home/nocpulse/var/commands/heartbeat 2>/dev/null | xargs -I file mv = file %{vardir}/commands + ls /home/nocpulse/var/commands/last_completed 2>/dev/null | xargs -I fil= e mv file %{vardir}/commands + ls /home/nocpulse/var/commands/last_started 2>/dev/null | xargs -I file = mv file %{vardir}/commands fi = %files server commit ea772d3ecf2acfb445bc6de3820167cabe05ba90 Author: Milan Zazrivec Date: Thu Jun 18 11:18:10 2009 +0200 Don't to migrate log files from /home/nocpulse/var = These are in fact symlinks pointing to log files in /var/log/nocpulse diff --git a/monitoring/nocpulse-common/nocpulse-common.spec b/monitoring/n= ocpulse-common/nocpulse-common.spec index f9377ea..faca814 100644 --- a/monitoring/nocpulse-common/nocpulse-common.spec +++ b/monitoring/nocpulse-common/nocpulse-common.spec @@ -108,8 +108,8 @@ if [ `getent passwd nocpulse|awk -F ':' '{ print $6 }'`= =3D "/home/nocpulse" ]; th mv /home/nocpulse/.bash* /home/nocpulse/var/*.db \ /home/nocpulse/var/scheduler.xml /home/nocpulse/var/events.frozen \ %{_var}/lib/%{package_name} - # log files into /var/log/nocpulse - mv /home/nocpulse/var/*.log /home/nocpulse/var/archives/* \ + # archive of log files into /var/log/nocpulse + mv /home/nocpulse/var/archives/* \ %{_var}/log/%{package_name} 2> /dev/null fi = --===============8964710453144131641==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:41 2015 Content-Type: multipart/mixed; boundary="===============6837636029655979432==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 2 commits - monitoring/nocpulse-common monitoring/SputLite Date: Thu, 18 Jun 2009 10:18:14 +0000 Message-ID: <20090618101814.9261A120374@lists.fedorahosted.org> --===============6837636029655979432== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable monitoring/SputLite/SputLite.spec | 4 +++- monitoring/nocpulse-common/nocpulse-common.spec | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) New commits: commit 0814d71b6c5a0af3c35c941195561ec492353f07 Author: Milan Zazrivec Date: Thu Jun 18 11:39:12 2009 +0200 Don't move execute_commands.log to /var/log/nocpulse = /home/nocpulse/var/commands/execute_commands.log is a symlink already pointing to /var/log/nocpulse/execute_commands.log diff --git a/monitoring/SputLite/SputLite.spec b/monitoring/SputLite/SputLi= te.spec index ec6a2d5..ebe62d7 100644 --- a/monitoring/SputLite/SputLite.spec +++ b/monitoring/SputLite/SputLite.spec @@ -75,7 +75,9 @@ mkdir -p $RPM_BUILD_ROOT%vardir/queue/commands = %post client if [ $1 -eq 2 ]; then - ls /home/nocpulse/var/commands/* 2>/dev/null | xargs -I file mv file %{v= ardir}/commands + ls /home/nocpulse/var/commands/heartbeat 2>/dev/null | xargs -I file mv = file %{vardir}/commands + ls /home/nocpulse/var/commands/last_completed 2>/dev/null | xargs -I fil= e mv file %{vardir}/commands + ls /home/nocpulse/var/commands/last_started 2>/dev/null | xargs -I file = mv file %{vardir}/commands fi = %files server commit f021eb13b27a1a73acf15b1cd3639205a1ebc570 Author: Milan Zazrivec Date: Thu Jun 18 11:18:10 2009 +0200 Don't to migrate log files from /home/nocpulse/var = These are in fact symlinks pointing to log files in /var/log/nocpulse diff --git a/monitoring/nocpulse-common/nocpulse-common.spec b/monitoring/n= ocpulse-common/nocpulse-common.spec index a5673be..d3c1ed0 100644 --- a/monitoring/nocpulse-common/nocpulse-common.spec +++ b/monitoring/nocpulse-common/nocpulse-common.spec @@ -108,8 +108,8 @@ if [ `getent passwd nocpulse|awk -F ':' '{ print $6 }'`= =3D "/home/nocpulse" ]; th mv /home/nocpulse/.bash* /home/nocpulse/var/*.db \ /home/nocpulse/var/scheduler.xml /home/nocpulse/var/events.frozen \ %{_var}/lib/%{package_name} - # log files into /var/log/nocpulse - mv /home/nocpulse/var/*.log /home/nocpulse/var/archives/* \ + # archive of log files into /var/log/nocpulse + mv /home/nocpulse/var/archives/* \ %{_var}/log/%{package_name} 2> /dev/null fi = --===============6837636029655979432==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:41 2015 Content-Type: multipart/mixed; boundary="===============0833849618492229632==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: monitoring/nocpulse-common Date: Thu, 18 Jun 2009 12:19:01 +0000 Message-ID: <20090618121901.638E9120194@lists.fedorahosted.org> --===============0833849618492229632== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable monitoring/nocpulse-common/nocpulse-common.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 740737f3f09fe92e0b3986cb7ee6d01c0fd2b8be Author: Milan Zazrivec Date: Thu Jun 18 14:17:52 2009 +0200 don't print error when files to be moved don't exist diff --git a/monitoring/nocpulse-common/nocpulse-common.spec b/monitoring/n= ocpulse-common/nocpulse-common.spec index faca814..d279b9f 100644 --- a/monitoring/nocpulse-common/nocpulse-common.spec +++ b/monitoring/nocpulse-common/nocpulse-common.spec @@ -107,7 +107,7 @@ if [ `getent passwd nocpulse|awk -F ':' '{ print $6 }'`= =3D "/home/nocpulse" ]; th mv /home/nocpulse/.ssh/* %{_var}/lib/%{package_name}/.ssh mv /home/nocpulse/.bash* /home/nocpulse/var/*.db \ /home/nocpulse/var/scheduler.xml /home/nocpulse/var/events.frozen \ - %{_var}/lib/%{package_name} + %{_var}/lib/%{package_name} 2>/dev/null # archive of log files into /var/log/nocpulse mv /home/nocpulse/var/archives/* \ %{_var}/log/%{package_name} 2> /dev/null --===============0833849618492229632==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:41 2015 Content-Type: multipart/mixed; boundary="===============0510510180400647362==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - monitoring/nocpulse-common Date: Thu, 18 Jun 2009 12:19:40 +0000 Message-ID: <20090618121940.22928120194@lists.fedorahosted.org> --===============0510510180400647362== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable monitoring/nocpulse-common/nocpulse-common.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7a48d1336dea0950d0cfa36110d5da1390c67382 Author: Milan Zazrivec Date: Thu Jun 18 14:17:52 2009 +0200 don't print error when files to be moved don't exist diff --git a/monitoring/nocpulse-common/nocpulse-common.spec b/monitoring/n= ocpulse-common/nocpulse-common.spec index d3c1ed0..aab610e 100644 --- a/monitoring/nocpulse-common/nocpulse-common.spec +++ b/monitoring/nocpulse-common/nocpulse-common.spec @@ -107,7 +107,7 @@ if [ `getent passwd nocpulse|awk -F ':' '{ print $6 }'`= =3D "/home/nocpulse" ]; th mv /home/nocpulse/.ssh/* %{_var}/lib/%{package_name}/.ssh mv /home/nocpulse/.bash* /home/nocpulse/var/*.db \ /home/nocpulse/var/scheduler.xml /home/nocpulse/var/events.frozen \ - %{_var}/lib/%{package_name} + %{_var}/lib/%{package_name} 2>/dev/null # archive of log files into /var/log/nocpulse mv /home/nocpulse/var/archives/* \ %{_var}/log/%{package_name} 2> /dev/null --===============0510510180400647362==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:41 2015 Content-Type: multipart/mixed; boundary="===============1289018640450530880==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Thu, 18 Jun 2009 12:29:35 +0000 Message-ID: <20090618122935.DCDC1120194@lists.fedorahosted.org> --===============1289018640450530880== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java = | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 15ff12d77c0bac740a06f6717c820989eda0728f Author: Devan Goodwin Date: Thu Jun 18 09:27:17 2009 -0300 Attempt to fix ChannelManagerTest.testListErrata. = Suspect the timespan being used isn't quite long enough for a slow run sometimes, thus why this test seems to fail intermittently. diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManag= erTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelMana= gerTest.java index f7a496f..9783da3 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java +++ b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java @@ -308,7 +308,7 @@ public class ChannelManagerTest extends BaseTestCaseWit= hUser { = found =3D false; Date date =3D new Date(); - errata =3D ChannelManager.listErrata(c, new Date(date.getTime() - = 1000), null, user); + errata =3D ChannelManager.listErrata(c, new Date(date.getTime() - = 100000), null, user); for (ErrataOverview eo : errata) { if (eo.getId().equals(e.getId())) { found =3D true; @@ -317,7 +317,7 @@ public class ChannelManagerTest extends BaseTestCaseWit= hUser { assertTrue(found); = found =3D false; - errata =3D ChannelManager.listErrata(c, new Date(date.getTime() - = 1000), + errata =3D ChannelManager.listErrata(c, new Date(date.getTime() - = 100000), new Date(date.getTime() + 5000000), us= er); for (ErrataOverview eo : errata) { if (eo.getId().equals(e.getId())) { --===============1289018640450530880==-- From adelton at fedoraproject.org Thu Aug 20 11:57:41 2015 Content-Type: multipart/mixed; boundary="===============8505923486389756214==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - client/tools selinux/jabberd-selinux Date: Thu, 18 Jun 2009 13:19:47 +0000 Message-ID: <20090618131947.94F3B120194@lists.fedorahosted.org> --===============8505923486389756214== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/osad/osad.spec | 2 +- selinux/jabberd-selinux/jabberd-selinux.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 4120e99c724e4adaf95496a4e7c23647f789fe8f Author: Jan Pazdziora Date: Thu Jun 18 15:13:39 2009 +0200 505606 - Require at least selinux-policy 2.4.6-114. = Addressing error libsepol.print_missing_requirements: osa-dispatcher's global requiremen= ts were not met: type/attribute netlabel_peer_t diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index 385841b..286081d 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -78,7 +78,7 @@ Requires: spacewalk-selinux Requires: selinux-policy >=3D %{selinux_policyver} %endif %if 0%{?rhel} =3D=3D 5 -Requires: selinux-policy >=3D 2.4.6-80 +Requires: selinux-policy >=3D 2.4.6-114 %endif Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/selinuxena= bled Requires(postun): /usr/sbin/semodule, /sbin/restorecon commit 2d879d3a14778c3d1576b1eef28535e6fcfa74c7 Author: Jan Pazdziora Date: Thu Jun 18 14:27:48 2009 +0200 505606 - Require at least selinux-policy 2.4.6-114. = Addressing error libsepol.print_missing_requirements: jabber's global requirements were = not met: type/attribute initscript diff --git a/selinux/jabberd-selinux/jabberd-selinux.spec b/selinux/jabberd= -selinux/jabberd-selinux.spec index 3ee16d7..7098772 100644 --- a/selinux/jabberd-selinux/jabberd-selinux.spec +++ b/selinux/jabberd-selinux/jabberd-selinux.spec @@ -25,7 +25,7 @@ BuildArch: noarch Requires: selinux-policy >=3D %{selinux_policyver} %endif %if 0%{?rhel} =3D=3D 5 -Requires: selinux-policy >=3D 2.4.6-80 +Requires: selinux-policy >=3D 2.4.6-114 %endif Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/setseboo= l, /usr/sbin/selinuxenabled Requires(postun): /usr/sbin/semodule, /sbin/restorecon --===============8505923486389756214==-- From adelton at fedoraproject.org Thu Aug 20 11:57:41 2015 Content-Type: multipart/mixed; boundary="===============4807155613472146054==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 2 commits - client/tools selinux/jabberd-selinux Date: Thu, 18 Jun 2009 13:20:55 +0000 Message-ID: <20090618132055.AA08F120194@lists.fedorahosted.org> --===============4807155613472146054== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/osad/osad.spec | 2 +- selinux/jabberd-selinux/jabberd-selinux.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 85bfca3d323ae0b7441af0c4f3a3bd800cd66053 Author: Jan Pazdziora Date: Thu Jun 18 15:13:39 2009 +0200 505606 - Require at least selinux-policy 2.4.6-114. = Addressing error libsepol.print_missing_requirements: osa-dispatcher's global requiremen= ts were not met: type/attribute netlabel_peer_t (cherry picked from commit 4120e99c724e4adaf95496a4e7c23647f789fe8f) diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index b3abc03..3c85aed 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -78,7 +78,7 @@ Requires: spacewalk-selinux Requires: selinux-policy >=3D %{selinux_policyver} %endif %if 0%{?rhel} =3D=3D 5 -Requires: selinux-policy >=3D 2.4.6-80 +Requires: selinux-policy >=3D 2.4.6-114 %endif Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/selinuxena= bled Requires(postun): /usr/sbin/semodule, /sbin/restorecon commit 8c44a173abc3f14fe187d88721d64916563fb746 Author: Jan Pazdziora Date: Thu Jun 18 14:27:48 2009 +0200 505606 - Require at least selinux-policy 2.4.6-114. = Addressing error libsepol.print_missing_requirements: jabber's global requirements were = not met: type/attribute initscript (cherry picked from commit 2d879d3a14778c3d1576b1eef28535e6fcfa74c7) diff --git a/selinux/jabberd-selinux/jabberd-selinux.spec b/selinux/jabberd= -selinux/jabberd-selinux.spec index fce1211..5a6373f 100644 --- a/selinux/jabberd-selinux/jabberd-selinux.spec +++ b/selinux/jabberd-selinux/jabberd-selinux.spec @@ -25,7 +25,7 @@ BuildArch: noarch Requires: selinux-policy >=3D %{selinux_policyver} %endif %if 0%{?rhel} =3D=3D 5 -Requires: selinux-policy >=3D 2.4.6-80 +Requires: selinux-policy >=3D 2.4.6-114 %endif Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/setseboo= l, /usr/sbin/selinuxenabled Requires(postun): /usr/sbin/semodule, /sbin/restorecon --===============4807155613472146054==-- From adelton at fedoraproject.org Thu Aug 20 11:57:41 2015 Content-Type: multipart/mixed; boundary="===============4397440572466187246==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: client/tools rel-eng/packages Date: Thu, 18 Jun 2009 13:27:49 +0000 Message-ID: <20090618132749.EF70A120194@lists.fedorahosted.org> --===============4397440572466187246== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/osad/osad.spec | 5 ++++- rel-eng/packages/osad | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 6b3cf418cdd927c7e0e3073ba02e4d41ec109736 Author: Jan Pazdziora Date: Thu Jun 18 15:27:29 2009 +0200 Automatic commit of package [osad] release [5.9.14-1]. diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index 286081d..e746176 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -9,7 +9,7 @@ Group: System Environment/Daemons License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz -Version: 5.9.13 +Version: 5.9.14 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -236,6 +236,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -r= vvi {} = # $Id$ %changelog +* Thu Jun 18 2009 Jan Pazdziora 5.9.14-1 +- 505606 - Require at least selinux-policy 2.4.6-114 + * Mon Jun 15 2009 Miroslav Suchy 5.9.13-1 - 498611 - run restorecon in %%posttrans - 498611 - run "semodule -i" in %%post and restorecon in %%posttrans diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad index bd219ae..253e469 100644 --- a/rel-eng/packages/osad +++ b/rel-eng/packages/osad @@ -1 +1 @@ -5.9.13-1 client/tools/osad/ +5.9.14-1 client/tools/osad/ --===============4397440572466187246==-- From adelton at fedoraproject.org Thu Aug 20 11:57:41 2015 Content-Type: multipart/mixed; boundary="===============2642837405795928446==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/osad-5.9.14-1' Date: Thu, 18 Jun 2009 13:27:56 +0000 Message-ID: <20090618132756.7C6BD120194@lists.fedorahosted.org> --===============2642837405795928446== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'osad-5.9.14-1' created by Jan Pazdziora at 2= 009-06-18 13:27 +0000 Tagging package [osad] version [5.9.14-1] in directory [client/tools/osad/]. Changes since SatConfig: --- 0 files changed --- --===============2642837405795928446==-- From adelton at fedoraproject.org Thu Aug 20 11:57:41 2015 Content-Type: multipart/mixed; boundary="===============0489879247055486182==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-selinux-0.6.7-1' Date: Thu, 18 Jun 2009 13:27:56 +0000 Message-ID: <20090618132756.DE6511201BB@lists.fedorahosted.org> --===============0489879247055486182== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-selinux-0.6.7-1' created by Jan Pazdziora at 2009-05-27 08:55 +0000 Tagging package [spacewalk-selinux] version [0.6.7-1] in directory [selinux= /spacewalk-selinux/]. Changes since spacewalk-setup-0.6.7-1-2: --- 0 files changed --- --===============0489879247055486182==-- From adelton at fedoraproject.org Thu Aug 20 11:57:41 2015 Content-Type: multipart/mixed; boundary="===============5368314206373070315==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: rel-eng/packages selinux/jabberd-selinux Date: Thu, 18 Jun 2009 13:29:12 +0000 Message-ID: <20090618132912.68A2D120194@lists.fedorahosted.org> --===============5368314206373070315== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/jabberd-selinux | 2 +- selinux/jabberd-selinux/jabberd-selinux.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 49bfbf0637495fb3b6c3c6dba51348f28a69a784 Author: Jan Pazdziora Date: Thu Jun 18 15:28:47 2009 +0200 Automatic commit of package [jabberd-selinux] release [1.4.6-1]. diff --git a/rel-eng/packages/jabberd-selinux b/rel-eng/packages/jabberd-se= linux index ebe9b5c..779ef0c 100644 --- a/rel-eng/packages/jabberd-selinux +++ b/rel-eng/packages/jabberd-selinux @@ -1 +1 @@ -1.4.5-1 selinux/jabberd-selinux/ +1.4.6-1 selinux/jabberd-selinux/ diff --git a/selinux/jabberd-selinux/jabberd-selinux.spec b/selinux/jabberd= -selinux/jabberd-selinux.spec index 7098772..0e83b58 100644 --- a/selinux/jabberd-selinux/jabberd-selinux.spec +++ b/selinux/jabberd-selinux/jabberd-selinux.spec @@ -7,7 +7,7 @@ %define modulename jabber = Name: jabberd-selinux -Version: 1.4.5 +Version: 1.4.6 Release: 1%{?dist} Summary: SELinux policy module supporting jabberd = @@ -108,6 +108,9 @@ rpm -ql jabberd | xargs -n 1 /sbin/restorecon -ri {} ||= : %attr(0755,root,root) %{_sbindir}/%{name}-enable = %changelog +* Thu Jun 18 2009 Jan Pazdziora 1.4.6-1 +- 505606 - Require at least selinux-policy 2.4.6-114 + * Mon Jun 15 2009 Miroslav Suchy 1.4.5-1 - 498611 - run "semodule -i" in %%post and restorecon in %%posttrans = --===============5368314206373070315==-- From adelton at fedoraproject.org Thu Aug 20 11:57:41 2015 Content-Type: multipart/mixed; boundary="===============0905052502779478385==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/jabberd-selinux-1.4.6-1' Date: Thu, 18 Jun 2009 13:29:17 +0000 Message-ID: <20090618132917.2B58B120269@lists.fedorahosted.org> --===============0905052502779478385== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'jabberd-selinux-1.4.6-1' created by Jan Pazdziora at 2009-06-18 13:28 +0000 Tagging package [jabberd-selinux] version [1.4.6-1] in directory [selinux/j= abberd-selinux/]. Changes since osad-5.9.14-1: Jan Pazdziora (1): Automatic commit of package [jabberd-selinux] release [1.4.6-1]. --- rel-eng/packages/jabberd-selinux | 2 +- selinux/jabberd-selinux/jabberd-selinux.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) --- --===============0905052502779478385==-- From adelton at fedoraproject.org Thu Aug 20 11:57:41 2015 Content-Type: multipart/mixed; boundary="===============0949774738534563037==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: rel-eng/packages selinux/oracle-selinux Date: Thu, 18 Jun 2009 13:32:46 +0000 Message-ID: <20090618133246.2304D120194@lists.fedorahosted.org> --===============0949774738534563037== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/oracle-selinux | 2 +- selinux/oracle-selinux/oracle-selinux.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) New commits: commit a1de55a394de2748439840efaa8004e7f7302a78 Author: Jan Pazdziora Date: Thu Jun 18 15:32:33 2009 +0200 Automatic commit of package [oracle-selinux] minor release [0.1-23.9]. diff --git a/rel-eng/packages/oracle-selinux b/rel-eng/packages/oracle-seli= nux index d367898..69cb95f 100644 --- a/rel-eng/packages/oracle-selinux +++ b/rel-eng/packages/oracle-selinux @@ -1 +1 @@ -0.3-1 selinux/oracle-selinux/ +0.1-23.9 selinux/oracle-selinux/ diff --git a/selinux/oracle-selinux/oracle-selinux.spec b/selinux/oracle-se= linux/oracle-selinux.spec index c8485cb..d3cfc23 100644 --- a/selinux/oracle-selinux/oracle-selinux.spec +++ b/selinux/oracle-selinux/oracle-selinux.spec @@ -19,8 +19,8 @@ %endif = Name: oracle-selinux -Version: 0.3 -Release: 1%{?obtag}%{?dist}%{?repo} +Version: 0.1 +Release: 23.9%{?obtag}%{?dist}%{?repo} Summary: SELinux policy module supporting Oracle Group: System Environment/Base License: GPLv2+ @@ -205,6 +205,10 @@ fi %attr(0755,root,root) %{_sbindir}/oracle-nofcontext-selinux-enable = %changelog +* Thu Jun 18 2009 Jan Pazdziora 0.1-23.9 +- 505606 - Require at least selinux-policy 2.4.6-80 +- do semodule -l first to see if we have the store + * Mon Jun 15 2009 Miroslav Suchy 0.3-1 - 498611 - run "semodule -i" in %%post and restorecon in %%posttrans = --===============0949774738534563037==-- From adelton at fedoraproject.org Thu Aug 20 11:57:41 2015 Content-Type: multipart/mixed; boundary="===============3820200453164488020==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/oracle-selinux-0.1-23.9' Date: Thu, 18 Jun 2009 13:32:50 +0000 Message-ID: <20090618133250.9A990120269@lists.fedorahosted.org> --===============3820200453164488020== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'oracle-selinux-0.1-23.9' created by Jan Pazdziora at 2009-06-18 13:32 +0000 Tagging package [oracle-selinux] version [0.1-23.9] in directory [selinux/o= racle-selinux/]. Changes since jabberd-selinux-1.4.6-1: Jan Pazdziora (1): Automatic commit of package [oracle-selinux] minor release [0.1-23.9]. --- rel-eng/packages/oracle-selinux | 2 +- selinux/oracle-selinux/oracle-selinux.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) --- --===============3820200453164488020==-- From adelton at fedoraproject.org Thu Aug 20 11:57:41 2015 Content-Type: multipart/mixed; boundary="===============1782331305330363928==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: rel-eng/packages selinux/oracle-rhnsat-selinux Date: Thu, 18 Jun 2009 13:33:39 +0000 Message-ID: <20090618133339.C8E96120194@lists.fedorahosted.org> --===============1782331305330363928== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/oracle-rhnsat-selinux | 2 +- selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit de2a52a1f7a334279f77efbdb24dff1af7db98b0 Author: Jan Pazdziora Date: Thu Jun 18 15:33:30 2009 +0200 Automatic commit of package [oracle-rhnsat-selinux] minor release [10.2= -14]. diff --git a/rel-eng/packages/oracle-rhnsat-selinux b/rel-eng/packages/orac= le-rhnsat-selinux index 8889687..65370d7 100644 --- a/rel-eng/packages/oracle-rhnsat-selinux +++ b/rel-eng/packages/oracle-rhnsat-selinux @@ -1 +1 @@ -10.2-13 selinux/oracle-rhnsat-selinux/ +10.2-14 selinux/oracle-rhnsat-selinux/ diff --git a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec b/sel= inux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec index 394f01d..239054c 100644 --- a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec +++ b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec @@ -6,7 +6,7 @@ = Name: oracle-rhnsat-selinux Version: 10.2 -Release: 13%{?dist} +Release: 14%{?dist} Summary: SELinux policy module supporting Oracle Group: System Environment/Base License: GPLv2+ @@ -115,6 +115,10 @@ fi %attr(0755,root,root) %{_sbindir}/%{name}-enable = %changelog +* Thu Jun 18 2009 Jan Pazdziora 10.2-14 +- 505606 - Require at least selinux-policy 2.4.6-80 +- do semodule -l first to see if we have the store + * Mon Jun 15 2009 Miroslav Suchy 10.2-13 - 498611 - run "semodule -i" in %%post and restorecon in %%posttrans = --===============1782331305330363928==-- From adelton at fedoraproject.org Thu Aug 20 11:57:41 2015 Content-Type: multipart/mixed; boundary="===============2538391096909676129==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/oracle-rhnsat-selinux-10.2-14' Date: Thu, 18 Jun 2009 13:33:44 +0000 Message-ID: <20090618133344.4687F120194@lists.fedorahosted.org> --===============2538391096909676129== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'oracle-rhnsat-selinux-10.2-14' created by Jan Pazdziora at 2009-06-18 13:33 +0000 Tagging package [oracle-rhnsat-selinux] version [10.2-14] in directory [sel= inux/oracle-rhnsat-selinux/]. Changes since oracle-selinux-0.1-23.9: Jan Pazdziora (1): Automatic commit of package [oracle-rhnsat-selinux] minor release [10= .2-14]. --- rel-eng/packages/oracle-rhnsat-selinux | 2 +- selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) --- --===============2538391096909676129==-- From adelton at fedoraproject.org Thu Aug 20 11:57:41 2015 Content-Type: multipart/mixed; boundary="===============1507069429347552605==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: rel-eng/packages selinux/spacewalk-selinux Date: Thu, 18 Jun 2009 13:34:08 +0000 Message-ID: <20090618133408.E9ACE120194@lists.fedorahosted.org> --===============1507069429347552605== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/spacewalk-selinux | 2 +- selinux/spacewalk-selinux/spacewalk-selinux.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit a6243ded02758edc294e4f4616450ebd43ecb5b2 Author: Jan Pazdziora Date: Thu Jun 18 15:33:59 2009 +0200 Automatic commit of package [spacewalk-selinux] release [0.6.11-1]. diff --git a/rel-eng/packages/spacewalk-selinux b/rel-eng/packages/spacewal= k-selinux index 91ce8d9..5a9e4ab 100644 --- a/rel-eng/packages/spacewalk-selinux +++ b/rel-eng/packages/spacewalk-selinux @@ -1 +1 @@ -0.6.10-1 selinux/spacewalk-selinux/ +0.6.11-1 selinux/spacewalk-selinux/ diff --git a/selinux/spacewalk-selinux/spacewalk-selinux.spec b/selinux/spa= cewalk-selinux/spacewalk-selinux.spec index c68588c..b653b88 100644 --- a/selinux/spacewalk-selinux/spacewalk-selinux.spec +++ b/selinux/spacewalk-selinux/spacewalk-selinux.spec @@ -7,7 +7,7 @@ %define modulename spacewalk = Name: spacewalk-selinux -Version: 0.6.10 +Version: 0.6.11 Release: 1%{?dist} Summary: SELinux policy module supporting Spacewalk Server = @@ -115,6 +115,9 @@ fi %attr(0755,root,root) %{_sbindir}/%{name}-enable = %changelog +* Thu Jun 18 2009 Jan Pazdziora 0.6.11-1 +- 505606 - Require at least selinux-policy 2.4.6-80 + * Mon Jun 15 2009 Miroslav Suchy 0.6.10-1 - 498611 - run "semodule -i" in %%post and restorecon in %%posttrans = --===============1507069429347552605==-- From adelton at fedoraproject.org Thu Aug 20 11:57:41 2015 Content-Type: multipart/mixed; boundary="===============6823251958331525964==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-selinux-0.6.11-1' Date: Thu, 18 Jun 2009 13:34:13 +0000 Message-ID: <20090618133413.BF5F7120194@lists.fedorahosted.org> --===============6823251958331525964== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-selinux-0.6.11-1' created by Jan Pazdziora at 2009-06-18 13:33 +0000 Tagging package [spacewalk-selinux] version [0.6.11-1] in directory [selinu= x/spacewalk-selinux/]. Changes since oracle-rhnsat-selinux-10.2-14: Jan Pazdziora (1): Automatic commit of package [spacewalk-selinux] release [0.6.11-1]. --- rel-eng/packages/spacewalk-selinux | 2 +- selinux/spacewalk-selinux/spacewalk-selinux.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) --- --===============6823251958331525964==-- From adelton at fedoraproject.org Thu Aug 20 11:57:41 2015 Content-Type: multipart/mixed; boundary="===============6014757245182383071==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: rel-eng/packages selinux/spacewalk-monitoring-selinux Date: Thu, 18 Jun 2009 13:34:37 +0000 Message-ID: <20090618133437.50604120194@lists.fedorahosted.org> --===============6014757245182383071== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/spacewalk-monitoring-selinux | = 2 +- selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | = 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 15e9797e091f21dc6b1dbca74c9fa07e13c7bd11 Author: Jan Pazdziora Date: Thu Jun 18 15:34:25 2009 +0200 Automatic commit of package [spacewalk-monitoring-selinux] release [0.6= .12-1]. diff --git a/rel-eng/packages/spacewalk-monitoring-selinux b/rel-eng/packag= es/spacewalk-monitoring-selinux index 2d758a9..f0c0ceb 100644 --- a/rel-eng/packages/spacewalk-monitoring-selinux +++ b/rel-eng/packages/spacewalk-monitoring-selinux @@ -1 +1 @@ -0.6.11-1 selinux/spacewalk-monitoring-selinux/ +0.6.12-1 selinux/spacewalk-monitoring-selinux/ diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-seli= nux.spec b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinu= x.spec index 32cb4c3..6a1c20d 100644 --- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec +++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec @@ -7,7 +7,7 @@ %define modulename spacewalk-monitoring = Name: spacewalk-monitoring-selinux -Version: 0.6.11 +Version: 0.6.12 Release: 1%{?dist} Summary: SELinux policy module supporting Spacewalk monitoring = @@ -144,6 +144,9 @@ fi %attr(0755,root,root) %{_sbindir}/%{name}-enable = %changelog +* Thu Jun 18 2009 Jan Pazdziora 0.6.12-1 +- 505606 - Require at least selinux-policy 2.4.6-80 + * Mon Jun 15 2009 Miroslav Suchy 0.6.11-1 - 498611 - run "semodule -i" in %%post and restorecon in %%posttrans = --===============6014757245182383071==-- From adelton at fedoraproject.org Thu Aug 20 11:57:41 2015 Content-Type: multipart/mixed; boundary="===============7829588121799003426==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-monitoring-selinux-0.6.12-1' Date: Thu, 18 Jun 2009 13:34:41 +0000 Message-ID: <20090618133441.D2C83120269@lists.fedorahosted.org> --===============7829588121799003426== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-monitoring-selinux-0.6.12-1' created by Jan Pazdziora at 2009-06-18 13:34 +0000 Tagging package [spacewalk-monitoring-selinux] version [0.6.12-1] in direct= ory [selinux/spacewalk-monitoring-selinux/]. Changes since spacewalk-selinux-0.6.11-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-monitoring-selinux] release [0= .6.12-1]. --- rel-eng/packages/spacewalk-monitoring-selinux | = 2 +- selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | = 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) --- --===============7829588121799003426==-- From adelton at fedoraproject.org Thu Aug 20 11:57:41 2015 Content-Type: multipart/mixed; boundary="===============9219430750212907442==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: rel-eng/packages selinux/spacewalk-proxy-selinux Date: Thu, 18 Jun 2009 13:35:04 +0000 Message-ID: <20090618133504.EF069120194@lists.fedorahosted.org> --===============9219430750212907442== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/spacewalk-proxy-selinux | 2 +- selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit f51406eb0a20ba4b6875b1cc68744556ea4f650a Author: Jan Pazdziora Date: Thu Jun 18 15:34:57 2009 +0200 Automatic commit of package [spacewalk-proxy-selinux] release [0.6.5-1]. diff --git a/rel-eng/packages/spacewalk-proxy-selinux b/rel-eng/packages/sp= acewalk-proxy-selinux index a7bee46..e588cff 100644 --- a/rel-eng/packages/spacewalk-proxy-selinux +++ b/rel-eng/packages/spacewalk-proxy-selinux @@ -1 +1 @@ -0.6.4-1 selinux/spacewalk-proxy-selinux/ +0.6.5-1 selinux/spacewalk-proxy-selinux/ diff --git a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec b= /selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec index 744a237..8a6e4e8 100644 --- a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec +++ b/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec @@ -7,7 +7,7 @@ %define modulename spacewalk-proxy = Name: spacewalk-proxy-selinux -Version: 0.6.4 +Version: 0.6.5 Release: 1%{?dist} Summary: SELinux policy module supporting Spacewalk Proxy = @@ -109,6 +109,9 @@ fi %attr(0755,root,root) %{_sbindir}/%{name}-enable = %changelog +* Thu Jun 18 2009 Jan Pazdziora 0.6.5-1 +- 505606 - Require at least selinux-policy 2.4.6-80 + * Mon Jun 15 2009 Miroslav Suchy 0.6.4-1 - 498611 - run "semodule -i" in %%post and restorecon in %%posttrans = --===============9219430750212907442==-- From adelton at fedoraproject.org Thu Aug 20 11:57:41 2015 Content-Type: multipart/mixed; boundary="===============4549249145930188479==" MIME-Version: 1.0 From: Jan Pazdziora To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-proxy-selinux-0.6.5-1' Date: Thu, 18 Jun 2009 13:35:09 +0000 Message-ID: <20090618133509.72124120269@lists.fedorahosted.org> --===============4549249145930188479== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-proxy-selinux-0.6.5-1' created by Jan Pazdziora at 2009-06-18 13:34 +0000 Tagging package [spacewalk-proxy-selinux] version [0.6.5-1] in directory [s= elinux/spacewalk-proxy-selinux/]. Changes since spacewalk-monitoring-selinux-0.6.12-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-proxy-selinux] release [0.6.5-= 1]. --- rel-eng/packages/spacewalk-proxy-selinux | 2 +- selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) --- --===============4549249145930188479==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:42 2015 Content-Type: multipart/mixed; boundary="===============7878689047907446800==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: spacewalk/setup Date: Thu, 18 Jun 2009 13:52:30 +0000 Message-ID: <20090618135230.6BBFC120194@lists.fedorahosted.org> --===============7878689047907446800== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/setup/share/upgrade/rhn-enable-push.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1be914d1dfb79aed33753993ebb9d4087f40719b Author: Milan Zazrivec Date: Thu Jun 18 15:51:33 2009 +0200 restart the satellite using shell script diff --git a/spacewalk/setup/share/upgrade/rhn-enable-push.pl b/spacewalk/s= etup/share/upgrade/rhn-enable-push.pl index 22ec1aa..ed33e9e 100644 --- a/spacewalk/setup/share/upgrade/rhn-enable-push.pl +++ b/spacewalk/setup/share/upgrade/rhn-enable-push.pl @@ -88,7 +88,7 @@ print "Deploying config\n"; Spacewalk::Setup::satcon_deploy(); = print "Restarting satellite services\n"; -RHN::SatInstall->restart_satellite(-delay =3D> 1); +system("/usr/sbin/rhn-satellite", "restart"); = print "Done\n"; = --===============7878689047907446800==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:42 2015 Content-Type: multipart/mixed; boundary="===============8025133716009610433==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - spacewalk/setup Date: Thu, 18 Jun 2009 13:53:16 +0000 Message-ID: <20090618135316.0B1AF120194@lists.fedorahosted.org> --===============8025133716009610433== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/setup/share/upgrade/rhn-enable-push.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4e70192770482a1bba50e5a7caa1b43d31a4bcac Author: Milan Zazrivec Date: Thu Jun 18 15:51:33 2009 +0200 restart the satellite using shell script diff --git a/spacewalk/setup/share/upgrade/rhn-enable-push.pl b/spacewalk/s= etup/share/upgrade/rhn-enable-push.pl index 22ec1aa..ed33e9e 100644 --- a/spacewalk/setup/share/upgrade/rhn-enable-push.pl +++ b/spacewalk/setup/share/upgrade/rhn-enable-push.pl @@ -88,7 +88,7 @@ print "Deploying config\n"; Spacewalk::Setup::satcon_deploy(); = print "Restarting satellite services\n"; -RHN::SatInstall->restart_satellite(-delay =3D> 1); +system("/usr/sbin/rhn-satellite", "restart"); = print "Done\n"; = --===============8025133716009610433==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:42 2015 Content-Type: multipart/mixed; boundary="===============4439064614415825536==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - java/code Date: Thu, 18 Jun 2009 14:22:44 +0000 Message-ID: <20090618142244.42E71120194@lists.fedorahosted.org> --===============4439064614415825536== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/= FilterActionTest.java | 6 +++--- java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteAct= ionTest.java | 2 +- java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java = | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 568ad0957a62f2fd3b14c906563b9d00e88119e4 Author: Devan Goodwin Date: Thu Jun 18 11:21:06 2009 -0300 Fix monitoring action unit tests. = Recent change means these tests should be be looking for Globals.ERROR_KEY, not Globals.MESSAGE_KEY. diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notifi= cation/test/FilterActionTest.java b/java/code/src/com/redhat/rhn/frontend/a= ction/monitoring/notification/test/FilterActionTest.java index deac49b..2bb3830 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/= test/FilterActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/= test/FilterActionTest.java @@ -160,9 +160,9 @@ public class FilterActionTest extends RhnBaseTestCase { ah.getForm().set(FilterCreateAction.DESCRIPTION, ""); ah.getForm().set(FilterCreateAction.RECURRING_DURATION, ""); ah.executeAction(); - assertNotNull(ah.getRequest().getSession().getAttribute(Globals.ME= SSAGE_KEY)); + assertNotNull(ah.getRequest().getSession().getAttribute(Globals.ER= ROR_KEY)); ActionMessages messages =3D (ActionMessages) - ah.getRequest().getSession().getAttribute(Globals.MESSAGE_KEY); + ah.getRequest().getSession().getAttribute(Globals.ERROR_KEY); assertEquals(1, messages.size()); assertEquals("", ah.getForm().get(FilterCreateAction.DESCRIPTION)); = @@ -170,7 +170,7 @@ public class FilterActionTest extends RhnBaseTestCase { ah.getForm().set(FilterCreateAction.RECURRING, Boolean.TRUE); ah.executeAction(); messages =3D (ActionMessages) - ah.getRequest().getSession().getAttribute(Globals.MESSAGE_KEY); + ah.getRequest().getSession().getAttribute(Globals.ERROR_KEY); assertEquals(2, messages.size()); = = diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/P= robeSuiteActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/mon= itoring/test/ProbeSuiteActionTest.java index dcd6030..f3884ba 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSui= teActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSui= teActionTest.java @@ -92,7 +92,7 @@ public class ProbeSuiteActionTest extends RhnBaseTestCase= { ActionForward af =3D ah.executeAction(); assertEquals("default", af.getName()); ActionMessages messages =3D (ActionMessages) = - ah.getRequest().getSession().getAttribute(Globals.MESSAGE_KEY); + ah.getRequest().getSession().getAttribute(Globals.ERROR_KEY); assertEquals(1, messages.size()); = } commit 7b3a59d0729b35fa71ada2efb73933c787c19816 Author: Devan Goodwin Date: Thu Jun 18 09:27:17 2009 -0300 Attempt to fix ChannelManagerTest.testListErrata. = Suspect the timespan being used isn't quite long enough for a slow run sometimes, thus why this test seems to fail intermittently. diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManag= erTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelMana= gerTest.java index f7a496f..9783da3 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java +++ b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java @@ -308,7 +308,7 @@ public class ChannelManagerTest extends BaseTestCaseWit= hUser { = found =3D false; Date date =3D new Date(); - errata =3D ChannelManager.listErrata(c, new Date(date.getTime() - = 1000), null, user); + errata =3D ChannelManager.listErrata(c, new Date(date.getTime() - = 100000), null, user); for (ErrataOverview eo : errata) { if (eo.getId().equals(e.getId())) { found =3D true; @@ -317,7 +317,7 @@ public class ChannelManagerTest extends BaseTestCaseWit= hUser { assertTrue(found); = found =3D false; - errata =3D ChannelManager.listErrata(c, new Date(date.getTime() - = 1000), + errata =3D ChannelManager.listErrata(c, new Date(date.getTime() - = 100000), new Date(date.getTime() + 5000000), us= er); for (ErrataOverview eo : errata) { if (eo.getId().equals(e.getId())) { --===============4439064614415825536==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:42 2015 Content-Type: multipart/mixed; boundary="===============3896544707145973722==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Thu, 18 Jun 2009 14:27:57 +0000 Message-ID: <20090618142757.A3B98120194@lists.fedorahosted.org> --===============3896544707145973722== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java = | 28 ---------- java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTest.java = | 1 = java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java = | 12 ++-- java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsActi= on.java | 9 ++- java/code/src/com/redhat/rhn/manager/download/DownloadManager.java = | 9 ++- java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp = | 2 = 6 files changed, 22 insertions(+), 39 deletions(-) New commits: commit e4ba5f334ccb8e10fc0dc175f894fbf6b82807db Author: Justin Sherrill Date: Thu Jun 18 10:26:10 2009 -0400 506608 - fixing issue where source packages could not be downloaded fro= m the package details page 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 9ce7bf1..1e884a6 100644 --- a/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java +++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java @@ -128,20 +128,6 @@ public class Package extends BaseDomainHelper { } = /** - * Retrieves the file portion of the path. For example, if - * path=3D/foo/bar/baz.rpm, getFile() would return 'baz.rpm'. - * @return Returns the file portion of the path. - */ - public String getSourceFile() { - String[] parts =3D StringUtils.split(getSourcePath(), '/'); - if (parts !=3D null && parts.length > 0) { - return parts[parts.length - 1]; - } - - return null; - } - - /** * @return Returns the buildHost. */ public String getBuildHost() { @@ -438,20 +424,6 @@ public class Package extends BaseDomainHelper { } = /** - * @return Returns the sourcePath. - */ - public String getSourcePath() { - return sourcePath; - } - - /** - * @param s The sourcePath to set. - */ - public void setSourcePath(String s) { - this.sourcePath =3D s; - } - - /** * @return Returns the sourceRpm. */ public SourceRpm getSourceRpm() { diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTes= t.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTest.ja= va index 1c455b5..8d7037a 100644 --- a/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTest.java +++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTest.java @@ -139,7 +139,6 @@ public class PackageTest extends RhnBaseTestCase { p.setCopyright("Red Hat - RHN - 2005"); p.setCookie("Chocolate Chip"); p.setLastModified(new Date()); - p.setSourcePath(MD5Crypt.crypt("" + System.currentTimeMillis()) + = "/src"); p.setCreated(new Date()); p.setModified(new Date()); = diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFi= le.java b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.= java index 1e3885a..4c47fc5 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java +++ b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java @@ -28,6 +28,7 @@ import com.redhat.rhn.domain.kickstart.KickstartableTree; import com.redhat.rhn.domain.org.OrgFactory; import com.redhat.rhn.domain.rhnpackage.Package; import com.redhat.rhn.domain.rhnpackage.PackageFactory; +import com.redhat.rhn.domain.rhnpackage.PackageSource; import com.redhat.rhn.domain.rhnpackage.Patch; import com.redhat.rhn.domain.rhnpackage.PatchSet; import com.redhat.rhn.domain.user.User; @@ -419,10 +420,13 @@ public class DownloadFile extends DownloadAction { } else if (type.equals(DownloadManager.DOWNLOAD_TYPE_SOURCE)) { Package pack =3D PackageFactory.lookupByIdAndOrg(fileId, u= ser.getOrg()); - path =3D Config.get().getString(Config.MOUNT_POINT) + "/" = + = - pack.getSourcePath(); - return getStreamForBinary(path); - } = + List src =3D PackageFactory.lookupPackageSo= urces(pack); + if (!src.isEmpty()) { + path =3D Config.get().getString(Config.MOUNT_POINT) + = "/" + + src.get(0).getPath(); + return getStreamForBinary(path); + } + } else if (type.equals(DownloadManager.DOWNLOAD_TYPE_PATCH_READM= E)) { Patch patch =3D (Patch) PackageFactory.lookupByIdAndOrg(fi= leId, = user.getOrg()); diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/Packag= eDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpacka= ge/PackageDetailsAction.java index 6d6a2d1..419f3c5 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetail= sAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetail= sAction.java @@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.rhnpackage; import com.redhat.rhn.common.security.PermissionException; import com.redhat.rhn.domain.rhnpackage.Package; import com.redhat.rhn.domain.rhnpackage.PackageFactory; +import com.redhat.rhn.domain.rhnpackage.PackageSource; import com.redhat.rhn.domain.rhnpackage.Patch; import com.redhat.rhn.domain.rhnpackage.PatchSet; import com.redhat.rhn.domain.user.User; @@ -33,6 +34,7 @@ import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; = import java.util.HashMap; +import java.util.List; import java.util.Map; = import javax.servlet.http.HttpServletRequest; @@ -89,9 +91,12 @@ public class PackageDetailsAction extends RhnAction { DownloadManager.getPackageDownloadPath(pkg, user)); } = - if (DownloadManager.isFileAvailable(pkg.getSourcePath())) { + List src =3D PackageFactory.lookupPackageSource= s(pkg); + + if (!src.isEmpty() && DownloadManager.isFileAvailable(src.get(= 0).getPath())) { request.setAttribute("srpm_url", - DownloadManager.getPackageSourceDownloadPath(pkg, = user)); + DownloadManager.getPackageSourceDownloadPath(pkg, src.g= et(0), user)); + request.setAttribute("srpm_path", src.get(0).getFile()); } = request.setAttribute("pack", pkg); diff --git a/java/code/src/com/redhat/rhn/manager/download/DownloadManager.= java b/java/code/src/com/redhat/rhn/manager/download/DownloadManager.java index ab3a95a..5de5a83 100644 --- a/java/code/src/com/redhat/rhn/manager/download/DownloadManager.java +++ b/java/code/src/com/redhat/rhn/manager/download/DownloadManager.java @@ -17,6 +17,7 @@ package com.redhat.rhn.manager.download; import com.redhat.rhn.common.conf.Config; import com.redhat.rhn.common.security.SessionSwap; import com.redhat.rhn.domain.rhnpackage.Package; +import com.redhat.rhn.domain.rhnpackage.PackageSource; import com.redhat.rhn.domain.rhnpackage.Patch; import com.redhat.rhn.domain.rhnpackage.PatchSet; import com.redhat.rhn.domain.user.User; @@ -83,12 +84,14 @@ public class DownloadManager extends BaseManager { * Get a download path that is used to download a srpm. * The url will be in the form of = * /download/SHA1_TOKEN/EXPIRE_TIME/userId/packId/filename.rpm - * @param pack the package + * @param pkg the package + * @param src the package source * @param user the user * @return the path/url */ - public static String getPackageSourceDownloadPath(Package pack, User u= ser) { - return getDownloadPath(pack.getId(), pack.getFile(), user, = + public static String getPackageSourceDownloadPath(Package pkg, + PackageSource src, User user) { + return getDownloadPath(pkg.getId(), src.getFile(), user, DownloadManager.DOWNLOAD_TYPE_SOURCE); } = = diff --git a/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp b/= java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp index c0e2bf6..e13d901 100644 --- a/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp +++ b/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp @@ -189,7 +189,7 @@ - ${pack.sourceFile} + ${srpm_path}
                                      = --===============3896544707145973722==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:42 2015 Content-Type: multipart/mixed; boundary="===============7348909893563891447==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Thu, 18 Jun 2009 14:28:21 +0000 Message-ID: <20090618142821.4684B120194@lists.fedorahosted.org> --===============7348909893563891447== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java = | 28 ---------- java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTest.java = | 1 = java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java = | 12 ++-- java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsActi= on.java | 9 ++- java/code/src/com/redhat/rhn/manager/download/DownloadManager.java = | 9 ++- java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp = | 2 = 6 files changed, 22 insertions(+), 39 deletions(-) New commits: commit fa2a502eeaadaf6701a3a55a4aa1cdbcbf5a595f Author: Justin Sherrill Date: Thu Jun 18 10:26:10 2009 -0400 506608 - fixing issue where source packages could not be downloaded fro= m the package details page 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 9ce7bf1..1e884a6 100644 --- a/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java +++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java @@ -128,20 +128,6 @@ public class Package extends BaseDomainHelper { } = /** - * Retrieves the file portion of the path. For example, if - * path=3D/foo/bar/baz.rpm, getFile() would return 'baz.rpm'. - * @return Returns the file portion of the path. - */ - public String getSourceFile() { - String[] parts =3D StringUtils.split(getSourcePath(), '/'); - if (parts !=3D null && parts.length > 0) { - return parts[parts.length - 1]; - } - - return null; - } - - /** * @return Returns the buildHost. */ public String getBuildHost() { @@ -438,20 +424,6 @@ public class Package extends BaseDomainHelper { } = /** - * @return Returns the sourcePath. - */ - public String getSourcePath() { - return sourcePath; - } - - /** - * @param s The sourcePath to set. - */ - public void setSourcePath(String s) { - this.sourcePath =3D s; - } - - /** * @return Returns the sourceRpm. */ public SourceRpm getSourceRpm() { diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTes= t.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTest.ja= va index 1c455b5..8d7037a 100644 --- a/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTest.java +++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTest.java @@ -139,7 +139,6 @@ public class PackageTest extends RhnBaseTestCase { p.setCopyright("Red Hat - RHN - 2005"); p.setCookie("Chocolate Chip"); p.setLastModified(new Date()); - p.setSourcePath(MD5Crypt.crypt("" + System.currentTimeMillis()) + = "/src"); p.setCreated(new Date()); p.setModified(new Date()); = diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFi= le.java b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.= java index 1e3885a..4c47fc5 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java +++ b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java @@ -28,6 +28,7 @@ import com.redhat.rhn.domain.kickstart.KickstartableTree; import com.redhat.rhn.domain.org.OrgFactory; import com.redhat.rhn.domain.rhnpackage.Package; import com.redhat.rhn.domain.rhnpackage.PackageFactory; +import com.redhat.rhn.domain.rhnpackage.PackageSource; import com.redhat.rhn.domain.rhnpackage.Patch; import com.redhat.rhn.domain.rhnpackage.PatchSet; import com.redhat.rhn.domain.user.User; @@ -419,10 +420,13 @@ public class DownloadFile extends DownloadAction { } else if (type.equals(DownloadManager.DOWNLOAD_TYPE_SOURCE)) { Package pack =3D PackageFactory.lookupByIdAndOrg(fileId, u= ser.getOrg()); - path =3D Config.get().getString(Config.MOUNT_POINT) + "/" = + = - pack.getSourcePath(); - return getStreamForBinary(path); - } = + List src =3D PackageFactory.lookupPackageSo= urces(pack); + if (!src.isEmpty()) { + path =3D Config.get().getString(Config.MOUNT_POINT) + = "/" + + src.get(0).getPath(); + return getStreamForBinary(path); + } + } else if (type.equals(DownloadManager.DOWNLOAD_TYPE_PATCH_READM= E)) { Patch patch =3D (Patch) PackageFactory.lookupByIdAndOrg(fi= leId, = user.getOrg()); diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/Packag= eDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpacka= ge/PackageDetailsAction.java index 6d6a2d1..419f3c5 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetail= sAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetail= sAction.java @@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.rhnpackage; import com.redhat.rhn.common.security.PermissionException; import com.redhat.rhn.domain.rhnpackage.Package; import com.redhat.rhn.domain.rhnpackage.PackageFactory; +import com.redhat.rhn.domain.rhnpackage.PackageSource; import com.redhat.rhn.domain.rhnpackage.Patch; import com.redhat.rhn.domain.rhnpackage.PatchSet; import com.redhat.rhn.domain.user.User; @@ -33,6 +34,7 @@ import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; = import java.util.HashMap; +import java.util.List; import java.util.Map; = import javax.servlet.http.HttpServletRequest; @@ -89,9 +91,12 @@ public class PackageDetailsAction extends RhnAction { DownloadManager.getPackageDownloadPath(pkg, user)); } = - if (DownloadManager.isFileAvailable(pkg.getSourcePath())) { + List src =3D PackageFactory.lookupPackageSource= s(pkg); + + if (!src.isEmpty() && DownloadManager.isFileAvailable(src.get(= 0).getPath())) { request.setAttribute("srpm_url", - DownloadManager.getPackageSourceDownloadPath(pkg, = user)); + DownloadManager.getPackageSourceDownloadPath(pkg, src.g= et(0), user)); + request.setAttribute("srpm_path", src.get(0).getFile()); } = request.setAttribute("pack", pkg); diff --git a/java/code/src/com/redhat/rhn/manager/download/DownloadManager.= java b/java/code/src/com/redhat/rhn/manager/download/DownloadManager.java index ab3a95a..5de5a83 100644 --- a/java/code/src/com/redhat/rhn/manager/download/DownloadManager.java +++ b/java/code/src/com/redhat/rhn/manager/download/DownloadManager.java @@ -17,6 +17,7 @@ package com.redhat.rhn.manager.download; import com.redhat.rhn.common.conf.Config; import com.redhat.rhn.common.security.SessionSwap; import com.redhat.rhn.domain.rhnpackage.Package; +import com.redhat.rhn.domain.rhnpackage.PackageSource; import com.redhat.rhn.domain.rhnpackage.Patch; import com.redhat.rhn.domain.rhnpackage.PatchSet; import com.redhat.rhn.domain.user.User; @@ -83,12 +84,14 @@ public class DownloadManager extends BaseManager { * Get a download path that is used to download a srpm. * The url will be in the form of = * /download/SHA1_TOKEN/EXPIRE_TIME/userId/packId/filename.rpm - * @param pack the package + * @param pkg the package + * @param src the package source * @param user the user * @return the path/url */ - public static String getPackageSourceDownloadPath(Package pack, User u= ser) { - return getDownloadPath(pack.getId(), pack.getFile(), user, = + public static String getPackageSourceDownloadPath(Package pkg, + PackageSource src, User user) { + return getDownloadPath(pkg.getId(), src.getFile(), user, DownloadManager.DOWNLOAD_TYPE_SOURCE); } = = diff --git a/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp b/= java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp index c0e2bf6..e13d901 100644 --- a/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp +++ b/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp @@ -189,7 +189,7 @@ - ${pack.sourceFile} + ${srpm_path}
                                      = --===============7348909893563891447==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:42 2015 Content-Type: multipart/mixed; boundary="===============1883359054996341002==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Thu, 18 Jun 2009 14:37:30 +0000 Message-ID: <20090618143730.E5958120194@lists.fedorahosted.org> --===============1883359054996341002== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java = | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit b33af6172ebdedf838b79f1d72299308733c7a99 Author: Devan Goodwin Date: Thu Jun 18 11:36:37 2009 -0300 Checkstyle fix. diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManag= erTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelMana= gerTest.java index 9783da3..f5e46f9 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java +++ b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java @@ -308,7 +308,8 @@ public class ChannelManagerTest extends BaseTestCaseWit= hUser { = found =3D false; Date date =3D new Date(); - errata =3D ChannelManager.listErrata(c, new Date(date.getTime() - = 100000), null, user); + errata =3D ChannelManager.listErrata(c, new Date(date.getTime() - = 100000), + null, user); for (ErrataOverview eo : errata) { if (eo.getId().equals(e.getId())) { found =3D true; --===============1883359054996341002==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:42 2015 Content-Type: multipart/mixed; boundary="===============2923877348893168526==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Thu, 18 Jun 2009 14:37:54 +0000 Message-ID: <20090618143754.78E41120194@lists.fedorahosted.org> --===============2923877348893168526== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java = | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 69fe28ff2094c8634aab4b9c335f2213f992475b Author: Devan Goodwin Date: Thu Jun 18 11:36:37 2009 -0300 Checkstyle fix. diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManag= erTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelMana= gerTest.java index 9783da3..f5e46f9 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java +++ b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.= java @@ -308,7 +308,8 @@ public class ChannelManagerTest extends BaseTestCaseWit= hUser { = found =3D false; Date date =3D new Date(); - errata =3D ChannelManager.listErrata(c, new Date(date.getTime() - = 100000), null, user); + errata =3D ChannelManager.listErrata(c, new Date(date.getTime() - = 100000), + null, user); for (ErrataOverview eo : errata) { if (eo.getId().equals(e.getId())) { found =3D true; --===============2923877348893168526==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:42 2015 Content-Type: multipart/mixed; boundary="===============7521191677865812037==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - backend/server Date: Thu, 18 Jun 2009 14:44:19 +0000 Message-ID: <20090618144419.4CD9E120194@lists.fedorahosted.org> --===============7521191677865812037== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/rhnServer/server_packages.py | 5 +++++ 1 file changed, 5 insertions(+) New commits: commit 39ba54f82c0d879d871fe8b520bcce9b7e22cfb2 Author: Pradeep Kilambi Date: Thu Jun 18 10:44:12 2009 -0400 fixing the unsubscriptable object error when package is not yet in rhnP= ackage table diff --git a/backend/server/rhnServer/server_packages.py b/backend/server/r= hnServer/server_packages.py index 2fdb97b..a185456 100644 --- a/backend/server/rhnServer/server_packages.py +++ b/backend/server/rhnServer/server_packages.py @@ -415,11 +415,16 @@ def processPackageKeyAssociations(header, md5sum): lookup_pkgid_sql.execute(md5sum =3D md5sum) pkg_id =3D lookup_pkgid_sql.fetchall_dict() = + if not pkg_id: + # No package to associate, continue with next + return + sigkeys =3D rhn_rpm.RPM_Header(header).signatures key_id =3D None #_key_ids(sigkeys)[0] for sig in sigkeys: if sig['signature_type'] =3D=3D 'gpg': key_id =3D sig['key_id'] + if not key_id: # package is not signed, skip gpg key insertion return --===============7521191677865812037==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:42 2015 Content-Type: multipart/mixed; boundary="===============8868787688556557048==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: backend/server Date: Thu, 18 Jun 2009 14:44:59 +0000 Message-ID: <20090618144459.7C71F120194@lists.fedorahosted.org> --===============8868787688556557048== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/rhnServer/server_packages.py | 5 +++++ 1 file changed, 5 insertions(+) New commits: commit 69f616312d17366a37b71726eab905b58ce75d1c Author: Pradeep Kilambi Date: Thu Jun 18 10:44:12 2009 -0400 fixing the unsubscriptable object error when package is not yet in rhnP= ackage table diff --git a/backend/server/rhnServer/server_packages.py b/backend/server/r= hnServer/server_packages.py index 2fdb97b..a185456 100644 --- a/backend/server/rhnServer/server_packages.py +++ b/backend/server/rhnServer/server_packages.py @@ -415,11 +415,16 @@ def processPackageKeyAssociations(header, md5sum): lookup_pkgid_sql.execute(md5sum =3D md5sum) pkg_id =3D lookup_pkgid_sql.fetchall_dict() = + if not pkg_id: + # No package to associate, continue with next + return + sigkeys =3D rhn_rpm.RPM_Header(header).signatures key_id =3D None #_key_ids(sigkeys)[0] for sig in sigkeys: if sig['signature_type'] =3D=3D 'gpg': key_id =3D sig['key_id'] + if not key_id: # package is not signed, skip gpg key insertion return --===============8868787688556557048==-- From jmrodri at fedoraproject.org Thu Aug 20 11:57:43 2015 Content-Type: multipart/mixed; boundary="===============6225538606125436602==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/spacewalk-java.spec Date: Thu, 18 Jun 2009 14:55:07 +0000 Message-ID: <20090618145507.DDF20120194@lists.fedorahosted.org> --===============6225538606125436602== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/spacewalk-java.spec | 6 ++++++ 1 file changed, 6 insertions(+) New commits: commit 3be5311808d02e1b21f2bf71875606146a0fa40d Author: jesus m. rodriguez Date: Thu Jun 18 10:52:16 2009 -0400 470991 - need to require these packages simply for cleanup purposes. the proper fix is to factor out the taskomatic code from rhn.jar so that we would not require these 3 packages: concurrent, quartz, tanukiwrappe diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 2dc102a..6c8f28e 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -53,6 +53,12 @@ Requires: spacewalk-java-lib Requires: spacewalk-branding Requires: jpackage-utils >=3D 0:1.5 Requires: cobbler >=3D 1.4.3 +# 470991 - need to require these packages simply for cleanup purposes. +# the proper fix is to factor out the taskomatic code from rhn.jar so that +# we would not require these 3 packages: concurrent, quartz, tanukiwrapper +Requires: concurrent +Requires: quartz +Requires: tanukiwrapper BuildRequires: ant BuildRequires: ant-apache-regexp BuildRequires: java-devel >=3D 1.6.0 --===============6225538606125436602==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:43 2015 Content-Type: multipart/mixed; boundary="===============3368445427162542441==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: scripts/channel-to-update-level Date: Thu, 18 Jun 2009 15:38:43 +0000 Message-ID: <20090618153843.74C79120194@lists.fedorahosted.org> --===============3368445427162542441== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable scripts/channel-to-update-level/README | 3 +++ scripts/channel-to-update-level/create-channel-update | 12 +++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) New commits: commit 8eb6c944c0e36a6e125b166aee1d557e5c64a1d9 Author: Justin Sherrill Date: Thu Jun 18 11:36:42 2009 -0400 fixing a few issues with channel-to-update diff --git a/scripts/channel-to-update-level/README b/scripts/channel-to-up= date-level/README index 56fcb6c..40d3b60 100644 --- a/scripts/channel-to-update-level/README +++ b/scripts/channel-to-update-level/README @@ -43,6 +43,9 @@ README - This file = Changelog: ----------- +6/18/09 - 2.1.1 +- couple of fixes regarding bundlesize and data file options + 6/14/09 - 2.1 = - Reimplemented option parsing - adding --clone option for when creating channel diff --git a/scripts/channel-to-update-level/create-channel-update b/script= s/channel-to-update-level/create-channel-update index 1b5cb85..f4d1a30 100755 --- a/scripts/channel-to-update-level/create-channel-update +++ b/scripts/channel-to-update-level/create-channel-update @@ -63,7 +63,7 @@ def get_args(): parser.add_option("-L", "--clone", action=3D"store_true", dest=3D"clone= ", default=3DFalse, help=3D'if creating destChannel, clone it from the sour= ce channel, before adding packages (Satellite 5.1 or newer required)') parser.add_option("-K", "--skiplist", action=3D"store", dest=3D"skiplis= t", help=3D"a filename with a list of package names to ignore when adding t= o the destination channel") parser.add_option("-g", "--gather", action=3D"store_true", dest=3D"gath= er", default=3DFalse , help=3D'used to gather data files, generally not use= ful to most people') - parser.add_option("-b", "--bundle", action=3D"store", dest=3D"bundle", = default=3D'50', help=3D'if you are getting "502 proxy" errors, try using a = smaller value (default 50)') + parser.add_option("-b", "--bundle", action=3D"store", dest=3D"bundle", = type=3D'int', default=3D'50', help=3D'if you are getting "502 proxy" errors= , try using a smaller value (default 50)') = return parser.parse_args() = @@ -120,7 +120,7 @@ def main(): password =3D options.password if password =3D=3D None: password =3D getpass.getpass() - bundleSize =3D=3D options.bundle + bundleSize =3D options.bundle = #did you provide a data file? If not we need all the information if options.data =3D=3D None: @@ -129,15 +129,17 @@ def main(): update =3D options.update_level arch =3D options.arch extra =3D options.extra - filename =3D getFileName(version,update, release, arch, extra) = + filename =3D getFileName(version,update, release, arch, extra) + fullpath =3D DATA_DIR + filename else: - filename =3D option.data + filename =3D os.path.basename(options.data) + fullpath =3D options.data version, release, update, arch, extra =3D parseDataFilename(filename= ) = = ssl =3D options.ssl clear =3D options.clear_channel = - if not os.path.exists(DATA_DIR + filename): + if not os.path.exists(fullpath): print "Error: data file '" + filename + "' does not exist" exit(1) = --===============3368445427162542441==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:43 2015 Content-Type: multipart/mixed; boundary="===============4521350688481413727==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: scripts/channel-to-update-level Date: Thu, 18 Jun 2009 15:42:42 +0000 Message-ID: <20090618154242.08BFF120194@lists.fedorahosted.org> --===============4521350688481413727== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable scripts/channel-to-update-level/create-channel-update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4b182de5eaf9c157926c5cd5dde3c0c07a69b534 Author: Justin Sherrill Date: Thu Jun 18 11:41:40 2009 -0400 fixing small usage error in channel-to-update diff --git a/scripts/channel-to-update-level/create-channel-update b/script= s/channel-to-update-level/create-channel-update index f4d1a30..a0a76ea 100755 --- a/scripts/channel-to-update-level/create-channel-update +++ b/scripts/channel-to-update-level/create-channel-update @@ -43,7 +43,7 @@ client =3D None = def get_args(): global parser - parser =3D OptionParser(usage=3D"""./create-channel-update -u USER -s= SERVER [-p PASSWORD] -v VERSION -r RELEASE + parser =3D OptionParser(usage=3D"""./create-channel-update -l USER -s= SERVER [-p PASSWORD] -v VERSION -r RELEASE -u UPDATE -a ARCH -e EXTRA [ -D DATAFILE] [-c SRCCHAN] -= d DESTCHAN [-P PARENT] [-C | --clear] [-n | --nossl]""") parser.add_option("-n", "--nossl", action=3D"store_false", dest=3D"ssl"= , default=3DTrue, help=3D"disables the use of SSL when connecting to the se= rver") --===============4521350688481413727==-- From partha at fedoraproject.org Thu Aug 20 11:57:43 2015 Content-Type: multipart/mixed; boundary="===============6969219389019492819==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 2 commits - java/code Date: Thu, 18 Jun 2009 15:49:45 +0000 Message-ID: <20090618154945.16BCC120194@lists.fedorahosted.org> --===============6969219389019492819== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml = | 38 ++++-- java/code/src/com/redhat/rhn/common/errors/SatelliteExceptionHandler.java = | 58 ++++++++++ java/code/src/com/redhat/rhn/frontend/action/configuration/files/LocalRevi= sionDeployAction.java | 4 = java/code/src/com/redhat/rhn/frontend/dto/ConfigGlobalDeployDto.java = | 24 +++- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xm= l | 3 = java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml= | 20 +++ java/code/src/com/redhat/rhn/manager/MissingCapabilityException.java = | 56 +-------- java/code/src/com/redhat/rhn/manager/action/ActionManager.java = | 10 - java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManager.ja= va | 6 - java/code/webapp/WEB-INF/pages/common/errors/missingcapability.jsp = | 23 +++ java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploy= global.jspf | 9 + java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploy= local.jspf | 17 ++ java/code/webapp/WEB-INF/struts-config.xml = | 3 = 13 files changed, 198 insertions(+), 73 deletions(-) New commits: commit c3927f4b8c13fc31d3d9310cad29fd2cc33cb3ab Author: Partha Aji Date: Thu Jun 18 11:52:29 2009 -0400 506509 - Fixed an ssm query.. Accidental typo.. diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_q= ueries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_q= ueries.xml index c5840cb..84f43dc 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.= xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.= xml @@ -1748,7 +1748,7 @@ WHERE CCT.id =3D CC.confchan_type_id AND ST.user_id =3D :user_id AND ST.label =3D :set_label AND SCC.config_channel_id =3D :ccid - AND CCN.name =3D 'configfiles,deploy' + AND CCN.name =3D 'configfiles.deploy' AND SFV.label =3D 'ftr_config' = ORDER BY S.NAME commit d60a575c0fb2925508b9fb0b4e0085ff3b801a31 Author: Partha Aji Date: Thu Jun 18 11:51:00 2009 -0400 506509 - Fixed ISE on Config Deploy pages = Fixed ISE that occured becasue of missing capabilities for config deplo= y pages 1) Added a global exception forward in the case of MissingCapabilities = so user can see useful message. 2) Changed 3 queries to show non config enabled systems to be properly = disabled in the checkbox diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_q= ueries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_q= ueries.xml index 256a68c..c5840cb 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.= xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.= xml @@ -1691,7 +1691,6 @@ WHERE CCT.id =3D CC.confchan_type_id WHERE SCC2.server_id =3D S.id AND CCT2.label =3D 'local_override' AND CF2.config_file_name_id =3D :cfnid) as OVERRIDE_COUNT, - = (SELECT count(CC2.id) = FROM rhnConfigChannel CC2 inner join rhnConfigChannelType CCT2 on CC2.confchan_typ= e_id =3D CCT2.id @@ -1704,17 +1703,29 @@ WHERE CCT.id =3D CC.confchan_type_id AND SCC.position < SCC2.position AND CC2.id =3D:ccid = AND CCT2.label =3D 'normal' - AND CF2.config_file_name_id =3D :cfnid) as OUTRANKED_COUNT - FROM rhnServer S, = - rhnServerConfigChannel SCC, - rhnUserServerPerms USP + AND CF2.config_file_name_id =3D :cfnid) as OUTRANKED_COUN= T, + NVL((select 1 from rhnClientCapability CCap + inner join rhnClientCapabilityName CCN on CCap.capability= _name_id =3D CCN.id + where CCN.name =3D 'configfiles.deploy' + AND CCap.server_id =3D S.id + AND EXISTS (select 1 from rhnServerFeaturesView SFV = + where SFV.server_id =3D s.id AND SFV.label =3D 'ftr_confi= g') + ),0) as DEPLOYABLE + FROM rhnServer S + inner join rhnServerConfigChannel SCC on S.id =3D SCC.server_id + inner join rhnUserServerPerms USP on USP.server_id =3D S.id WHERE rhn_config_channel.get_user_chan_access(:ccid, :user_id) =3D 1 AND SCC.config_channel_id =3D :ccid - AND S.id =3D SCC.server_id - AND USP.server_id =3D S.id AND USP.user_id =3D :user_id ORDER BY S.NAME + = + = + + + = + = + = = @@ -1727,15 +1738,18 @@ WHERE CCT.id =3D CC.confchan_type_id class=3D"com.redhat.rhn.frontend.dto.ConfigGlobalDeployDto"> SELECT S.ID, S.NAME - FROM rhnServer S, - rhnServerConfigChannel SCC, - rhnSet ST + FROM rhnServer S = + inner join rhnServerConfigChannel SCC on S.id =3D SCC.server_id + inner join rhnSet ST on ST.element =3D S.id + inner join rhnClientCapability CCap on CCap.server_id =3D S.id + inner join rhnClientCapabilityName CCN on CCap.capability_nam= e_id =3D CCN.id + inner join rhnServerFeaturesView SFV on SFV.server_id =3D s.id= = WHERE rhn_config_channel.get_user_chan_access(:ccid, :user_id) =3D 1 AND ST.user_id =3D :user_id AND ST.label =3D :set_label - AND ST.element =3D S.id AND SCC.config_channel_id =3D :ccid - AND S.id =3D SCC.server_id + AND CCN.name =3D 'configfiles,deploy' + AND SFV.label =3D 'ftr_config' = ORDER BY S.NAME diff --git a/java/code/src/com/redhat/rhn/common/errors/SatelliteExceptionH= andler.java b/java/code/src/com/redhat/rhn/common/errors/SatelliteException= Handler.java new file mode 100644 index 0000000..1f98758 --- /dev/null +++ b/java/code/src/com/redhat/rhn/common/errors/SatelliteExceptionHandler.= java @@ -0,0 +1,58 @@ +/** + * Copyright (c) 2009 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.errors; + + +import com.redhat.rhn.common.messaging.MessageQueue; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.events.TraceBackEvent; +import com.redhat.rhn.frontend.struts.RequestContext; + +import org.apache.log4j.Logger; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ExceptionHandler; + +import javax.servlet.http.HttpServletRequest; + + +/** + * SatelliteExceptionHandler + * @version $Rev$ + */ +public class SatelliteExceptionHandler extends ExceptionHandler { + private Exception exception; + = + /** + * {@inheritDoc} + */ + protected void logException(Exception ex) { + Logger log =3D Logger.getLogger(LookupExceptionHandler.class); + log.error(ex); + exception =3D (Exception) ex; + } + = + protected void storeException(HttpServletRequest request, String prope= rty, = + ActionMessage msg, ActionForward forward= , String scope) { + TraceBackEvent evt =3D new TraceBackEvent(); + RequestContext requestContext =3D new RequestContext(request); + User usr =3D requestContext.getLoggedInUser(); + evt.setUser(usr); + evt.setRequest(request); + evt.setException(exception); + MessageQueue.publish(evt); + request.setAttribute("error", exception); + } +} diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/fil= es/LocalRevisionDeployAction.java b/java/code/src/com/redhat/rhn/frontend/a= ction/configuration/files/LocalRevisionDeployAction.java index 2c435ce..4c45513 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/Loca= lRevisionDeployAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/Loca= lRevisionDeployAction.java @@ -55,6 +55,7 @@ public class LocalRevisionDeployAction extends RhnAction { public static final String SYSTEM =3D "system"; public static final String SYSTEM_ID =3D "sid"; public static final String LAST_DEPLOY =3D "lastDeploy"; + public static final String DEPLOYABLE =3D "deployable"; = /** {@inheritDoc} */ public ActionForward execute(ActionMapping mapping, ActionForm form, @@ -77,6 +78,9 @@ public class LocalRevisionDeployAction extends RhnAction { = if (cr !=3D null) { Server srv =3D findServer(request, cr); + if (ConfigurationManager.getInstance().isConfigEnabled(srv, us= r)) { + request.setAttribute(DEPLOYABLE, Boolean.TRUE); + } if (isSubmitted(dForm)) { submitDeploy(dForm, cr, srv, usr); success(request); diff --git a/java/code/src/com/redhat/rhn/frontend/dto/ConfigGlobalDeployDt= o.java b/java/code/src/com/redhat/rhn/frontend/dto/ConfigGlobalDeployDto.ja= va index 2eacf95..d4daed6 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/ConfigGlobalDeployDto.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/ConfigGlobalDeployDto.java @@ -30,8 +30,25 @@ public class ConfigGlobalDeployDto extends BaseDto { private String name; private Long outrankedCount; private Long overrideCount; + private boolean deployable; = /** + * @return true if deployable, as in config capable + featured + */ + public boolean isDeployable() { + return deployable; + } + + = + /** + * set true if ht efile is deployable. + * @param deployableIn true if deployable = + */ + public void setDeployable(Integer deployableIn) { + this.deployable =3D Integer.valueOf(1).equals(deployableIn); + } + + /** * @return system-id of the system whose deploy-state is the rest of t= he Dto data */ public Long getId() { @@ -138,6 +155,11 @@ public class ConfigGlobalDeployDto extends BaseDto { * {@inheritDoc} */ public boolean isSelectable() { - return (getOutrankedCount().intValue() =3D=3D 0 && getOverrideCoun= t().intValue() =3D=3D 0); + return getOutrankedCount().intValue() =3D=3D 0 && = + getOverrideCount().intValue() =3D=3D 0 && isDeployable= (); } + = + = + = + = } diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResou= rce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringRe= source_en_US.xml index ad356ad..12d363a 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml @@ -6559,8 +6559,7 @@ Follow this url to see the full list of inactive syst= ems: Key - = - + = diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResour= ce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringReso= urce_en_US.xml index 56a20e2..ccfb6a9 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml @@ -318,7 +318,18 @@ We're sorry, but the system group could not be found. + + + Missing Capabilities = + + An operation could not be completed on a system due to a= missing capability. + + = + + The server <strong><a href=3D"{0}">= ;{1}</a></strong> does not have the <strong>{2}</stron= g> client capability. Please enable the capability before proceeding wit= h the operation. + + = This error may have occurred in one of three ways: @@ -13483,6 +13494,15 @@ Tip: If you would like to deploy this file to a sy= stem not in this list, you'll + = + +These systems do not yet have configuration deployment capability.= Configuration deployment requires that particular software is installed an= d enabled on your system. You may ensure that configuration deployment capa= bility will be enabled on these systems by selecting them in the <a hre= f=3D{0}>{1}</a> screen and then clicking "{2}" + + /rhn/configuration/Revision= Deploy.do + + + = + = You may grant provisioning entitlements <a href=3D"{0}">here= </a>. diff --git a/java/code/src/com/redhat/rhn/manager/MissingCapabilityExceptio= n.java b/java/code/src/com/redhat/rhn/manager/MissingCapabilityException.ja= va index d3957b6..c1099fa 100644 --- a/java/code/src/com/redhat/rhn/manager/MissingCapabilityException.java +++ b/java/code/src/com/redhat/rhn/manager/MissingCapabilityException.java @@ -17,73 +17,39 @@ package com.redhat.rhn.manager; import com.redhat.rhn.common.RhnRuntimeException; import com.redhat.rhn.domain.server.Server; = -import java.util.List; - /** * MissingCapabilityException * @version $Rev$ */ public class MissingCapabilityException extends RhnRuntimeException { = - private List servers; - private String capability; - /** - * = - */ - public MissingCapabilityException() { - super(); - } - - /** - * @param msg An error message - */ - public MissingCapabilityException(String msg) { - super(msg); - } - /** - * @param t The Throwable to wrap + * Comment for serialVersionUID */ - public MissingCapabilityException(Throwable t) { - super(t); - } - - /** - * @param msg An error message - * @param t The Throwable to wrap - */ - public MissingCapabilityException(String msg, Throwable t) { - super(msg, t); - } + private static final long serialVersionUID =3D 1569955542059271165L; + private Server server; + private String capability; = /** * Constructor for exception on missing capability on a bunch of serve= rs. * @param missingCapability the missing capability. = - * @param incapableServers the servers missing the capaibility = + * @param incapableServer the server missing the capaibility = */ public MissingCapabilityException(String missingCapability, - List incapableServers) { + Server incapableServer) { + = = - this(makeMessage(missingCapability, incapableServers)); - servers =3D incapableServers; + server =3D incapableServer; capability =3D missingCapability; } = - private static String makeMessage(String missingCapability, - List incapableServers) { - return "Missing Client Capability -> " + missingCapability + - " for the server [" + incapableServers + "]. The server" + - " will be unable to deploy config files " + - "until this capability is provided."; - } - = /** - * @return the list of servers missing the given capability + * @return the servers missing the given capability * or null if none exist. */ - public List getServers() { - return servers; + public Server getServer() { + return server; } = = diff --git a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java= b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java index 8a89935..ef23890 100644 --- a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java +++ b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java @@ -394,12 +394,8 @@ public class ActionManager extends BaseManager { if (ActionFactory.TYPE_CONFIGFILES_DEPLOY.equals(type) && !SystemManager.clientCapable(server.getId(), SystemManager.CAP_CONFIGFILES_DEPLOY))= { - String msg =3D "Missing Client Capability -> " + = - SystemManager.CAP_CONFIGFILES_DEPLOY + - " for the server [" + server + "]. The= server" + - " will be unable to deploy config fil= es " + - "until this capability is provided.= "; - throw new MissingCapabilityException(msg); + throw new MissingCapabilityException( + SystemManager.CAP_CONFIGFILES_DEPLOY, server); } ActionFactory.addServerToAction(server.getId(), a); = @@ -1293,7 +1289,7 @@ public class ActionManager extends BaseManager { Server srvr, String name, ScriptActionDetails script, Date ear= liest) { = if (!SystemManager.clientCapable(srvr.getId(), "script.run")) { - throw new MissingCapabilityException("script.run"); + throw new MissingCapabilityException("script.run", srvr); } = if (!SystemManager.hasEntitlement(srvr.getId(), EntitlementManager= .PROVISIONING)) { diff --git a/java/code/src/com/redhat/rhn/manager/configuration/Configurati= onManager.java b/java/code/src/com/redhat/rhn/manager/configuration/Configu= rationManager.java index cf07316..9d8647b 100644 --- a/java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManag= er.java +++ b/java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManag= er.java @@ -42,6 +42,7 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.dto.ConfigChannelDto; import com.redhat.rhn.frontend.dto.ConfigFileDto; import com.redhat.rhn.frontend.dto.ConfigFileNameDto; +import com.redhat.rhn.frontend.dto.ConfigGlobalDeployDto; import com.redhat.rhn.frontend.dto.ConfigSystemDto; import com.redhat.rhn.frontend.listview.PageControl; import com.redhat.rhn.manager.BaseManager; @@ -517,6 +518,7 @@ public class ConfigurationManager extends BaseManager { return dr; } = + = /** * Lists the file names to which the given server is subscribed * Finds the deployable revisions for each file name. @@ -1924,7 +1926,7 @@ public class ConfigurationManager extends BaseManager= { * @param pc paging control for UI control * @return list of ConfigGlobalDeployDtos */ - public DataResult listGlobalFileDeployInfo( + public DataResult listGlobalFileDeployInfo( User usr, ConfigChannel cc, = ConfigFile cf, PageControl pc) { return listGlobalFileDeployInfo(usr, cc, cf, pc, null); @@ -1941,7 +1943,7 @@ public class ConfigurationManager extends BaseManager= { * @param setLabel label of limiting set, or NULL if not set-limited * @return DataResult of ConfigGlobalDeployDtos */ - public DataResult listGlobalFileDeployInfo( + public DataResult listGlobalFileDeployInfo( User usr, ConfigChannel cc, = ConfigFile cf, PageControl pc, String setLabel) { diff --git a/java/code/webapp/WEB-INF/pages/common/errors/missingcapability= .jsp b/java/code/webapp/WEB-INF/pages/common/errors/missingcapability.jsp new file mode 100644 index 0000000..5791f3f --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/common/errors/missingcapability.jsp @@ -0,0 +1,23 @@ +<%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> + + + + + + +

                                      + 3D"${rhn:localize('error.common.errorAlt')}" + +

                                      +

                                      +

                                      + +
                                      + + + diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/= files/deployglobal.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/c= onfiguration/files/deployglobal.jspf index a83cced..a35bbd5 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/d= eployglobal.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/d= eployglobal.jspf @@ -24,7 +24,7 @@ - + * = @@ -53,6 +53,13 @@ +
                                      + = +
                                      * +


                                      diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/= files/deploylocal.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/co= nfiguration/files/deploylocal.jspf index db8dcb6..d3f1dfb 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/d= eploylocal.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/d= eploylocal.jspf @@ -10,13 +10,13 @@ - +
                                      + +

                                      @@ -59,5 +61,14 @@
                                      -
                                      + = + + +

                                      +

                                      = +
                                      + diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/= WEB-INF/struts-config.xml index b20292e..f05770d 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -1004,6 +1004,9 @@ + = = @@ -1727,15 +1738,18 @@ WHERE CCT.id =3D CC.confchan_type_id class=3D"com.redhat.rhn.frontend.dto.ConfigGlobalDeployDto"> SELECT S.ID, S.NAME - FROM rhnServer S, - rhnServerConfigChannel SCC, - rhnSet ST + FROM rhnServer S = + inner join rhnServerConfigChannel SCC on S.id =3D SCC.server_id + inner join rhnSet ST on ST.element =3D S.id + inner join rhnClientCapability CCap on CCap.server_id =3D S.id + inner join rhnClientCapabilityName CCN on CCap.capability_nam= e_id =3D CCN.id + inner join rhnServerFeaturesView SFV on SFV.server_id =3D s.id= = WHERE rhn_config_channel.get_user_chan_access(:ccid, :user_id) =3D 1 AND ST.user_id =3D :user_id AND ST.label =3D :set_label - AND ST.element =3D S.id AND SCC.config_channel_id =3D :ccid - AND S.id =3D SCC.server_id + AND CCN.name =3D 'configfiles,deploy' + AND SFV.label =3D 'ftr_config' = ORDER BY S.NAME diff --git a/java/code/src/com/redhat/rhn/common/errors/SatelliteExceptionH= andler.java b/java/code/src/com/redhat/rhn/common/errors/SatelliteException= Handler.java new file mode 100644 index 0000000..1f98758 --- /dev/null +++ b/java/code/src/com/redhat/rhn/common/errors/SatelliteExceptionHandler.= java @@ -0,0 +1,58 @@ +/** + * Copyright (c) 2009 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.errors; + + +import com.redhat.rhn.common.messaging.MessageQueue; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.events.TraceBackEvent; +import com.redhat.rhn.frontend.struts.RequestContext; + +import org.apache.log4j.Logger; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ExceptionHandler; + +import javax.servlet.http.HttpServletRequest; + + +/** + * SatelliteExceptionHandler + * @version $Rev$ + */ +public class SatelliteExceptionHandler extends ExceptionHandler { + private Exception exception; + = + /** + * {@inheritDoc} + */ + protected void logException(Exception ex) { + Logger log =3D Logger.getLogger(LookupExceptionHandler.class); + log.error(ex); + exception =3D (Exception) ex; + } + = + protected void storeException(HttpServletRequest request, String prope= rty, = + ActionMessage msg, ActionForward forward= , String scope) { + TraceBackEvent evt =3D new TraceBackEvent(); + RequestContext requestContext =3D new RequestContext(request); + User usr =3D requestContext.getLoggedInUser(); + evt.setUser(usr); + evt.setRequest(request); + evt.setException(exception); + MessageQueue.publish(evt); + request.setAttribute("error", exception); + } +} diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/fil= es/LocalRevisionDeployAction.java b/java/code/src/com/redhat/rhn/frontend/a= ction/configuration/files/LocalRevisionDeployAction.java index 2c435ce..4c45513 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/Loca= lRevisionDeployAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/Loca= lRevisionDeployAction.java @@ -55,6 +55,7 @@ public class LocalRevisionDeployAction extends RhnAction { public static final String SYSTEM =3D "system"; public static final String SYSTEM_ID =3D "sid"; public static final String LAST_DEPLOY =3D "lastDeploy"; + public static final String DEPLOYABLE =3D "deployable"; = /** {@inheritDoc} */ public ActionForward execute(ActionMapping mapping, ActionForm form, @@ -77,6 +78,9 @@ public class LocalRevisionDeployAction extends RhnAction { = if (cr !=3D null) { Server srv =3D findServer(request, cr); + if (ConfigurationManager.getInstance().isConfigEnabled(srv, us= r)) { + request.setAttribute(DEPLOYABLE, Boolean.TRUE); + } if (isSubmitted(dForm)) { submitDeploy(dForm, cr, srv, usr); success(request); diff --git a/java/code/src/com/redhat/rhn/frontend/dto/ConfigGlobalDeployDt= o.java b/java/code/src/com/redhat/rhn/frontend/dto/ConfigGlobalDeployDto.ja= va index 2eacf95..d4daed6 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/ConfigGlobalDeployDto.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/ConfigGlobalDeployDto.java @@ -30,8 +30,25 @@ public class ConfigGlobalDeployDto extends BaseDto { private String name; private Long outrankedCount; private Long overrideCount; + private boolean deployable; = /** + * @return true if deployable, as in config capable + featured + */ + public boolean isDeployable() { + return deployable; + } + + = + /** + * set true if ht efile is deployable. + * @param deployableIn true if deployable = + */ + public void setDeployable(Integer deployableIn) { + this.deployable =3D Integer.valueOf(1).equals(deployableIn); + } + + /** * @return system-id of the system whose deploy-state is the rest of t= he Dto data */ public Long getId() { @@ -138,6 +155,11 @@ public class ConfigGlobalDeployDto extends BaseDto { * {@inheritDoc} */ public boolean isSelectable() { - return (getOutrankedCount().intValue() =3D=3D 0 && getOverrideCoun= t().intValue() =3D=3D 0); + return getOutrankedCount().intValue() =3D=3D 0 && = + getOverrideCount().intValue() =3D=3D 0 && isDeployable= (); } + = + = + = + = } diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResou= rce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringRe= source_en_US.xml index ad356ad..12d363a 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml @@ -6559,8 +6559,7 @@ Follow this url to see the full list of inactive syst= ems: Key - = - + = diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResour= ce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringReso= urce_en_US.xml index 9f6331f..e3aa495 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml @@ -318,7 +318,18 @@ We're sorry, but the system group could not be found. + + + Missing Capabilities = + + An operation could not be completed on a system due to a= missing capability. + + = + + The server <strong><a href=3D"{0}">= ;{1}</a></strong> does not have the <strong>{2}</stron= g> client capability. Please enable the capability before proceeding wit= h the operation. + + = This error may have occurred in one of three ways: @@ -13483,6 +13494,15 @@ Tip: If you would like to deploy this file to a sy= stem not in this list, you'll + = + +These systems do not yet have configuration deployment capability.= Configuration deployment requires that particular software is installed an= d enabled on your system. You may ensure that configuration deployment capa= bility will be enabled on these systems by selecting them in the <a hre= f=3D{0}>{1}</a> screen and then clicking "{2}" + + /rhn/configuration/Revision= Deploy.do + + + = + = You may grant provisioning entitlements <a href=3D"{0}">here= </a>. diff --git a/java/code/src/com/redhat/rhn/manager/MissingCapabilityExceptio= n.java b/java/code/src/com/redhat/rhn/manager/MissingCapabilityException.ja= va index d3957b6..c1099fa 100644 --- a/java/code/src/com/redhat/rhn/manager/MissingCapabilityException.java +++ b/java/code/src/com/redhat/rhn/manager/MissingCapabilityException.java @@ -17,73 +17,39 @@ package com.redhat.rhn.manager; import com.redhat.rhn.common.RhnRuntimeException; import com.redhat.rhn.domain.server.Server; = -import java.util.List; - /** * MissingCapabilityException * @version $Rev$ */ public class MissingCapabilityException extends RhnRuntimeException { = - private List servers; - private String capability; - /** - * = - */ - public MissingCapabilityException() { - super(); - } - - /** - * @param msg An error message - */ - public MissingCapabilityException(String msg) { - super(msg); - } - /** - * @param t The Throwable to wrap + * Comment for serialVersionUID */ - public MissingCapabilityException(Throwable t) { - super(t); - } - - /** - * @param msg An error message - * @param t The Throwable to wrap - */ - public MissingCapabilityException(String msg, Throwable t) { - super(msg, t); - } + private static final long serialVersionUID =3D 1569955542059271165L; + private Server server; + private String capability; = /** * Constructor for exception on missing capability on a bunch of serve= rs. * @param missingCapability the missing capability. = - * @param incapableServers the servers missing the capaibility = + * @param incapableServer the server missing the capaibility = */ public MissingCapabilityException(String missingCapability, - List incapableServers) { + Server incapableServer) { + = = - this(makeMessage(missingCapability, incapableServers)); - servers =3D incapableServers; + server =3D incapableServer; capability =3D missingCapability; } = - private static String makeMessage(String missingCapability, - List incapableServers) { - return "Missing Client Capability -> " + missingCapability + - " for the server [" + incapableServers + "]. The server" + - " will be unable to deploy config files " + - "until this capability is provided."; - } - = /** - * @return the list of servers missing the given capability + * @return the servers missing the given capability * or null if none exist. */ - public List getServers() { - return servers; + public Server getServer() { + return server; } = = diff --git a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java= b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java index 8a89935..ef23890 100644 --- a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java +++ b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java @@ -394,12 +394,8 @@ public class ActionManager extends BaseManager { if (ActionFactory.TYPE_CONFIGFILES_DEPLOY.equals(type) && !SystemManager.clientCapable(server.getId(), SystemManager.CAP_CONFIGFILES_DEPLOY))= { - String msg =3D "Missing Client Capability -> " + = - SystemManager.CAP_CONFIGFILES_DEPLOY + - " for the server [" + server + "]. The= server" + - " will be unable to deploy config fil= es " + - "until this capability is provided.= "; - throw new MissingCapabilityException(msg); + throw new MissingCapabilityException( + SystemManager.CAP_CONFIGFILES_DEPLOY, server); } ActionFactory.addServerToAction(server.getId(), a); = @@ -1293,7 +1289,7 @@ public class ActionManager extends BaseManager { Server srvr, String name, ScriptActionDetails script, Date ear= liest) { = if (!SystemManager.clientCapable(srvr.getId(), "script.run")) { - throw new MissingCapabilityException("script.run"); + throw new MissingCapabilityException("script.run", srvr); } = if (!SystemManager.hasEntitlement(srvr.getId(), EntitlementManager= .PROVISIONING)) { diff --git a/java/code/src/com/redhat/rhn/manager/configuration/Configurati= onManager.java b/java/code/src/com/redhat/rhn/manager/configuration/Configu= rationManager.java index cf07316..9d8647b 100644 --- a/java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManag= er.java +++ b/java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManag= er.java @@ -42,6 +42,7 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.dto.ConfigChannelDto; import com.redhat.rhn.frontend.dto.ConfigFileDto; import com.redhat.rhn.frontend.dto.ConfigFileNameDto; +import com.redhat.rhn.frontend.dto.ConfigGlobalDeployDto; import com.redhat.rhn.frontend.dto.ConfigSystemDto; import com.redhat.rhn.frontend.listview.PageControl; import com.redhat.rhn.manager.BaseManager; @@ -517,6 +518,7 @@ public class ConfigurationManager extends BaseManager { return dr; } = + = /** * Lists the file names to which the given server is subscribed * Finds the deployable revisions for each file name. @@ -1924,7 +1926,7 @@ public class ConfigurationManager extends BaseManager= { * @param pc paging control for UI control * @return list of ConfigGlobalDeployDtos */ - public DataResult listGlobalFileDeployInfo( + public DataResult listGlobalFileDeployInfo( User usr, ConfigChannel cc, = ConfigFile cf, PageControl pc) { return listGlobalFileDeployInfo(usr, cc, cf, pc, null); @@ -1941,7 +1943,7 @@ public class ConfigurationManager extends BaseManager= { * @param setLabel label of limiting set, or NULL if not set-limited * @return DataResult of ConfigGlobalDeployDtos */ - public DataResult listGlobalFileDeployInfo( + public DataResult listGlobalFileDeployInfo( User usr, ConfigChannel cc, = ConfigFile cf, PageControl pc, String setLabel) { diff --git a/java/code/webapp/WEB-INF/pages/common/errors/missingcapability= .jsp b/java/code/webapp/WEB-INF/pages/common/errors/missingcapability.jsp new file mode 100644 index 0000000..5791f3f --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/common/errors/missingcapability.jsp @@ -0,0 +1,23 @@ +<%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> + + + + + + +

                                      + 3D"${rhn:localize('error.common.errorAlt')}" + +

                                      +

                                      +

                                      + +
                                      + + + diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/= files/deployglobal.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/c= onfiguration/files/deployglobal.jspf index a83cced..a35bbd5 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/d= eployglobal.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/d= eployglobal.jspf @@ -24,7 +24,7 @@ - + * = @@ -53,6 +53,13 @@ +
                                      + = +
                                      * +


                                      diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/= files/deploylocal.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/co= nfiguration/files/deploylocal.jspf index db8dcb6..d3f1dfb 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/d= eploylocal.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/d= eploylocal.jspf @@ -10,13 +10,13 @@
                                      - +
                                      + +

                                      @@ -59,5 +61,14 @@
                                      -
                                      + = + + +

                                      +

                                      = +
                                      + diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/= WEB-INF/struts-config.xml index b20292e..f05770d 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -1004,6 +1004,9 @@ + = diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements= .jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp index 21d8717..09ff020 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp @@ -6,12 +6,6 @@ = - - - - - - - - - - - - - - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp b/ja= va/code/webapp/WEB-INF/pages/admin/users/activelist.jsp index 1c68eb5..c581b81 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp @@ -10,19 +10,12 @@ - - - - - - - = diff --git a/java/code/webapp/WEB-INF/pages/admin/users/changeemail.jsp b/j= ava/code/webapp/WEB-INF/pages/admin/users/changeemail.jsp index a33c6fd..a00090c 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/changeemail.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/changeemail.jsp @@ -5,11 +5,6 @@ - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/user/user-header.jspf"= %> = @@ -19,9 +14,6 @@

                                      ${pageinstructions}

                                      - - - diff --git a/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp b/= java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp index d7292ba..8753ee4 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp @@ -10,12 +10,6 @@ - - - - - - = <%@ include file=3D"/WEB-INF/pages/common/fragments/user/user-header.jspf"= %> - -

                                      ${editAddressForm.map.typedispl= ay}

                                      diff --git a/java/code/webapp/WEB-INF/pages/admin/users/localepreferences.j= sp b/java/code/webapp/WEB-INF/pages/admin/users/localepreferences.jsp index f1fc352..b0acaa5 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/localepreferences.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/localepreferences.jsp @@ -7,8 +7,6 @@ = <%@ include file=3D"/WEB-INF/pages/common/fragments/user/user-header.jspf"= %> - - <%@ include file=3D"/WEB-INF/pages/common/fragments/user/localepreferences= .jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp b/j= ava/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp index 3e3a38a..95fe798 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp @@ -10,12 +10,6 @@ - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp b/j= ava/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp index fbf2184..82b07ad 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp @@ -10,8 +10,6 @@ = <%@ include file=3D"/WEB-INF/pages/common/fragments/user/user-header.jspf"= %> - - =

                                      diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp b/java= /code/webapp/WEB-INF/pages/admin/users/userlist.jsp index d63277e..8e4d350 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp @@ -10,12 +10,6 @@ - - - - - - = <%@ include file=3D"/WEB-INF/pages/common/fragments/user/user-header.jspf"= %> - - <%@ include file=3D"/WEB-INF/pages/common/fragments/user/preferences.jspf"= %> diff --git a/java/code/webapp/WEB-INF/pages/channel/all.jsp b/java/code/web= app/WEB-INF/pages/channel/all.jsp index 42a460f..d449ee6 100644 --- a/java/code/webapp/WEB-INF/pages/channel/all.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/all.jsp @@ -16,13 +16,7 @@ function showFiltered() { = - = - - - - - - + diff --git a/java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp= b/java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp index 0dff0c8..1df1442 100644 --- a/java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp @@ -9,13 +9,7 @@ = - = - - - - - - - - + diff --git a/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp b/java= /code/webapp/WEB-INF/pages/channel/entitlements.jsp index 0ff21e0..c759a26 100644 --- a/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp @@ -9,12 +9,6 @@ - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp b/java/c= ode/webapp/WEB-INF/pages/channel/erratalist.jsp index 38365e7..4fb0025 100644 --- a/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp @@ -7,14 +7,7 @@ = - - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/channel/channel_heade= r.jspf" %> +<%@ include file=3D"/WEB-INF/pages/common/fragments/channel/channel_header= .jspf" %>
                                      = = diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp b/java/c= ode/webapp/WEB-INF/pages/channel/manage/add.jsp index 72f3dc3..f8e69f4 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp @@ -10,15 +10,7 @@ - - - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage= _channel_header.jspf" %> +<%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage_= channel_header.jspf" %>

                                      3D"erratum"

                                      diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.= jsp b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp index 2289143..5b9d17b 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp @@ -20,13 +20,7 @@ = - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage= _channel_header.jspf" %> +<%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage_= channel_header.jspf" %>
                                      = diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.= jsp b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp index cf9d279..60aecdc 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp @@ -19,13 +19,7 @@ = - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage= _channel_header.jspf" %> +<%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage_= channel_header.jspf" %>
                                      = diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp = b/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp index 04a9d37..9fa51a1 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp @@ -19,13 +19,7 @@ = - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage= _channel_header.jspf" %> +<%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage_= channel_header.jspf" %>
                                      = diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackag= es.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.j= sp index 44804cd..2e56363 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp @@ -11,17 +11,7 @@ = - - - - - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage= _channel_header.jspf" %> +<%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage_= channel_header.jspf" %>

                                      diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.js= p b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp index 11408af..82d820b 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp @@ -10,13 +10,7 @@ - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage= _channel_header.jspf" %> +<%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage_= channel_header.jspf" %> =

                                      diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerratarem= ove.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove= .jsp index 4859f98..1dda37c 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp @@ -10,15 +10,7 @@ - - - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage= _channel_header.jspf" %> +<%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage_= channel_header.jspf" %>

                                      3D"erratum"

                                      diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.j= sp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp index 02599d5..10e0b1a 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp @@ -13,16 +13,6 @@ = - - - - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage_= channel_header.jspf" %> =
                                      diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected= .jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp index 79fba52..b12c2a8 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp @@ -13,16 +13,6 @@ = - - - - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage_= channel_header.jspf" %> =
                                      diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepac= kages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepack= ages.jsp index eb4cd69..b09b748 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.j= sp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.j= sp @@ -11,17 +11,7 @@ = - - - - - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage= _channel_header.jspf" %> +<%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage_= channel_header.jspf" %>

                                      diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp b/jav= a/code/webapp/WEB-INF/pages/channel/manage/delete.jsp index 3219202..f4c66c9 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp @@ -5,12 +5,6 @@ = - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp b/java/= code/webapp/WEB-INF/pages/channel/manage/edit.jsp index 885c076..d7c45e4 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp @@ -5,12 +5,6 @@ = - - - - - - - - - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage= _channel_header.jspf" %> +<%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage_= channel_header.jspf" %>

                                      3D"erratum"

                                      diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesyn= c.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp index 73d8b1f..9586d06 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp @@ -11,17 +11,7 @@ = - - - - - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage= _channel_header.jspf" %> +<%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage_= channel_header.jspf" %>
                                      =

                                      diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp= b/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp index 19b829b..8a10eae 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp @@ -10,15 +10,7 @@ - - - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage= _channel_header.jspf" %> +<%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage_= channel_header.jspf" %>

                                      3D"erratum"

                                      diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp b= /java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp index 21cef99..e0ff796 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp @@ -10,15 +10,7 @@ - - - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage= _channel_header.jspf" %> +<%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage_= channel_header.jspf" %>

                                      3D"erratum"

                                      diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp= b/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp index 18d0ff8..d22d45f 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp @@ -10,15 +10,7 @@ - - - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage= _channel_header.jspf" %> +<%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage_= channel_header.jspf" %> = = = diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackag= es.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.j= sp index 707e5cf..90a00e8 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp @@ -11,17 +11,7 @@ = - - - - - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage= _channel_header.jspf" %> +<%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage_= channel_header.jspf" %>
                                      =

                                      diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp b/jav= a/code/webapp/WEB-INF/pages/channel/manage/manage.jsp index 174bbb2..904d578 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp @@ -6,12 +6,6 @@ = - - - - - - = - - - - - - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/package/listremo= vecustompackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/packag= e/listremovecustompackages.jsp index df78218..b332550 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecusto= mpackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecusto= mpackages.jsp @@ -19,14 +19,6 @@ - - - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp = b/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp index 0ac6b82..39f22ea 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp @@ -10,13 +10,7 @@ - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage= _channel_header.jspf" %> +<%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage_= channel_header.jspf" %> =

                                      3D"package" Packages diff --git a/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp b/java/= code/webapp/WEB-INF/pages/channel/packagelist.jsp index ab359bf..4634994 100644 --- a/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp @@ -7,14 +7,7 @@ = - - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/channel/channel_heade= r.jspf" %> +<%@ include file=3D"/WEB-INF/pages/common/fragments/channel/channel_header= .jspf" %>
                                      = = diff --git a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp b/jav= a/code/webapp/WEB-INF/pages/channel/packagesearch.jsp index 4d1aa5a..14c9318 100644 --- a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp @@ -10,13 +10,7 @@ = - = - - - - - - - - + diff --git a/java/code/webapp/WEB-INF/pages/channel/redhat.jsp b/java/code/= webapp/WEB-INF/pages/channel/redhat.jsp index 006ce9c..a7149aa 100644 --- a/java/code/webapp/WEB-INF/pages/channel/redhat.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/redhat.jsp @@ -16,15 +16,7 @@ function showFiltered() { = - = - - - - - - - - + diff --git a/java/code/webapp/WEB-INF/pages/channel/relevant.jsp b/java/cod= e/webapp/WEB-INF/pages/channel/relevant.jsp index a8cfb8c..f437f66 100644 --- a/java/code/webapp/WEB-INF/pages/channel/relevant.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/relevant.jsp @@ -16,15 +16,7 @@ function showFiltered() { = - = - - - - - - - - + diff --git a/java/code/webapp/WEB-INF/pages/channel/retired.jsp b/java/code= /webapp/WEB-INF/pages/channel/retired.jsp index 7a85dbf..1036704 100644 --- a/java/code/webapp/WEB-INF/pages/channel/retired.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/retired.jsp @@ -16,13 +16,7 @@ function showFiltered() { = - = - - - - - - + diff --git a/java/code/webapp/WEB-INF/pages/channel/shared.jsp b/java/code/= webapp/WEB-INF/pages/channel/shared.jsp index dbf8e44..54d7db6 100644 --- a/java/code/webapp/WEB-INF/pages/channel/shared.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/shared.jsp @@ -16,13 +16,7 @@ function showFiltered() { = - = - - - - - - + <%@ include file=3D"/WEB-INF/pages/common/fragments/ssm/header.jspf" %> - - - -

                                      +

                                      = diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp= b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp index ad20058..143331d 100644 --- a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp @@ -8,9 +8,6 @@ <%@ include file=3D"/WEB-INF/pages/common/fragments/ssm/header.jspf" %> - - -

                                      diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp b/jav= a/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp index 46072ab..fdb801b 100644 --- a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp @@ -8,9 +8,6 @@ <%@ include file=3D"/WEB-INF/pages/common/fragments/ssm/header.jspf" %> - - -

                                      diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys= /common-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/activ= ationkeys/common-header.jspf index 87614b3..7859991 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common= -header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common= -header.jspf @@ -1,10 +1,5 @@ <%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> <%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> - - - - - <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> - - - - - diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/= files/deleteheader.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/c= onfiguration/files/deleteheader.jspf index 2dd8200..05f66e5 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/d= eleteheader.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/d= eleteheader.jspf @@ -3,10 +3,6 @@ <%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> - - - -
                                      diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/= files/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configu= ration/files/header.jspf index d3016bf..7c6de06 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/h= eader.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/h= eader.jspf @@ -6,12 +6,6 @@ <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c"%> <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/functions" prefix=3D"fn" %> - - - - - - <%-- = There are many cases here, so to avoid repeating information and ther= efore greater possibility of typos, set a whole bunch of strings up that wi= ll be diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/= files/manage_header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/= configuration/files/manage_header.jspf index f1fd7fa..3648f0d 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/m= anage_header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/m= anage_header.jspf @@ -4,13 +4,6 @@ <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c"%> <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/functions" prefix=3D"fn" %> - - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-= header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata= -header.jspf index a30d5ea..0210bac 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.= jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.= jspf @@ -3,12 +3,7 @@ <%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> - - - - - - + diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.= jspf b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf index e881e8b..1b4027e 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf @@ -5,11 +5,6 @@ <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/functions" prefix=3D"fn" %> = - - - - -
                                      diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/adva= nced/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstar= t/advanced/header.jspf index a3510c1..96c02ea 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/he= ader.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/he= ader.jspf @@ -2,10 +2,6 @@ <%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/functions" prefix=3D"fn" %> <%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> - - - - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/dele= teconfirm.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/= deleteconfirm.jspf index 96ecd38..8901bc1 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfi= rm.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfi= rm.jspf @@ -6,12 +6,6 @@ - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/login_form.jsp= f b/java/code/webapp/WEB-INF/pages/common/fragments/login_form.jspf index c8d937a..cc86647 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/login_form.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/login_form.jspf @@ -1,6 +1,5 @@
                                      - - <= /span> +
                                      = diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/profile/header= .jspf b/java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf index cc7b1f4..7932a12 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf @@ -2,11 +2,6 @@ <%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> - - - - - <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> - - - - - = - - - - -
                                      diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/user/user-head= er.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.= jspf index 1de0163..9aca189 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf @@ -3,11 +3,6 @@ <%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> - - - - - diff --git a/java/code/webapp/WEB-INF/pages/common/login.jsp b/java/code/we= bapp/WEB-INF/pages/common/login.jsp index 106a072..03ca7ee 100644 --- a/java/code/webapp/WEB-INF/pages/common/login.jsp +++ b/java/code/webapp/WEB-INF/pages/common/login.jsp @@ -9,12 +9,6 @@ - - - - - -
                                      diff --git a/java/code/webapp/WEB-INF/pages/common/relogin.jsp b/java/code/= webapp/WEB-INF/pages/common/relogin.jsp index a82f462..9066d4a 100644 --- a/java/code/webapp/WEB-INF/pages/common/relogin.jsp +++ b/java/code/webapp/WEB-INF/pages/common/relogin.jsp @@ -10,11 +10,6 @@ = - - - - -

                                      = diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/addfiles.= jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/addfiles.jsp index f8f04ec..f82086f 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/addfiles.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/addfiles.jsp @@ -6,12 +6,6 @@ - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/configuration/channel/details-hea= der.jspf"%> = diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/channelOv= erview.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/channelOv= erview.jsp index 7b1dbd9..8ba86ae 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/channelOverview.= jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/channelOverview.= jsp @@ -10,7 +10,6 @@ - <%@ include file=3D"/WEB-INF/pages/common/fragments/configuration/channel/details-hea= der.jspf"%>
                                      diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/channelcr= eate.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/channelcrea= te.jsp index a46f959..83938d4 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp @@ -8,11 +8,6 @@ = - - - - - diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/channelfi= les.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/channelfiles= .jsp index 7fe4c0e..56dc93e 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/channelfiles.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/channelfiles.jsp @@ -9,9 +9,6 @@ - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/configuration/channel/details-hea= der.jspf"%> = diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/channelsy= stems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/channelsys= tems.jsp index ebb8162..345e6e5 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.j= sp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.j= sp @@ -10,14 +10,6 @@ - - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/configuration/channel/details-hea= der.jspf"%> = diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.js= p b/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp index 22ed84a..995030f 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp @@ -9,8 +9,6 @@ = - - <%@ include file=3D"/WEB-INF/pages/common/fragments/configuration/channel/details-hea= der.jspf"%> = diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deploysys= tems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deploysyste= ms.jsp index 274c581..795fac0 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp @@ -9,7 +9,6 @@ = - <%@ include file=3D"/WEB-INF/pages/common/fragments/configuration/channel/details-hea= der.jspf"%> = diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/filecreat= e.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/filecreate.jsp index e4eb131..81ec4c3 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/filecreate.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/filecreate.jsp @@ -6,9 +6,6 @@ - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/configuration/channel/details-hea= der.jspf"%> = diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/fileimpor= t.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/fileimport.jsp index 47743fe..71e8c8c 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/fileimport.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/fileimport.jsp @@ -6,12 +6,6 @@ - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/configuration/channel/details-hea= der.jspf"%> = diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/fileup.js= p b/java/code/webapp/WEB-INF/pages/configuration/channel/fileup.jsp index 0a6b6c3..84eed2b 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/fileup.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/fileup.jsp @@ -6,9 +6,6 @@ - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/configuration/channel/details-hea= der.jspf"%> = diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/targetsys= tems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/targetsyste= ms.jsp index 10c39da..a2f3c33 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp @@ -7,14 +7,6 @@ - - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/configuration/channel/details-hea= der.jspf"%> = diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/comparechan= nel.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel= .jsp index 19a32c3..0b8b3da 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp @@ -8,9 +8,6 @@ = <%@ include file=3D"/WEB-INF/pages/common/fragments/configuration/files/he= ader.jspf" %> - - -

                                      =
                                      diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/comparecopy= .jsp b/java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp index 35359a0..b4521de 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp @@ -9,9 +9,6 @@ = <%@ include file=3D"/WEB-INF/pages/common/fragments/configuration/files/he= ader.jspf" %> - - -

                                      =
                                      diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/comparedepl= oyed.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/comparedeploy= ed.jsp index acbae01..21c521b 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/comparedeployed.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/comparedeployed.jsp @@ -10,9 +10,6 @@ = <%@ include file=3D"/WEB-INF/pages/common/fragments/configuration/files/he= ader.jspf" %> - - -

                                      =
                                      diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/comparefile= .jsp b/java/code/webapp/WEB-INF/pages/configuration/files/comparefile.jsp index 4ee42e3..b905f3d 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/comparefile.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/comparefile.jsp @@ -10,9 +10,6 @@ = <%@ include file=3D"/WEB-INF/pages/common/fragments/configuration/files/he= ader.jspf" %> - - -

                                      =
                                      diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/comparerevi= sion.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/comparerevisi= on.jsp index 3a0c6aa..6a04fef 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/comparerevision.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/comparerevision.jsp @@ -8,9 +8,6 @@ = <%@ include file=3D"/WEB-INF/pages/common/fragments/configuration/files/he= ader.jspf" %> - - -

                                      =
                                      diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/copycentral= .jsp b/java/code/webapp/WEB-INF/pages/configuration/files/copycentral.jsp index 78cb8db..a380ed5 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/copycentral.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/copycentral.jsp @@ -6,9 +6,6 @@ = <%@ include file=3D"/WEB-INF/pages/common/fragments/configuration/files/he= ader.jspf" %> - - -

                                      =
                                      diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.j= sp b/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp index 9acea0c..73a4b5d 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp @@ -7,9 +7,6 @@ = <%@ include file=3D"/WEB-INF/pages/common/fragments/configuration/files/he= ader.jspf" %> - - -

                                      =
                                      diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/copysandbox= .jsp b/java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp index c1ca069..7fb7f7d 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp @@ -7,9 +7,6 @@ = <%@ include file=3D"/WEB-INF/pages/common/fragments/configuration/files/he= ader.jspf" %> - - -

                                      =
                                      diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.= jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp index 5ac33a1..d8c6efe 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp @@ -7,9 +7,6 @@ - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/configuration/files/ma= nage_header.jspf"%> =

                                      diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.j= sp b/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp index cba4edd..c43d58b 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp @@ -9,9 +9,6 @@ - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/configuration/files/he= ader.jspf"%> =

                                      diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp = b/java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp index 8d5aa46..a366172 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp @@ -7,9 +7,6 @@ - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/configuration/files/he= ader.jspf"%> =

                                      diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deployconfi= rm.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.j= sp index 051490a..4e7490b 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp @@ -6,14 +6,6 @@ - - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/configuration/files/he= ader.jspf"%> =

                                      diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp b/= java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp index 5cba987..642049a 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp @@ -30,9 +30,6 @@ = <%@ include file=3D"/WEB-INF/pages/common/fragments/configuration/files/he= ader.jspf" %> - - -

                                      diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/filedetails= .jsp b/java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp index cee4a33..328e4b2 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp @@ -10,9 +10,6 @@ - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/configuration/files/he= ader.jspf"%> = diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp = b/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp index adda9d1..cdfc4fb 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp @@ -9,9 +9,6 @@ = <%@ include file=3D"/WEB-INF/pages/common/fragments/configuration/files/ma= nage_header.jspf" %> - - -
                                      - - - - - - - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/localfil= elist.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/localfile= list.jsp index 3cb264c..23f0ea9 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.j= sp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.j= sp @@ -7,12 +7,6 @@ - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/manageds= ystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/manageds= ystems.jsp index f5588f7..26ceda9 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.= jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.= jsp @@ -9,12 +9,6 @@ - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/summary.= jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp index ffd9242..6d925fe 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp @@ -6,12 +6,6 @@ - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/targetsy= stems.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/targetsys= tems.jsp index e971dde..458e1c6 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.j= sp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.j= sp @@ -8,14 +8,6 @@ - - - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.js= p b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp index 5678bce..b695a17 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp @@ -40,10 +40,7 @@

                                      - = - - = -

                                      +

                                      = diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystem= s.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp index dd61b9f..f892c26 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp @@ -8,9 +8,6 @@ <%@ include file=3D"/WEB-INF/pages/common/fragments/ssm/header.jspf" %> - - -

                                      3D'<bean:message' /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp b/= java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp index ec23801..a51c65a 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp @@ -7,9 +7,6 @@ <%@ include file=3D"/WEB-INF/pages/common/fragments/ssm/header.jspf" %> - - -

                                      3D'<bean:message' /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm= .jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp index ffc4e89..2358f28 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp @@ -7,9 +7,6 @@ <%@ include file=3D"/WEB-INF/pages/common/fragments/ssm/header.jspf" %> - - -

                                      3D'<bean:message' /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp b/ja= va/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp index 88472c5..77bed33 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp @@ -7,9 +7,6 @@ <%@ include file=3D"/WEB-INF/pages/common/fragments/ssm/header.jspf" %> - - -

                                      3D'<bean:message' /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.j= sp b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp index 8498ab1..e9476a5 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp @@ -7,9 +7,6 @@ <%@ include file=3D"/WEB-INF/pages/common/fragments/ssm/header.jspf" %> - - -

                                      3D'<bean:message' /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp= b/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp index 6d12bec..25a446a 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp @@ -7,9 +7,6 @@ <%@ include file=3D"/WEB-INF/pages/common/fragments/ssm/header.jspf" %> - - -

                                      3D'<bean:message' /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.j= sp b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp index 2fd7f97..d7e8c7a 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp @@ -8,9 +8,6 @@ <%@ include file=3D"/WEB-INF/pages/common/fragments/ssm/header.jspf" %> - - -

                                      3D'<bean:message' /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp b/= java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp index 687a75e..7d0a36c 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp @@ -8,9 +8,6 @@ = <%@ include file=3D"/WEB-INF/pages/common/fragments/ssm/header.jspf" %> - - -

                                      3D'<bean:message' /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary= .jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp index 6c2ad42..fbb32ae 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp @@ -8,9 +8,6 @@ = <%@ include file=3D"/WEB-INF/pages/common/fragments/ssm/header.jspf" %> - - -

                                      3D'<bean:message' /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.= jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp index 898fd88..a09efa1 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp @@ -25,9 +25,7 @@

                                      = - = - -

                                      = = diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp= b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp index 4e3e468..747e51a 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp @@ -8,9 +8,6 @@ = <%@ include file=3D"/WEB-INF/pages/common/fragments/ssm/header.jspf" %> - - -

                                      3D'<bean:message' /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconf= irm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm= .jsp index a6e18b0..839d332 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp @@ -10,9 +10,6 @@ = <%@ include file=3D"/WEB-INF/pages/common/fragments/ssm/header.jspf" %> - - -

                                      3D'<bean:message' /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannel= s.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp index b5efb21..6a86509 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp @@ -7,9 +7,6 @@ <%@ include file=3D"/WEB-INF/pages/common/fragments/ssm/header.jspf" %> - - -

                                      3D'<bean:message' /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.j= sp b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp index 820e81f..a023501 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp @@ -8,9 +8,6 @@ = <%@ include file=3D"/WEB-INF/pages/common/fragments/ssm/header.jspf" %> - - -

                                      3D'<bean:message' /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeco= nfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribecon= firm.jsp index 9b901ec..77124e2 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.j= sp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.j= sp @@ -8,9 +8,6 @@ = <%@ include file=3D"/WEB-INF/pages/common/fragments/ssm/header.jspf" %> - - -

                                      3D'<bean:message' /> diff --git a/java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.js= p b/java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp index 5d17b79..a975c14 100644 --- a/java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp @@ -9,20 +9,12 @@ - - - - - = - =

                                      - = - - = <%@ include file=3D"/WEB-INF/pages/common/fragments/errata/packagepush.jsp= f" %> diff --git a/java/code/webapp/WEB-INF/pages/errata/addchannels.jsp b/java/c= ode/webapp/WEB-INF/pages/errata/addchannels.jsp index f27db8b..3613388 100644 --- a/java/code/webapp/WEB-INF/pages/errata/addchannels.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/addchannels.jsp @@ -9,20 +9,12 @@ - - - - - = - =

                                      - = - - = diff --git a/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.js= p b/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp index 9552960..527ac47 100644 --- a/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp @@ -9,20 +9,12 @@ - - - - - = - =

                                      - = - - = <%@ include file=3D"/WEB-INF/pages/common/fragments/errata/packagepush.jsp= f" %> diff --git a/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp b/ja= va/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp index 97df990..422cf33 100644 --- a/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp @@ -12,12 +12,6 @@ = <%@ include file=3D"/WEB-INF/pages/common/fragments/errata/errata-header.j= spf" %> - - - - - -

                                      3D"<bean:message" /> diff --git a/java/code/webapp/WEB-INF/pages/errata/all.jsp b/java/code/weba= pp/WEB-INF/pages/errata/all.jsp index 3c56da7..3eb4fba 100644 --- a/java/code/webapp/WEB-INF/pages/errata/all.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/all.jsp @@ -10,12 +10,6 @@ - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp b/java/c= ode/webapp/WEB-INF/pages/errata/cloneerrata.jsp index b1a3cd4..9bf3b82 100644 --- a/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp @@ -6,13 +6,7 @@ = - - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/errata/create.jsp b/java/code/w= ebapp/WEB-INF/pages/errata/create.jsp index 2ef5d22..891d79a 100644 --- a/java/code/webapp/WEB-INF/pages/errata/create.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/create.jsp @@ -9,12 +9,7 @@ - - - - - = - @@ -24,10 +19,7 @@

                                      - - - - + = diff --git a/java/code/webapp/WEB-INF/pages/errata/delete.jsp b/java/code/w= ebapp/WEB-INF/pages/errata/delete.jsp index 8e2e5b8..2f2edd0 100644 --- a/java/code/webapp/WEB-INF/pages/errata/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/delete.jsp @@ -9,13 +9,7 @@ - - - - - - = - diff --git a/java/code/webapp/WEB-INF/pages/errata/edit.jsp b/java/code/web= app/WEB-INF/pages/errata/edit.jsp index e1da215..94095b8 100644 --- a/java/code/webapp/WEB-INF/pages/errata/edit.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/edit.jsp @@ -9,12 +9,7 @@ - - - - - = - @@ -60,11 +55,7 @@

                                      - - - - -
                                      +
                                      Just a nit, can you not use tabs and make them line up with the . [snip code removal bits] jesus --===============1267492041562893332==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:45 2015 Content-Type: multipart/mixed; boundary="===============2864442961977603042==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: 5 commits - projects/oracle-server-scripts spacewalk/setup Date: Mon, 22 Jun 2009 10:28:50 +0000 Message-ID: <20090622102850.9AB7E12037D@lists.fedorahosted.org> --===============2864442961977603042== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable projects/oracle-server-scripts/oracle-server-scripts.spec | 5 + spacewalk/setup/lib/Spacewalk/Setup.pm | 5 + spacewalk/setup/share/oracle/upgrade-db-10g.sh | 30 +++++++++= -- spacewalk/setup/share/oracle/upgrade-db.sh | 36 +++++++++= +---- 4 files changed, 57 insertions(+), 19 deletions(-) New commits: commit 1559316b307a5047f6cb615b7962f39cafc497a3 Author: Milan Zazrivec Date: Mon Jun 22 12:25:15 2009 +0200 support for db upgrade with custom user set diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/S= pacewalk/Setup.pm index 3a7a277..f010c7c 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -743,8 +743,9 @@ EOQ -err_message =3D> "Could not upgrade database.\n", -err_code =3D> 15, -system_opts =3D> ['/sbin/runuser', 'oracle', '-c', - "ORACLE_CUSTOM_SID=3D$answers->{'db-si= d'} " . SHARED_DIR . - '/oracle/' . $upgrade_script ]); + SHARED_DIR . '/oracle/' . $upgrade_scr= ipt . \ + " --db " . $answers->{'db-sid'} . \ + " --user " . $answers->{'db-user'}]); = system_or_exit(['service', 'oracle', 'restart'], 41, 'Could not restart oracle service'); commit c95a265670140ca7fbdd3f6c9c3e55f2ee068e7d Author: Milan Zazrivec Date: Mon Jun 22 12:19:54 2009 +0200 support for db upgrade with custom user set = - 10g -> 10g embedded db upgrade variant diff --git a/spacewalk/setup/share/oracle/upgrade-db-10g.sh b/spacewalk/set= up/share/oracle/upgrade-db-10g.sh index 36b8be7..6540aec 100644 --- a/spacewalk/setup/share/oracle/upgrade-db-10g.sh +++ b/spacewalk/setup/share/oracle/upgrade-db-10g.sh @@ -19,6 +19,28 @@ set -x # exit if anything fails set -e = +DB_NAME=3D"rhnsat" +DB_USER=3D"rhnsat" + +if [ ${#} -gt 0 ]; then + while [ -n "$1" ] ; do + case $1 in + -d | --db | --database ) + shift + DB_NAME=3D$1 + ;; + -u | --user* ) + shift + DB_USER=3D$1 + ;; + * ) + exit -1 + ;; + esac + shift + done +fi + # set oracle environment to embedded server ORAENV_ASK=3DNO ORACLE_BASE=3D/opt/apps/oracle @@ -26,11 +48,7 @@ ORACLE_ADMIN_DIR=3D$ORACLE_BASE/admin/10.2.0 ORACLE_CONFIG_DIR=3D$ORACLE_BASE/config/10.2.0 = # change env to rhnsat instance -if [ -z $ORACLE_CUSTOM_SID ]; then - export ORACLE_SID=3Drhnsat -else - export ORACLE_SID=3D$ORACLE_CUSTOM_SID -fi +export ORACLE_SID=3D$DB_NAME . oraenv = # upgrade database @@ -39,7 +57,7 @@ m4 $UPGRADE_TMPL -I$ORACLE_ADMIN_DIR \ --define RHNORA_DBNAME=3D$ORACLE_SID \ --define RHNORA_LOG_PATH=3D/rhnsat/admin/rhnsat/logs \ --define RHNORA_DATA_PATH=3D/rhnsat/data/rhnsat \ - --define RHNORA_DB_USER=3Drhnsat \ + --define RHNORA_DB_USER=3D$DB_USER \ | $ORACLE_HOME/bin/sqlplus /nolog = set +x commit 1b3db8adb1f983f6517aa52a53ee17f42cb49a14 Author: Milan Zazrivec Date: Mon Jun 22 12:17:07 2009 +0200 support for db upgrade with custom user set diff --git a/spacewalk/setup/share/oracle/upgrade-db.sh b/spacewalk/setup/s= hare/oracle/upgrade-db.sh index be75451..bccf2df 100644 --- a/spacewalk/setup/share/oracle/upgrade-db.sh +++ b/spacewalk/setup/share/oracle/upgrade-db.sh @@ -19,6 +19,27 @@ set -x # exit if anything fails set -e = +DB_NAME=3D"rhnsat" +DB_USER=3D"rhnsat" + +if [ ${#} -gt 0 ]; then + while [ -n "$1" ] ; do + case $1 in + -d | --db | --database ) + shift + DB_NAME=3D$1 + ;; + -u | --user* ) + shift + DB_USER=3D$1 + ;; + * ) + exit -1 + ;; + esac + shift + done +fi = # set oracle environment to embedded server ORAENV_ASK=3DNO @@ -32,14 +53,8 @@ ORACLE_ADMIN_9I_DIR=3D$ORACLE_BASE/admin/9.2.0 ORACLE_CONFIG_DIR=3D$ORACLE_BASE/config/10.2.0 ORACLE_CONFIG_9I_DIR=3D$ORACLE_BASE/config/9.2.0 = - # change env to rhnsat instance -if [ -z $ORACLE_CUSTOM_SID ]; then - export ORACLE_SID=3Drhnsat -else - export ORACLE_SID=3D$ORACLE_CUSTOM_SID -fi - +export ORACLE_SID=3D$DB_NAME = # In case the oratab entry for embedded database does not exist, create it grep -q "^$ORACLE_SID:.*$" /etc/oratab || echo "$ORACLE_SID:$ORACLE_HOME:Y= " >> /etc/oratab @@ -79,7 +94,7 @@ m4 $UPGRADE_TMPL -I$ORACLE_ADMIN_DIR \ --define RHNORA_DBNAME=3D$ORACLE_SID \ --define RHNORA_LOG_PATH=3D/rhnsat/admin/rhnsat/logs \ --define RHNORA_DATA_PATH=3D/rhnsat/data/rhnsat \ - --define RHNORA_DB_USER=3Drhnsat \ + --define RHNORA_DB_USER=3D$DB_USER \ | $ORACLE_HOME/bin/sqlplus /nolog = set +x commit 0b5ff7aa424f44dde828dd36775ec3a29131cf20 Author: Milan Zazrivec Date: Mon Jun 22 12:06:20 2009 +0200 create embedded db entry only if it does not exist diff --git a/projects/oracle-server-scripts/oracle-server-scripts.spec b/pr= ojects/oracle-server-scripts/oracle-server-scripts.spec index d097962..7ef4fe5 100644 --- a/projects/oracle-server-scripts/oracle-server-scripts.spec +++ b/projects/oracle-server-scripts/oracle-server-scripts.spec @@ -69,8 +69,9 @@ exit 0 = %post # set ORACLE_HOME -echo "embedded:%{oracle_home}:N" >>/etc/oratab \ - || echo "Unable add 'embedded:%{oracle_home}:N' entry to /etc/oratab" >&2 +grep -q "embedded:%{oracle_home}:N" /etc/oratab || \ +echo "embedded:%{oracle_home}:N" >> /etc/oratab || \ +echo "Unable to add 'embedded:%{oracle_home}:N' entry to /etc/oratab" >&2 = # setup environment for oracle user [ -f %{oracle_base}/.bash_profile ] \ commit ef6446f76198cb9a366b63f7d3a16b878c9a6d3c Author: Milan Zazrivec Date: Mon Jun 22 12:03:45 2009 +0200 set new embedded db oratab entry only if it does not exist diff --git a/spacewalk/setup/share/oracle/upgrade-db.sh b/spacewalk/setup/s= hare/oracle/upgrade-db.sh index f082292..be75451 100644 --- a/spacewalk/setup/share/oracle/upgrade-db.sh +++ b/spacewalk/setup/share/oracle/upgrade-db.sh @@ -33,15 +33,18 @@ ORACLE_CONFIG_DIR=3D$ORACLE_BASE/config/10.2.0 ORACLE_CONFIG_9I_DIR=3D$ORACLE_BASE/config/9.2.0 = = -# add rhnsat entry to oratab -echo "rhnsat:$ORACLE_HOME:Y" >>/etc/oratab - # change env to rhnsat instance if [ -z $ORACLE_CUSTOM_SID ]; then export ORACLE_SID=3Drhnsat else export ORACLE_SID=3D$ORACLE_CUSTOM_SID fi + + +# In case the oratab entry for embedded database does not exist, create it +grep -q "^$ORACLE_SID:.*$" /etc/oratab || echo "$ORACLE_SID:$ORACLE_HOME:Y= " >> /etc/oratab + + . oraenv = = --===============2864442961977603042==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:45 2015 Content-Type: multipart/mixed; boundary="===============6055876819118684889==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 5 commits - projects/oracle-server-scripts spacewalk/setup Date: Mon, 22 Jun 2009 10:30:29 +0000 Message-ID: <20090622103029.A139F12037D@lists.fedorahosted.org> --===============6055876819118684889== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable projects/oracle-server-scripts/oracle-server-scripts.spec | 5 + spacewalk/setup/lib/Spacewalk/Setup.pm | 5 + spacewalk/setup/share/oracle/upgrade-db-10g.sh | 30 +++++++++= -- spacewalk/setup/share/oracle/upgrade-db.sh | 36 +++++++++= +---- 4 files changed, 57 insertions(+), 19 deletions(-) New commits: commit 6eb73fa9ef5362d8b5f5efe244663058beec3dd7 Author: Milan Zazrivec Date: Mon Jun 22 12:25:15 2009 +0200 support for db upgrade with custom user set diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/S= pacewalk/Setup.pm index 4d65ea4..0fa0c6a 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -743,8 +743,9 @@ EOQ -err_message =3D> "Could not upgrade database.\n", -err_code =3D> 15, -system_opts =3D> ['/sbin/runuser', 'oracle', '-c', - "ORACLE_CUSTOM_SID=3D$answers->{'db-si= d'} " . SHARED_DIR . - '/oracle/' . $upgrade_script ]); + SHARED_DIR . '/oracle/' . $upgrade_scr= ipt . \ + " --db " . $answers->{'db-sid'} . \ + " --user " . $answers->{'db-user'}]); = system_or_exit(['service', 'oracle', 'restart'], 41, 'Could not restart oracle service'); commit 14127da9343a4d0bafb7d6998be516b130061946 Author: Milan Zazrivec Date: Mon Jun 22 12:19:54 2009 +0200 support for db upgrade with custom user set = - 10g -> 10g embedded db upgrade variant diff --git a/spacewalk/setup/share/oracle/upgrade-db-10g.sh b/spacewalk/set= up/share/oracle/upgrade-db-10g.sh index 36b8be7..6540aec 100644 --- a/spacewalk/setup/share/oracle/upgrade-db-10g.sh +++ b/spacewalk/setup/share/oracle/upgrade-db-10g.sh @@ -19,6 +19,28 @@ set -x # exit if anything fails set -e = +DB_NAME=3D"rhnsat" +DB_USER=3D"rhnsat" + +if [ ${#} -gt 0 ]; then + while [ -n "$1" ] ; do + case $1 in + -d | --db | --database ) + shift + DB_NAME=3D$1 + ;; + -u | --user* ) + shift + DB_USER=3D$1 + ;; + * ) + exit -1 + ;; + esac + shift + done +fi + # set oracle environment to embedded server ORAENV_ASK=3DNO ORACLE_BASE=3D/opt/apps/oracle @@ -26,11 +48,7 @@ ORACLE_ADMIN_DIR=3D$ORACLE_BASE/admin/10.2.0 ORACLE_CONFIG_DIR=3D$ORACLE_BASE/config/10.2.0 = # change env to rhnsat instance -if [ -z $ORACLE_CUSTOM_SID ]; then - export ORACLE_SID=3Drhnsat -else - export ORACLE_SID=3D$ORACLE_CUSTOM_SID -fi +export ORACLE_SID=3D$DB_NAME . oraenv = # upgrade database @@ -39,7 +57,7 @@ m4 $UPGRADE_TMPL -I$ORACLE_ADMIN_DIR \ --define RHNORA_DBNAME=3D$ORACLE_SID \ --define RHNORA_LOG_PATH=3D/rhnsat/admin/rhnsat/logs \ --define RHNORA_DATA_PATH=3D/rhnsat/data/rhnsat \ - --define RHNORA_DB_USER=3Drhnsat \ + --define RHNORA_DB_USER=3D$DB_USER \ | $ORACLE_HOME/bin/sqlplus /nolog = set +x commit 2e1cb861379d60fb118dafb283c61361b4bfbb4a Author: Milan Zazrivec Date: Mon Jun 22 12:17:07 2009 +0200 support for db upgrade with custom user set diff --git a/spacewalk/setup/share/oracle/upgrade-db.sh b/spacewalk/setup/s= hare/oracle/upgrade-db.sh index be75451..bccf2df 100644 --- a/spacewalk/setup/share/oracle/upgrade-db.sh +++ b/spacewalk/setup/share/oracle/upgrade-db.sh @@ -19,6 +19,27 @@ set -x # exit if anything fails set -e = +DB_NAME=3D"rhnsat" +DB_USER=3D"rhnsat" + +if [ ${#} -gt 0 ]; then + while [ -n "$1" ] ; do + case $1 in + -d | --db | --database ) + shift + DB_NAME=3D$1 + ;; + -u | --user* ) + shift + DB_USER=3D$1 + ;; + * ) + exit -1 + ;; + esac + shift + done +fi = # set oracle environment to embedded server ORAENV_ASK=3DNO @@ -32,14 +53,8 @@ ORACLE_ADMIN_9I_DIR=3D$ORACLE_BASE/admin/9.2.0 ORACLE_CONFIG_DIR=3D$ORACLE_BASE/config/10.2.0 ORACLE_CONFIG_9I_DIR=3D$ORACLE_BASE/config/9.2.0 = - # change env to rhnsat instance -if [ -z $ORACLE_CUSTOM_SID ]; then - export ORACLE_SID=3Drhnsat -else - export ORACLE_SID=3D$ORACLE_CUSTOM_SID -fi - +export ORACLE_SID=3D$DB_NAME = # In case the oratab entry for embedded database does not exist, create it grep -q "^$ORACLE_SID:.*$" /etc/oratab || echo "$ORACLE_SID:$ORACLE_HOME:Y= " >> /etc/oratab @@ -79,7 +94,7 @@ m4 $UPGRADE_TMPL -I$ORACLE_ADMIN_DIR \ --define RHNORA_DBNAME=3D$ORACLE_SID \ --define RHNORA_LOG_PATH=3D/rhnsat/admin/rhnsat/logs \ --define RHNORA_DATA_PATH=3D/rhnsat/data/rhnsat \ - --define RHNORA_DB_USER=3Drhnsat \ + --define RHNORA_DB_USER=3D$DB_USER \ | $ORACLE_HOME/bin/sqlplus /nolog = set +x commit 60808466340c023f691a7ed7a7712ab619335dae Author: Milan Zazrivec Date: Mon Jun 22 12:06:20 2009 +0200 create embedded db entry only if it does not exist diff --git a/projects/oracle-server-scripts/oracle-server-scripts.spec b/pr= ojects/oracle-server-scripts/oracle-server-scripts.spec index 3bdf392..cd4dce1 100644 --- a/projects/oracle-server-scripts/oracle-server-scripts.spec +++ b/projects/oracle-server-scripts/oracle-server-scripts.spec @@ -69,8 +69,9 @@ exit 0 = %post # set ORACLE_HOME -echo "embedded:%{oracle_home}:N" >>/etc/oratab \ - || echo "Unable add 'embedded:%{oracle_home}:N' entry to /etc/oratab" >&2 +grep -q "embedded:%{oracle_home}:N" /etc/oratab || \ +echo "embedded:%{oracle_home}:N" >> /etc/oratab || \ +echo "Unable to add 'embedded:%{oracle_home}:N' entry to /etc/oratab" >&2 = # setup environment for oracle user [ -f %{oracle_base}/.bash_profile ] \ commit 035ac3608e1d37f3e2608d97d10649b792247d7c Author: Milan Zazrivec Date: Mon Jun 22 12:03:45 2009 +0200 set new embedded db oratab entry only if it does not exist diff --git a/spacewalk/setup/share/oracle/upgrade-db.sh b/spacewalk/setup/s= hare/oracle/upgrade-db.sh index f082292..be75451 100644 --- a/spacewalk/setup/share/oracle/upgrade-db.sh +++ b/spacewalk/setup/share/oracle/upgrade-db.sh @@ -33,15 +33,18 @@ ORACLE_CONFIG_DIR=3D$ORACLE_BASE/config/10.2.0 ORACLE_CONFIG_9I_DIR=3D$ORACLE_BASE/config/9.2.0 = = -# add rhnsat entry to oratab -echo "rhnsat:$ORACLE_HOME:Y" >>/etc/oratab - # change env to rhnsat instance if [ -z $ORACLE_CUSTOM_SID ]; then export ORACLE_SID=3Drhnsat else export ORACLE_SID=3D$ORACLE_CUSTOM_SID fi + + +# In case the oratab entry for embedded database does not exist, create it +grep -q "^$ORACLE_SID:.*$" /etc/oratab || echo "$ORACLE_SID:$ORACLE_HOME:Y= " >> /etc/oratab + + . oraenv = = --===============6055876819118684889==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:45 2015 Content-Type: multipart/mixed; boundary="===============2179872426300691312==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - backend/server client/rhel Date: Mon, 22 Jun 2009 14:31:25 +0000 Message-ID: <20090622143125.35F2E1201D4@lists.fedorahosted.org> --===============2179872426300691312== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/rhnServer/server_kickstart.py | 5 ----- client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py | 2 ++ 2 files changed, 2 insertions(+), 5 deletions(-) New commits: commit 050793bb214e260ebff734275c2188d5fb529866 Author: Devan Goodwin Date: Mon Jun 22 11:28:59 2009 -0300 503090 - Fix missing packages reported during rhnreg_ks. = Bad logic resulted in any package that didn't have an rpm "cookie" being excluded from the initial list reported during registration. (it would often be picked up later when the package list is updated) Build system seems to no longer populate this cookie, updating to still add packages which have an arch but no cookie set. diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py b/= client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py index 87758a0..2bc168e 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py @@ -163,6 +163,8 @@ def getInstalledPackageList(msgCallback =3D None, progr= essCallback =3D None, cookie =3D h['cookie'] if arch and cookie: pkg_list.append([name, version, release, epoch, arch, cook= ie]) + elif arch: + pkg_list.append([name, version, release, epoch, arch]) else: pkg_list.append([name, version, release, epoch]) = commit 1980740abf8bff9fe0d30fbfe8c486f09526c28c Author: Devan Goodwin Date: Fri Jun 19 13:46:29 2009 -0300 Revert "503090 - Exclude rhnlib from kickstart profile sync." = This reverts commit ef545fff7d64e1e469e7808eb050a0aa832d81e2. diff --git a/backend/server/rhnServer/server_kickstart.py b/backend/server/= rhnServer/server_kickstart.py index 9e81975..3011062 100644 --- a/backend/server/rhnServer/server_kickstart.py +++ b/backend/server/rhnServer/server_kickstart.py @@ -665,10 +665,6 @@ def terminate_kickstart_sessions(server_id): = # Fetches the package profile from the kickstart session def get_kisckstart_session_package_profile(kickstart_session_id): - # NOTE: We're filtering out rhnlib in this query as it's manually - # upgraded anyhow in kickstart post scripts, and it appears the - # database might not yet know it's there when we attempt to - # sync with the package profile. h =3D rhnSQL.prepare(""" select pn.name, pe.version, pe.release, pe.epoch, pa.label from rhnKickstartSession ks, @@ -681,7 +677,6 @@ def get_kisckstart_session_package_profile(kickstart_se= ssion_id): and spp.name_id =3D pn.id and spp.evr_id =3D pe.id and spp.package_arch_id =3D pa.id - and pn.name !=3D 'rhnlib' """) h.execute(kickstart_session_id=3Dkickstart_session_id) return _packages_from_cursor(h) --===============2179872426300691312==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:45 2015 Content-Type: multipart/mixed; boundary="===============3564315638386534674==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - backend/server Date: Mon, 22 Jun 2009 14:37:47 +0000 Message-ID: <20090622143747.252671201D4@lists.fedorahosted.org> --===============3564315638386534674== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/rhnServer/server_kickstart.py | 5 ----- 1 file changed, 5 deletions(-) New commits: commit 935409a33bbd578d7f51163d03a236c346e56794 Author: Devan Goodwin Date: Fri Jun 19 13:46:29 2009 -0300 Revert "503090 - Exclude rhnlib from kickstart profile sync." = This reverts commit ef545fff7d64e1e469e7808eb050a0aa832d81e2. diff --git a/backend/server/rhnServer/server_kickstart.py b/backend/server/= rhnServer/server_kickstart.py index 9e81975..3011062 100644 --- a/backend/server/rhnServer/server_kickstart.py +++ b/backend/server/rhnServer/server_kickstart.py @@ -665,10 +665,6 @@ def terminate_kickstart_sessions(server_id): = # Fetches the package profile from the kickstart session def get_kisckstart_session_package_profile(kickstart_session_id): - # NOTE: We're filtering out rhnlib in this query as it's manually - # upgraded anyhow in kickstart post scripts, and it appears the - # database might not yet know it's there when we attempt to - # sync with the package profile. h =3D rhnSQL.prepare(""" select pn.name, pe.version, pe.release, pe.epoch, pa.label from rhnKickstartSession ks, @@ -681,7 +677,6 @@ def get_kisckstart_session_package_profile(kickstart_se= ssion_id): and spp.name_id =3D pn.id and spp.evr_id =3D pe.id and spp.package_arch_id =3D pa.id - and pn.name !=3D 'rhnlib' """) h.execute(kickstart_session_id=3Dkickstart_session_id) return _packages_from_cursor(h) --===============3564315638386534674==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:45 2015 Content-Type: multipart/mixed; boundary="===============0559183704655268475==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'multiorg3' Date: Mon, 22 Jun 2009 15:15:41 +0000 Message-ID: <20090622151541.3C2D01201D4@lists.fedorahosted.org> --===============0559183704655268475== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable New branch 'multiorg3' available with the following commits: --===============0559183704655268475==-- From partha at fedoraproject.org Thu Aug 20 11:57:45 2015 Content-Type: multipart/mixed; boundary="===============3658533307369961220==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: spacewalk/setup Date: Mon, 22 Jun 2009 16:00:13 +0000 Message-ID: <20090622160013.1F88B1201D4@lists.fedorahosted.org> --===============3658533307369961220== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/setup/bin/spacewalk-setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit acc4a1015dee3ae22ae78a06c9e68e62778f8cfb Author: Partha Aji Date: Mon Jun 22 12:02:46 2009 -0400 507338 - Fixed a spacewalk setup glitch where we not checkking for a nu= ll value.. diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spac= ewalk-setup index 01074a1..7285b45 100755 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -246,7 +246,7 @@ sub setup_cobbler { if ($opts{'enable-tftp'}) { $answers{'enable-tftp'} =3D $opts{'enable-tftp'}; } = - if ($answers{'enable-tftp'} =3D~ /^[Yy]/ ) { + if ($answers{'enable-tftp'} and $answers{'enable-tftp'} =3D~ /^[Yy]/ ) { system(COBBLER_COMMAND . " --enable-tftp=3Dyes"); } elsif ($answers{'enable-tftp'}) { --===============3658533307369961220==-- From partha at fedoraproject.org Thu Aug 20 11:57:45 2015 Content-Type: multipart/mixed; boundary="===============8385397179268683015==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - spacewalk/setup Date: Mon, 22 Jun 2009 16:01:24 +0000 Message-ID: <20090622160124.878261201D4@lists.fedorahosted.org> --===============8385397179268683015== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/setup/bin/spacewalk-setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4e5c1594dba9629ef6fd7e60c7d93d8f5dd5103d Author: Partha Aji Date: Mon Jun 22 12:02:46 2009 -0400 507338 - Fixed a spacewalk setup glitch where we not checkking for a nu= ll value.. diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spac= ewalk-setup index 01074a1..7285b45 100755 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -246,7 +246,7 @@ sub setup_cobbler { if ($opts{'enable-tftp'}) { $answers{'enable-tftp'} =3D $opts{'enable-tftp'}; } = - if ($answers{'enable-tftp'} =3D~ /^[Yy]/ ) { + if ($answers{'enable-tftp'} and $answers{'enable-tftp'} =3D~ /^[Yy]/ ) { system(COBBLER_COMMAND . " --enable-tftp=3Dyes"); } elsif ($answers{'enable-tftp'}) { --===============8385397179268683015==-- From partha at fedoraproject.org Thu Aug 20 11:57:45 2015 Content-Type: multipart/mixed; boundary="===============6358582136393672253==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Mon, 22 Jun 2009 16:34:56 +0000 Message-ID: <20090622163456.6534D1201D4@lists.fedorahosted.org> --===============6358582136393672253== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCom= mand.java | 17 +++++++--- 1 file changed, 12 insertions(+), 5 deletions(-) New commits: commit 78a893189350b81f8cb1c3e6b8997b8fa01f7865 Author: Partha Aji Date: Mon Jun 22 12:37:43 2009 -0400 Added a fix to master to ignore profiles that have not yet been synced = to cobbler.. diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtua= lInstanceCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/Prov= isionVirtualInstanceCommand.java index 3cf0d93..ac26ab5 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstan= ceCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstan= ceCommand.java @@ -39,6 +39,7 @@ import org.cobbler.Profile; = import java.io.File; import java.util.Date; +import java.util.Iterator; import java.util.LinkedList; = /** @@ -273,13 +274,19 @@ public class ProvisionVirtualInstanceCommand extends = KickstartScheduleCommand { */ public DataResult getKickstartProfiles() { DataResult result =3D super.getKickstartP= rofiles(); - for (KickstartDto dto : result) { + for (Iterator itr =3D result.iterator(); i= tr.hasNext();) { + KickstartDto dto =3D itr.next(); Profile prf =3D Profile.lookupById( CobblerXMLRPCHelper.getConnection(this.getUser()), dto= .getCobblerId()); - dto.setVirtBridge(prf.getVirtBridge()); - dto.setVirtCpus(prf.getVirtCpus()); - dto.setVirtMemory(prf.getVirtRam()); - dto.setVirtSpace(prf.getVirtFileSize()); + if (prf !=3D null) { + dto.setVirtBridge(prf.getVirtBridge()); + dto.setVirtCpus(prf.getVirtCpus()); + dto.setVirtMemory(prf.getVirtRam()); + dto.setVirtSpace(prf.getVirtFileSize()); + } + else { + itr.remove(); + } } return result; } --===============6358582136393672253==-- From partha at fedoraproject.org Thu Aug 20 11:57:45 2015 Content-Type: multipart/mixed; boundary="===============8421713937827309957==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Mon, 22 Jun 2009 16:50:00 +0000 Message-ID: <20090622165000.5644B1201D4@lists.fedorahosted.org> --===============8421713937827309957== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/conf/Config.java = | 20 ++-------- java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEdi= tAction.java | 2 - java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml= | 4 +- java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreat= eCommand.java | 5 ++ java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf= | 4 +- java/code/webapp/WEB-INF/struts-config.xml = | 4 +- 6 files changed, 15 insertions(+), 24 deletions(-) New commits: commit f8c300f21c42b4f02260684b42a0bdcc673ed62c Author: Partha Aji Date: Mon Jun 22 12:52:50 2009 -0400 507046 & 507048 - Fixed a couple of cobbler issues = 1) Fixed the issue of default config values for Virt items (like memory= , hard disk space) not being used any where. After this commit one should be able to find = the default config entries for virt items being applied when a profile is being created 2) Fixed issue of memory values being set in KB instead of MB when MB w= as what was intended.. diff --git a/java/code/src/com/redhat/rhn/common/conf/Config.java b/java/co= de/src/com/redhat/rhn/common/conf/Config.java index ef470cd..13fe9c3 100644 --- a/java/code/src/com/redhat/rhn/common/conf/Config.java +++ b/java/code/src/com/redhat/rhn/common/conf/Config.java @@ -177,7 +177,7 @@ public class Config { public static final String VIRT_PATH_DIR =3D "kickstart.virt_storage_p= ath"; private static final String DEFAULT_VIRT_PATH =3D "/var/lib/xen"; public static final String VIRT_BRIDGE =3D "kickstart.virt_bridge"; - public static final String VIRT_MEM =3D "kickstart.virt_mem_size_kb"; + public static final String VIRT_MEM =3D "kickstart.virt_mem_size_mb"; public static final String VIRT_CPU =3D "kickstart.virt_cpus"; public static final String VIRT_DISK =3D "kickstart.virt_disk_size_gb"; /** @@ -442,18 +442,6 @@ public class Config { = return value.split(","); } - - /** - * get the config entry for string s, if no value is found - * return the defaultValue specified. - * - * @param s string to get the value of - * @param defaultValue Default value if entry is not found. - * @return the value - */ - public long getLong(String s, long defaultValue) { - return Long.valueOf(getString(s, String.valueOf(defaultValue))); - } = /** * get the config entry for string name @@ -815,11 +803,11 @@ public class Config { } = /** - * Returns the defualt VirtMemory Size in KBs + * Returns the defualt VirtMemory Size in MBs * @return the memory size */ - public long getDefaultVirtMemorySize() { - return getLong(VIRT_MEM, 262144); + public int getDefaultVirtMemorySize() { + return getInt(VIRT_MEM, 256); } = /** diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Kicksta= rtDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kic= kstart/KickstartDetailsEditAction.java index e52e191..93f74ef 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetai= lsEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetai= lsEditAction.java @@ -73,7 +73,7 @@ public class KickstartDetailsEditAction extends BaseKicks= tartEditAction { public static final String IS_VIRT =3D "is_virt"; public static final String VIRT_CPU =3D "virt_cpus"; public static final String VIRT_DISK_SIZE =3D "virt_disk_size"; - public static final String VIRT_MEMORY =3D "virt_mem_kb"; + public static final String VIRT_MEMORY =3D "virt_mem_mb"; public static final String VIRT_BRIDGE =3D "virt_bridge"; public static final String VIRT_PATH =3D "virt_disk_path"; = diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResour= ce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringReso= urce_en_US.xml index 1788c54..7b9f359 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml @@ -9215,8 +9215,8 @@ Please note that some manual configuration of these s= cripts may still be require = = - - Virtual Memory (in kilobytes) + + Virtual Memory (in MB) /rhn/kickstart diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= ProfileCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/= cobbler/CobblerProfileCreateCommand.java index 0617e14..510967c 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfile= CreateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfile= CreateCommand.java @@ -76,7 +76,10 @@ public class CobblerProfileCreateCommand extends Cobbler= ProfileCommand { prof.setKsMeta(meta); KickstartFactory.saveKickstartData(this.ksData); prof.setVirtBridge(Config.get().getDefaultXenVirtBridge()); - prof.setKickstart(this.ksData.getCobblerFileName()); + prof.setVirtCpus(Config.get().getDefaultVirtCpus()); + prof.setVirtRam(Config.get().getDefaultVirtMemorySize()); + prof.setVirtFileSize(Config.get().getDefaultVirtDiskSize()); + prof.setKickstart(this.ksData.getCobblerFileName()); = prof.save(); = updateCobblerFields(prof); diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virt= options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/vi= rtoptions.jspf index 71bc7aa..cbcb96d 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions= .jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions= .jspf @@ -3,8 +3,8 @@ = = - + = diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/= WEB-INF/struts-config.xml index f05770d..5bd6f16 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -567,7 +567,7 @@ - + @@ -689,7 +689,7 @@ = - + = = --===============8421713937827309957==-- From partha at fedoraproject.org Thu Aug 20 11:57:45 2015 Content-Type: multipart/mixed; boundary="===============3834911200132612571==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Mon, 22 Jun 2009 16:51:38 +0000 Message-ID: <20090622165138.0DEE11201D4@lists.fedorahosted.org> --===============3834911200132612571== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/conf/Config.java = | 20 ++-------- java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEdi= tAction.java | 2 - java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml= | 4 +- java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreat= eCommand.java | 5 ++ java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf= | 4 +- java/code/webapp/WEB-INF/struts-config.xml = | 4 +- 6 files changed, 15 insertions(+), 24 deletions(-) New commits: commit b7fecb7497a3535ac495af339ed55aebf147b3e2 Author: Partha Aji Date: Mon Jun 22 12:52:50 2009 -0400 507046 & 507048 - Fixed a couple of cobbler issues = 1) Fixed the issue of default config values for Virt items (like memory= , hard disk space) not being used any where. After this commit one should be able to find = the default config entries for virt items being applied when a profile is being created 2) Fixed issue of memory values being set in KB instead of MB when MB w= as what was intended.. diff --git a/java/code/src/com/redhat/rhn/common/conf/Config.java b/java/co= de/src/com/redhat/rhn/common/conf/Config.java index ef470cd..13fe9c3 100644 --- a/java/code/src/com/redhat/rhn/common/conf/Config.java +++ b/java/code/src/com/redhat/rhn/common/conf/Config.java @@ -177,7 +177,7 @@ public class Config { public static final String VIRT_PATH_DIR =3D "kickstart.virt_storage_p= ath"; private static final String DEFAULT_VIRT_PATH =3D "/var/lib/xen"; public static final String VIRT_BRIDGE =3D "kickstart.virt_bridge"; - public static final String VIRT_MEM =3D "kickstart.virt_mem_size_kb"; + public static final String VIRT_MEM =3D "kickstart.virt_mem_size_mb"; public static final String VIRT_CPU =3D "kickstart.virt_cpus"; public static final String VIRT_DISK =3D "kickstart.virt_disk_size_gb"; /** @@ -442,18 +442,6 @@ public class Config { = return value.split(","); } - - /** - * get the config entry for string s, if no value is found - * return the defaultValue specified. - * - * @param s string to get the value of - * @param defaultValue Default value if entry is not found. - * @return the value - */ - public long getLong(String s, long defaultValue) { - return Long.valueOf(getString(s, String.valueOf(defaultValue))); - } = /** * get the config entry for string name @@ -815,11 +803,11 @@ public class Config { } = /** - * Returns the defualt VirtMemory Size in KBs + * Returns the defualt VirtMemory Size in MBs * @return the memory size */ - public long getDefaultVirtMemorySize() { - return getLong(VIRT_MEM, 262144); + public int getDefaultVirtMemorySize() { + return getInt(VIRT_MEM, 256); } = /** diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Kicksta= rtDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kic= kstart/KickstartDetailsEditAction.java index e52e191..93f74ef 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetai= lsEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetai= lsEditAction.java @@ -73,7 +73,7 @@ public class KickstartDetailsEditAction extends BaseKicks= tartEditAction { public static final String IS_VIRT =3D "is_virt"; public static final String VIRT_CPU =3D "virt_cpus"; public static final String VIRT_DISK_SIZE =3D "virt_disk_size"; - public static final String VIRT_MEMORY =3D "virt_mem_kb"; + public static final String VIRT_MEMORY =3D "virt_mem_mb"; public static final String VIRT_BRIDGE =3D "virt_bridge"; public static final String VIRT_PATH =3D "virt_disk_path"; = diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResour= ce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringReso= urce_en_US.xml index 7e07093..3fe6383 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml @@ -9215,8 +9215,8 @@ Please note that some manual configuration of these s= cripts may still be require = = - - Virtual Memory (in kilobytes) + + Virtual Memory (in MB) /rhn/kickstart diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= ProfileCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/= cobbler/CobblerProfileCreateCommand.java index 0617e14..510967c 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfile= CreateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfile= CreateCommand.java @@ -76,7 +76,10 @@ public class CobblerProfileCreateCommand extends Cobbler= ProfileCommand { prof.setKsMeta(meta); KickstartFactory.saveKickstartData(this.ksData); prof.setVirtBridge(Config.get().getDefaultXenVirtBridge()); - prof.setKickstart(this.ksData.getCobblerFileName()); + prof.setVirtCpus(Config.get().getDefaultVirtCpus()); + prof.setVirtRam(Config.get().getDefaultVirtMemorySize()); + prof.setVirtFileSize(Config.get().getDefaultVirtDiskSize()); + prof.setKickstart(this.ksData.getCobblerFileName()); = prof.save(); = updateCobblerFields(prof); diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virt= options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/vi= rtoptions.jspf index 71bc7aa..cbcb96d 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions= .jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions= .jspf @@ -3,8 +3,8 @@ = = - + = diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/= WEB-INF/struts-config.xml index f05770d..5bd6f16 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -567,7 +567,7 @@ - + @@ -689,7 +689,7 @@ = - + = = --===============3834911200132612571==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:45 2015 Content-Type: multipart/mixed; boundary="===============2317722160795417045==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: client/rhel Date: Mon, 22 Jun 2009 17:07:26 +0000 Message-ID: <20090622170726.8F29A1201D4@lists.fedorahosted.org> --===============2317722160795417045== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/rhel/yum-rhn-plugin/rhnplugin.py | 2 ++ 1 file changed, 2 insertions(+) New commits: commit 5ba5cbfef951f6312ef0aff50cfc3a946d2e44b7 Author: Pradeep Kilambi Date: Mon Jun 22 13:07:18 2009 -0400 yum operations are not getting redirected as the GET requested is forme= d at the plugin level and not through rhnlib. diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py b/client/rhel/yum-rhn-= plugin/rhnplugin.py index 3c572f4..34ad320 100644 --- a/client/rhel/yum-rhn-plugin/rhnplugin.py +++ b/client/rhel/yum-rhn-plugin/rhnplugin.py @@ -288,6 +288,8 @@ class RhnRepo(YumRepository): raise yum.Errors.RepoError(error) = self.http_headers[header] =3D li[header] + # Set the redirect flag + self.http_headers['X-RHN-Transport-Capability'] =3D "follow-redire= cts=3D3" = # Override the 'private' __get method so we can do our auth stuff. def _getFile(self, url=3DNone, relative=3DNone, local=3DNone, --===============2317722160795417045==-- From shughes at fedoraproject.org Thu Aug 20 11:57:45 2015 Content-Type: multipart/mixed; boundary="===============7032291114441140974==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Mon, 22 Jun 2009 18:45:53 +0000 Message-ID: <20090622184553.0BF611201D4@lists.fedorahosted.org> --===============7032291114441140974== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/security/PermissionException.java = | 3 +-- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml= | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) New commits: commit 7014fdd1e776ddd2d973ae3ec9de60408142a009 Author: Shannon Hughes Date: Mon Jun 22 14:37:33 2009 -0400 506693 - removed more contact.pxt references diff --git a/java/code/src/com/redhat/rhn/common/security/PermissionExcepti= on.java b/java/code/src/com/redhat/rhn/common/security/PermissionException.= java index 3a2010b..1168c41 100644 --- a/java/code/src/com/redhat/rhn/common/security/PermissionException.java +++ b/java/code/src/com/redhat/rhn/common/security/PermissionException.java @@ -93,8 +93,7 @@ public class PermissionException extends RhnRuntimeExcept= ion { new Object[] {minutes, loginUrl}); = //The third reason gives a way to report bugs in the site. - String contactUrl =3D "/help/contact.pxt"; - addReason(ol, "permission.jsp.summary.acl.reason3", new Object[] {= contactUrl}); + addReason(ol, "permission.jsp.summary.acl.reason3", null); = //You need cookies to view our site. addReason(ol, "permission.jsp.summary.acl.reason4", null); diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResour= ce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringReso= urce_en_US.xml index 7b9f359..10fcf8c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml @@ -572,7 +572,7 @@ = -You've found an error in our site. Please help us by filling out = <a href=3D"/help/contact.pxt">this form</a> with details of how= you received this message. +You've found an error in our site. Bad Parameter error page @@ -625,7 +625,7 @@ = -If you feel you've reached this page in error, please <a href= =3D"/help/contact.pxt">contact us</a> with details of how you rece= ived this message. +If you feel you've reached this page in error, please contact us w= ith details of how you received this message. 404 error page @@ -653,7 +653,7 @@ = -Please help us correct this problem by <a href=3D"/help/contact= .pxt">contacting us</a> with details of how you received this mess= age. +Please help us correct this problem by contacting us with details = of how you received this message. 500 error page @@ -18286,7 +18286,7 @@ performing a kickstart or creating a new kickstart = distribution.</strong> = -Please help us correct this problem by <a href=3D"/help/contact= .pxt">contacting us</a> with details of how you received this mess= age. +Please help us correct this problem by contacting us with details = of how you received this message. service error page --===============7032291114441140974==-- From shughes at fedoraproject.org Thu Aug 20 11:57:45 2015 Content-Type: multipart/mixed; boundary="===============4147721725706446010==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Mon, 22 Jun 2009 18:48:47 +0000 Message-ID: <20090622184847.3D60D1201D4@lists.fedorahosted.org> --===============4147721725706446010== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/security/PermissionException.java = | 3 +-- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml= | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) New commits: commit 0c19ba1f7ae36fc077ef3da88ed79012bd1207ab Author: Shannon Hughes Date: Mon Jun 22 14:37:33 2009 -0400 506693 - removed more contact.pxt references diff --git a/java/code/src/com/redhat/rhn/common/security/PermissionExcepti= on.java b/java/code/src/com/redhat/rhn/common/security/PermissionException.= java index 3a2010b..1168c41 100644 --- a/java/code/src/com/redhat/rhn/common/security/PermissionException.java +++ b/java/code/src/com/redhat/rhn/common/security/PermissionException.java @@ -93,8 +93,7 @@ public class PermissionException extends RhnRuntimeExcept= ion { new Object[] {minutes, loginUrl}); = //The third reason gives a way to report bugs in the site. - String contactUrl =3D "/help/contact.pxt"; - addReason(ol, "permission.jsp.summary.acl.reason3", new Object[] {= contactUrl}); + addReason(ol, "permission.jsp.summary.acl.reason3", null); = //You need cookies to view our site. addReason(ol, "permission.jsp.summary.acl.reason4", null); diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResour= ce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringReso= urce_en_US.xml index 3fe6383..c9d7ddf 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml @@ -572,7 +572,7 @@ = -You've found an error in our site. Please help us by filling out = <a href=3D"/help/contact.pxt">this form</a> with details of how= you received this message. +You've found an error in our site. Bad Parameter error page @@ -625,7 +625,7 @@ = -If you feel you've reached this page in error, please <a href= =3D"/help/contact.pxt">contact us</a> with details of how you rece= ived this message. +If you feel you've reached this page in error, please contact us w= ith details of how you received this message. 404 error page @@ -653,7 +653,7 @@ = -Please help us correct this problem by <a href=3D"/help/contact= .pxt">contacting us</a> with details of how you received this mess= age. +Please help us correct this problem by contacting us with details = of how you received this message. 500 error page @@ -18286,7 +18286,7 @@ performing a kickstart or creating a new kickstart = distribution.</strong> = -Please help us correct this problem by <a href=3D"/help/contact= .pxt">contacting us</a> with details of how you received this mess= age. +Please help us correct this problem by contacting us with details = of how you received this message. service error page --===============4147721725706446010==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:45 2015 Content-Type: multipart/mixed; boundary="===============4016207934015529580==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Mon, 22 Jun 2009 19:18:56 +0000 Message-ID: <20090622191856.BE1111201D4@lists.fedorahosted.org> --===============4016207934015529580== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml = | 9 ++ java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.ja= va | 15 ++++ java/code/src/com/redhat/rhn/manager/system/SystemManager.java = | 18 +++++ java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java = | 32 ++++++++++ 4 files changed, 73 insertions(+), 1 deletion(-) New commits: commit ff15c7f2793b0ca1e31278c6b2fc0fd5ca9932cc Author: Justin Sherrill Date: Mon Jun 22 15:18:26 2009 -0400 506816 - fixing issue where virt hosts that begin to use sat 5.3 could = not install spacewalk-koan = we fixed this by detecting if rhn-kickstart-virtualization is installed= , and if so, we remove it diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_q= ueries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_q= ueries.xml index 83d84c8..3b335d3 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.= xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.= xml @@ -1536,6 +1536,15 @@ DELETE FROM rhnSatelliteChannelFamily WHERE server_i= d =3D :sid = + + + SELECT SP.name_id, SP.evr_id, SP.PACKAGE_ARCH_ID as arch_id + from rhnServerPackage SP inner join + rhnPackageName PN on SP.name_id =3D PN.id + where SP.server_id =3D :sid + AND PN.name =3D :name + + = = diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSchedu= leCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSc= heduleCommand.java index ea0650b..e0e9d42 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java @@ -118,6 +118,8 @@ public class KickstartScheduleCommand extends BaseSyste= mOperation { public static final String TARGET_PROFILE_TYPE_SYSTEM =3D "system"; public static final String TARGET_PROFILE_TYPE_NONE =3D "none"; = = + public static final String PACKAGE_TO_REMOVE =3D "rhn-kickstart-virtua= lization"; + = private User user; private KickstartData ksdata; @@ -553,12 +555,23 @@ public class KickstartScheduleCommand extends BaseSys= temOperation { Server hostServer =3D getHostServer(); log.debug("** Server we are operating on: " + hostServer); = - // Install packages on the host server. = + //rhn-kickstart-virtualization conflicts with this package, so we = have to + // remove it + List> installed =3D SystemManager.listInstalledP= ackage( + PACKAGE_TO_REMOVE, hostSer= ver); + Action removal =3D null; + if (!installed.isEmpty()) { + removal =3D ActionManager.schedulePackageRemoval(user, hostSer= ver, + installed, scheduleDate); + } + + // Install packages on the host server. log.debug("** Creating packageAction"); Action packageAction =3D = ActionManager.schedulePackageInstall( this.user, hostServer, this.packagesToInstall, scheduleDat= e); + packageAction.setPrerequisite(removal); log.debug("** Created packageAction ? " + packageAction.getId()); = // Make sure we fail all existing sessions for this server since diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java= b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java index 8b1280d..1fe3ed9 100644 --- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java +++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java @@ -2553,4 +2553,22 @@ public class SystemManager extends BaseManager { params.put("sid", sid); return m.execute(params); } + + /** + * List all of the installed packages with the given name + * @param packageName the package name + * @param server the server + * @return list of maps with name_id, evr_id and arch_id + */ + public static List> listInstalledPackage( + String packageName, Server server) { + SelectMode m =3D ModeFactory.getMode("System_queries", + "list_installed_packages_for_name"); + Map params =3D new HashMap(); + params.put("sid", server.getId()); + params.put("name", packageName); + return m.execute(params); + } + + } diff --git a/java/code/src/com/redhat/rhn/manager/system/test/SystemManager= Test.java b/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerT= est.java index 164f5e9..ad7ba59 100644 --- a/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.ja= va +++ b/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.ja= va @@ -38,6 +38,8 @@ import com.redhat.rhn.domain.org.test.CustomDataKeyTest; import com.redhat.rhn.domain.rhnpackage.Package; import com.redhat.rhn.domain.rhnpackage.PackageEvr; import com.redhat.rhn.domain.rhnpackage.PackageEvrFactory; +import com.redhat.rhn.domain.rhnpackage.PackageFactory; +import com.redhat.rhn.domain.rhnpackage.test.PackageEvrFactoryTest; import com.redhat.rhn.domain.rhnpackage.test.PackageTest; import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.rhnset.SetCleanup; @@ -47,6 +49,7 @@ import com.redhat.rhn.domain.server.CustomDataValue; import com.redhat.rhn.domain.server.Device; import com.redhat.rhn.domain.server.Dmi; import com.redhat.rhn.domain.server.EntitlementServerGroup; +import com.redhat.rhn.domain.server.InstalledPackage; import com.redhat.rhn.domain.server.Location; import com.redhat.rhn.domain.server.ManagedServerGroup; import com.redhat.rhn.domain.server.Network; @@ -73,6 +76,7 @@ import com.redhat.rhn.frontend.dto.SystemOverview; import com.redhat.rhn.frontend.listview.PageControl; import com.redhat.rhn.manager.entitlement.EntitlementManager; import com.redhat.rhn.manager.errata.cache.ErrataCacheManager; +import com.redhat.rhn.manager.rhnpackage.PackageManager; import com.redhat.rhn.manager.rhnpackage.test.PackageManagerTest; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; @@ -92,10 +96,12 @@ import org.hibernate.Session; import java.sql.SQLException; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Set; = /** * SystemManagerTest @@ -1301,4 +1307,30 @@ public class SystemManagerTest extends RhnBaseTestCa= se { assertTrue(errata.size() =3D=3D 1); assertTrue(SystemManager.hasUnscheduledErrata(user, server.getId()= )); } + + public void testListInstalledPackage() throws Exception { + User user =3D UserTestUtils.findNewUser("testUser", "testOrg"); + Server s =3D ServerFactoryTest.createTestServer(user); + + List> list =3D SystemManager.listInstalledPackag= e("kernel", s); + assertTrue(list.isEmpty()); + + InstalledPackage p =3D new InstalledPackage(); + p.setArch(PackageFactory.lookupPackageArchByLabel("x86_64")); + p.setName(PackageManager.lookupPackageName("kernel")); + p.setEvr(PackageEvrFactoryTest.createTestPackageEvr()); + p.setServer(s); + Set set =3D new HashSet(); + set.add(p); + s.setPackages(set); + + ServerFactory.save(s); + + list =3D SystemManager.listInstalledPackage("kernel", s); + assertTrue(list.size() =3D=3D 1); + assertEquals(list.get(0).get("name_id"), p.getName().getId()); + assertEquals(list.get(0).get("evr_id"), p.getEvr().getId()); + + } + } --===============4016207934015529580==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:45 2015 Content-Type: multipart/mixed; boundary="===============8659403245757165878==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Mon, 22 Jun 2009 19:20:14 +0000 Message-ID: <20090622192014.CE0761201D4@lists.fedorahosted.org> --===============8659403245757165878== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml = | 9 ++ java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.ja= va | 15 ++++ java/code/src/com/redhat/rhn/manager/system/SystemManager.java = | 18 +++++ java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java = | 32 ++++++++++ 4 files changed, 73 insertions(+), 1 deletion(-) New commits: commit 8644930c705b7e0bc9336ffbde9d61c223054755 Author: Justin Sherrill Date: Mon Jun 22 15:18:26 2009 -0400 506816 - fixing issue where virt hosts that begin to use sat 5.3 could = not install spacewalk-koan = we fixed this by detecting if rhn-kickstart-virtualization is installed= , and if so, we remove it diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_q= ueries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_q= ueries.xml index 83d84c8..3b335d3 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.= xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.= xml @@ -1536,6 +1536,15 @@ DELETE FROM rhnSatelliteChannelFamily WHERE server_i= d =3D :sid = + + + SELECT SP.name_id, SP.evr_id, SP.PACKAGE_ARCH_ID as arch_id + from rhnServerPackage SP inner join + rhnPackageName PN on SP.name_id =3D PN.id + where SP.server_id =3D :sid + AND PN.name =3D :name + + = = diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSchedu= leCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSc= heduleCommand.java index ea0650b..e0e9d42 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java @@ -118,6 +118,8 @@ public class KickstartScheduleCommand extends BaseSyste= mOperation { public static final String TARGET_PROFILE_TYPE_SYSTEM =3D "system"; public static final String TARGET_PROFILE_TYPE_NONE =3D "none"; = = + public static final String PACKAGE_TO_REMOVE =3D "rhn-kickstart-virtua= lization"; + = private User user; private KickstartData ksdata; @@ -553,12 +555,23 @@ public class KickstartScheduleCommand extends BaseSys= temOperation { Server hostServer =3D getHostServer(); log.debug("** Server we are operating on: " + hostServer); = - // Install packages on the host server. = + //rhn-kickstart-virtualization conflicts with this package, so we = have to + // remove it + List> installed =3D SystemManager.listInstalledP= ackage( + PACKAGE_TO_REMOVE, hostSer= ver); + Action removal =3D null; + if (!installed.isEmpty()) { + removal =3D ActionManager.schedulePackageRemoval(user, hostSer= ver, + installed, scheduleDate); + } + + // Install packages on the host server. log.debug("** Creating packageAction"); Action packageAction =3D = ActionManager.schedulePackageInstall( this.user, hostServer, this.packagesToInstall, scheduleDat= e); + packageAction.setPrerequisite(removal); log.debug("** Created packageAction ? " + packageAction.getId()); = // Make sure we fail all existing sessions for this server since diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java= b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java index 8b1280d..1fe3ed9 100644 --- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java +++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java @@ -2553,4 +2553,22 @@ public class SystemManager extends BaseManager { params.put("sid", sid); return m.execute(params); } + + /** + * List all of the installed packages with the given name + * @param packageName the package name + * @param server the server + * @return list of maps with name_id, evr_id and arch_id + */ + public static List> listInstalledPackage( + String packageName, Server server) { + SelectMode m =3D ModeFactory.getMode("System_queries", + "list_installed_packages_for_name"); + Map params =3D new HashMap(); + params.put("sid", server.getId()); + params.put("name", packageName); + return m.execute(params); + } + + } diff --git a/java/code/src/com/redhat/rhn/manager/system/test/SystemManager= Test.java b/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerT= est.java index 164f5e9..ad7ba59 100644 --- a/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.ja= va +++ b/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.ja= va @@ -38,6 +38,8 @@ import com.redhat.rhn.domain.org.test.CustomDataKeyTest; import com.redhat.rhn.domain.rhnpackage.Package; import com.redhat.rhn.domain.rhnpackage.PackageEvr; import com.redhat.rhn.domain.rhnpackage.PackageEvrFactory; +import com.redhat.rhn.domain.rhnpackage.PackageFactory; +import com.redhat.rhn.domain.rhnpackage.test.PackageEvrFactoryTest; import com.redhat.rhn.domain.rhnpackage.test.PackageTest; import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.rhnset.SetCleanup; @@ -47,6 +49,7 @@ import com.redhat.rhn.domain.server.CustomDataValue; import com.redhat.rhn.domain.server.Device; import com.redhat.rhn.domain.server.Dmi; import com.redhat.rhn.domain.server.EntitlementServerGroup; +import com.redhat.rhn.domain.server.InstalledPackage; import com.redhat.rhn.domain.server.Location; import com.redhat.rhn.domain.server.ManagedServerGroup; import com.redhat.rhn.domain.server.Network; @@ -73,6 +76,7 @@ import com.redhat.rhn.frontend.dto.SystemOverview; import com.redhat.rhn.frontend.listview.PageControl; import com.redhat.rhn.manager.entitlement.EntitlementManager; import com.redhat.rhn.manager.errata.cache.ErrataCacheManager; +import com.redhat.rhn.manager.rhnpackage.PackageManager; import com.redhat.rhn.manager.rhnpackage.test.PackageManagerTest; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; @@ -92,10 +96,12 @@ import org.hibernate.Session; import java.sql.SQLException; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Set; = /** * SystemManagerTest @@ -1301,4 +1307,30 @@ public class SystemManagerTest extends RhnBaseTestCa= se { assertTrue(errata.size() =3D=3D 1); assertTrue(SystemManager.hasUnscheduledErrata(user, server.getId()= )); } + + public void testListInstalledPackage() throws Exception { + User user =3D UserTestUtils.findNewUser("testUser", "testOrg"); + Server s =3D ServerFactoryTest.createTestServer(user); + + List> list =3D SystemManager.listInstalledPackag= e("kernel", s); + assertTrue(list.isEmpty()); + + InstalledPackage p =3D new InstalledPackage(); + p.setArch(PackageFactory.lookupPackageArchByLabel("x86_64")); + p.setName(PackageManager.lookupPackageName("kernel")); + p.setEvr(PackageEvrFactoryTest.createTestPackageEvr()); + p.setServer(s); + Set set =3D new HashSet(); + set.add(p); + s.setPackages(set); + + ServerFactory.save(s); + + list =3D SystemManager.listInstalledPackage("kernel", s); + assertTrue(list.size() =3D=3D 1); + assertEquals(list.get(0).get("name_id"), p.getName().getId()); + assertEquals(list.get(0).get("evr_id"), p.getEvr().getId()); + + } + } --===============8659403245757165878==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:46 2015 Content-Type: multipart/mixed; boundary="===============8372684483740872346==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - backend/spacewalk-backend.spec java/code Date: Mon, 22 Jun 2009 21:01:17 +0000 Message-ID: <20090622210117.3C86D1201D4@lists.fedorahosted.org> --===============8372684483740872346== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/spacewalk-backend.spec = | 2 = java/code/src/com/redhat/rhn/frontend/action/channel/ChannelDetailsAction.= java | 9 +- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml= | 12 +++ java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java = | 37 ++++++++++ java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java = | 1 = java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp = | 32 ++++++++ 6 files changed, 87 insertions(+), 6 deletions(-) New commits: commit 87dc05b1d491c26404d673c85ae04d5a2b8f0029 Author: Pradeep Kilambi Date: Mon Jun 22 17:01:07 2009 -0400 Adding repodata details for a given channel to channelDetails page. - Last Repo Build : shows the last time repomd.xml was generated - Repo Cache Status: Shows if the repodat for this channel is complete = or in progress diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 630dfe0..aa275a3 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -365,7 +365,7 @@ rm -f %{rhnconf}/rhnSecret.py* %{rhnroot}/server/repomd/view.py* = # the cache -%attr(750,apache,root) %dir %{_var}/cache/rhn +%attr(750,apache,apache) %dir %{_var}/cache/rhn # config files %attr(640,root,apache) %{rhnconf}/default/rhn_server.conf # main httpd config diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelDe= tailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/Cha= nnelDetailsAction.java index a44e026..c8c4c66 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelDetailsAc= tion.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelDetailsAc= tion.java @@ -23,7 +23,6 @@ import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.manager.user.UserManager; - import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; @@ -81,7 +80,13 @@ public class ChannelDetailsAction extends RhnAction { request.setAttribute("pack_size", ChannelFactory.getPackageCount(c= han)); request.setAttribute("globally", chan.isGloballySubscribable(user.= getOrg())); request.setAttribute("channel", chan); - + //Check if the channel needed repodata, = + // if so get the status and last build info + if (chan.isChannelRepodataRequired()) { + request.setAttribute("repo_status", + ChannelManager.isChannelLabelInProgress(chan.getLabel(= ))); + request.setAttribute("repo_last_build", ChannelManager.getRepo= LastBuild(chan)); + } // turn on the right radio button if (chan.isGloballySubscribable(user.getOrg())) { form.set("global", "all"); diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResour= ce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringReso= urce_en_US.xml index c9d7ddf..7d7c840 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml @@ -21317,6 +21317,18 @@ given channel. Sucessfully syncronized {0} errata and pushed {1} packages to ch= annel {2}. + + Repo Cache Status + + + Completed + + + In Progress + + + Last Repo Build + = = = diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.ja= va b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java index 5b677b2..eb46be4 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -67,13 +67,16 @@ import com.redhat.rhn.manager.errata.cache.ErrataCacheM= anager; import com.redhat.rhn.manager.org.OrgManager; import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.manager.user.UserManager; +import com.redhat.rhn.taskomatic.task.TaskConstants; = import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; = +import java.io.File; import java.sql.Timestamp; import java.sql.Types; +import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; @@ -2714,4 +2717,38 @@ public class ChannelManager extends BaseManager { } } = + /** + * Check the status of the cache repo data + * @param channel the channel to look for status + * @return repodata status + */ + public static boolean isChannelLabelInProgress(String channel) { + SelectMode selector =3D ModeFactory.getMode(TaskConstants.MODE_NAM= E, + TaskConstants.TASK_QUERY_REPOMD_DETAILS_QUERY); + Map params =3D new HashMap(); + params.put("channel_label", channel); + return (selector.execute(params).size() > 0); + } + + /** + * get the last build date on repodata per channel + * @param channel the channel to look for repodata build date + * @return last repo build date + */ + public static String getRepoLastBuild(Channel channel) { + String pathPrefix =3D Config.get().getString(Config.REPOMD_PATH_P= REFIX, + "rhn/repodata"); + String mountPoint =3D Config.get().getString(Config.REPOMD_CACHE_M= OUNT_POINT, "/pub"); + File theFile =3D new File(mountPoint + File.separator + pathPrefix= + + File.separator + channel.getLabel() + File.separator + + "repomd.xml"); + Date fileModifiedDateIn =3D new Date(theFile.lastModified()); + // the file Modified date should be getting set when the file + // is moved into the correct location. + log.info("File Modified Date:" + fileModifiedDateIn); + DateFormat formatter =3D new SimpleDateFormat("yyyy-MM-dd hh:mm:ss= "); + String fileModifiedDate =3D formatter.format(fileModifiedDateIn); + return fileModifiedDate; + } + } diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/Repository= Writer.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/Repositor= yWriter.java index 20777b7..45da4d5 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.= java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.= java @@ -81,7 +81,6 @@ public class RepositoryWriter { log.info("Channel Modified Date:" + channel.getLastModified()); return !fileModifiedDate.equals(channel.getLastModified()); } - /** * = * @param channel channelinfo for repomd file creation diff --git a/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp b/jav= a/code/webapp/WEB-INF/pages/channel/channeldetail.jsp index 2cbc939..c2052e9 100644 --- a/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp @@ -74,12 +74,40 @@ + + + + - - + + + + + (none) + + + + + + --===============8372684483740872346==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:46 2015 Content-Type: multipart/mixed; boundary="===============2886309649266698894==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: backend/spacewalk-backend.spec java/code Date: Mon, 22 Jun 2009 21:01:51 +0000 Message-ID: <20090622210151.8ED1F1201D4@lists.fedorahosted.org> --===============2886309649266698894== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/spacewalk-backend.spec = | 2 = java/code/src/com/redhat/rhn/frontend/action/channel/ChannelDetailsAction.= java | 9 +- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml= | 12 +++ java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java = | 37 ++++++++++ java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java = | 1 = java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp = | 32 ++++++++ 6 files changed, 87 insertions(+), 6 deletions(-) New commits: commit a98828efd7a6854efdda4f906ac8ff466eb717b4 Author: Pradeep Kilambi Date: Mon Jun 22 17:01:07 2009 -0400 Adding repodata details for a given channel to channelDetails page. - Last Repo Build : shows the last time repomd.xml was generated - Repo Cache Status: Shows if the repodat for this channel is complete = or in progress diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 515b6aa..f6f334c 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -365,7 +365,7 @@ rm -f %{rhnconf}/rhnSecret.py* %{rhnroot}/server/repomd/view.py* = # the cache -%attr(750,apache,root) %dir %{_var}/cache/rhn +%attr(750,apache,apache) %dir %{_var}/cache/rhn # config files %attr(640,root,apache) %{rhnconf}/default/rhn_server.conf # main httpd config diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelDe= tailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/Cha= nnelDetailsAction.java index a44e026..c8c4c66 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelDetailsAc= tion.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelDetailsAc= tion.java @@ -23,7 +23,6 @@ import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.manager.user.UserManager; - import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; @@ -81,7 +80,13 @@ public class ChannelDetailsAction extends RhnAction { request.setAttribute("pack_size", ChannelFactory.getPackageCount(c= han)); request.setAttribute("globally", chan.isGloballySubscribable(user.= getOrg())); request.setAttribute("channel", chan); - + //Check if the channel needed repodata, = + // if so get the status and last build info + if (chan.isChannelRepodataRequired()) { + request.setAttribute("repo_status", + ChannelManager.isChannelLabelInProgress(chan.getLabel(= ))); + request.setAttribute("repo_last_build", ChannelManager.getRepo= LastBuild(chan)); + } // turn on the right radio button if (chan.isGloballySubscribable(user.getOrg())) { form.set("global", "all"); diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResour= ce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringReso= urce_en_US.xml index 10fcf8c..521532d 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml @@ -21317,6 +21317,18 @@ given channel. Sucessfully syncronized {0} errata and pushed {1} packages to ch= annel {2}. + + Repo Cache Status + + + Completed + + + In Progress + + + Last Repo Build + = = = diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.ja= va b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java index 53406d1..bb51633 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -67,13 +67,16 @@ import com.redhat.rhn.manager.errata.cache.ErrataCacheM= anager; import com.redhat.rhn.manager.org.OrgManager; import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.manager.user.UserManager; +import com.redhat.rhn.taskomatic.task.TaskConstants; = import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; = +import java.io.File; import java.sql.Timestamp; import java.sql.Types; +import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; @@ -2737,4 +2740,38 @@ public class ChannelManager extends BaseManager { } } = + /** + * Check the status of the cache repo data + * @param channel the channel to look for status + * @return repodata status + */ + public static boolean isChannelLabelInProgress(String channel) { + SelectMode selector =3D ModeFactory.getMode(TaskConstants.MODE_NAM= E, + TaskConstants.TASK_QUERY_REPOMD_DETAILS_QUERY); + Map params =3D new HashMap(); + params.put("channel_label", channel); + return (selector.execute(params).size() > 0); + } + + /** + * get the last build date on repodata per channel + * @param channel the channel to look for repodata build date + * @return last repo build date + */ + public static String getRepoLastBuild(Channel channel) { + String pathPrefix =3D Config.get().getString(Config.REPOMD_PATH_P= REFIX, + "rhn/repodata"); + String mountPoint =3D Config.get().getString(Config.REPOMD_CACHE_M= OUNT_POINT, "/pub"); + File theFile =3D new File(mountPoint + File.separator + pathPrefix= + + File.separator + channel.getLabel() + File.separator + + "repomd.xml"); + Date fileModifiedDateIn =3D new Date(theFile.lastModified()); + // the file Modified date should be getting set when the file + // is moved into the correct location. + log.info("File Modified Date:" + fileModifiedDateIn); + DateFormat formatter =3D new SimpleDateFormat("yyyy-MM-dd hh:mm:ss= "); + String fileModifiedDate =3D formatter.format(fileModifiedDateIn); + return fileModifiedDate; + } + } diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/Repository= Writer.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/Repositor= yWriter.java index 20777b7..45da4d5 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.= java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.= java @@ -81,7 +81,6 @@ public class RepositoryWriter { log.info("Channel Modified Date:" + channel.getLastModified()); return !fileModifiedDate.equals(channel.getLastModified()); } - /** * = * @param channel channelinfo for repomd file creation diff --git a/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp b/jav= a/code/webapp/WEB-INF/pages/channel/channeldetail.jsp index bee6016..64fe57f 100644 --- a/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp @@ -67,12 +67,40 @@ + + + + - - + + + + + (none) + + + + + + --===============2886309649266698894==-- From partha at fedoraproject.org Thu Aug 20 11:57:46 2015 Content-Type: multipart/mixed; boundary="===============4537572321554274504==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Tue, 23 Jun 2009 00:39:34 +0000 Message-ID: <20090623003934.9F37812027E@lists.fedorahosted.org> --===============4537572321554274504== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/action/kickstart/KickstartGuestActionD= etails.hbm.xml | 2 = java/code/src/com/redhat/rhn/domain/action/kickstart/KickstartGuestActionD= etails.java | 14 +-- java/code/src/com/redhat/rhn/manager/action/ActionManager.java = | 2 = java/code/src/com/redhat/rhn/manager/action/test/ActionManagerTest.java = | 4 = java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.ja= va | 7 - java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreate= Command.java | 17 +++- java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtualSyste= mCommand.java | 41 ++++++++++ java/code/src/org/cobbler/SystemRecord.java = | 4 = 8 files changed, 73 insertions(+), 18 deletions(-) New commits: commit 3c63b8eea15561d023404a4a9560e0525f9cd182 Author: Partha Aji Date: Mon Jun 22 20:39:53 2009 -0400 507097 - Fixed guest provisioning virt settings = Fixed guest provisioning to correctly set the virt params in cobbler system record. diff --git a/java/code/src/com/redhat/rhn/domain/action/kickstart/Kickstart= GuestActionDetails.hbm.xml b/java/code/src/com/redhat/rhn/domain/action/kic= kstart/KickstartGuestActionDetails.hbm.xml index d07e0d5..c7e2853 100644 --- a/java/code/src/com/redhat/rhn/domain/action/kickstart/KickstartGuestAc= tionDetails.hbm.xml +++ b/java/code/src/com/redhat/rhn/domain/action/kickstart/KickstartGuestAc= tionDetails.hbm.xml @@ -19,7 +19,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - + diff --git a/java/code/src/com/redhat/rhn/domain/action/kickstart/Kickstart= GuestActionDetails.java b/java/code/src/com/redhat/rhn/domain/action/kickst= art/KickstartGuestActionDetails.java index 9a4a484..2362078 100644 --- a/java/code/src/com/redhat/rhn/domain/action/kickstart/KickstartGuestAc= tionDetails.java +++ b/java/code/src/com/redhat/rhn/domain/action/kickstart/KickstartGuestAc= tionDetails.java @@ -23,7 +23,7 @@ public class KickstartGuestActionDetails extends BaseKick= startActionDetails { = private Long kickstartSessionId; private String guestName; - private Long memKb; + private Long memMb; private Long vcpus; private Long diskGb; private String virtBridge; @@ -63,17 +63,17 @@ public class KickstartGuestActionDetails extends BaseKi= ckstartActionDetails { } = /** - * @return Returns the memKb + * @return Returns the mem in MB */ - public Long getMemKb() { - return memKb; + public Long getMemory() { + return memMb; } = /** - * @param memKbIn the memKb to set. + * @param memMbIn the memory in MB */ - public void setMemKb(Long memKbIn) { - this.memKb =3D memKbIn; + public void setMemory(Long memMbIn) { + this.memMb =3D memMbIn; } = /** diff --git a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java= b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java index ef23890..2850ec1 100644 --- a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java +++ b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java @@ -1452,7 +1452,7 @@ public class ActionManager extends BaseManager { kad.setParentAction(ksAction); = kad.setDiskGb(pcmd.getLocalStorageSize()); - kad.setMemKb(pcmd.getMemoryAllocation().longValue() * 1024); + kad.setMemory(pcmd.getMemoryAllocation().longValue()); kad.setVirtBridge(pcmd.getVirtBridge()); kad.setDiskPath(pcmd.getFilePath()); kad.setVcpus(new Long(pcmd.getVirtualCpus())); diff --git a/java/code/src/com/redhat/rhn/manager/action/test/ActionManager= Test.java b/java/code/src/com/redhat/rhn/manager/action/test/ActionManagerT= est.java index 06005ed..048e4e9 100644 --- a/java/code/src/com/redhat/rhn/manager/action/test/ActionManagerTest.ja= va +++ b/java/code/src/com/redhat/rhn/manager/action/test/ActionManagerTest.ja= va @@ -613,7 +613,7 @@ public class ActionManagerTest extends RhnBaseTestCase { kickstartHost); = command.setGuestName("testGuest1"); - command.setMemoryAllocation(262144L); + command.setMemoryAllocation(256L); command.setLocalStorageSize(2L); command.setVirtualCpus(2L); command.setKickstartSession(ksSession); @@ -637,7 +637,7 @@ public class ActionManagerTest extends RhnBaseTestCase { assertNotNull(kad); assertEquals(kad, kad2); = - assertEquals("268435456", kad.getMemKb().toString()); + assertEquals("256", kad.getMemory().toString()); assertEquals("2", kad.getVcpus().toString()); assertEquals("testGuest1", kad.getGuestName()); assertEquals("2", kad.getDiskGb().toString()); diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSchedu= leCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSc= heduleCommand.java index e0e9d42..27ddc0b 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java @@ -610,6 +610,7 @@ public class KickstartScheduleCommand extends BaseSyste= mOperation { cmd.setKickstartHost(host); cmd.setKernelOptions(getExtraOptions()); cmd.setPostKernelOptions(postKernelOptions); + cmd.setScheduledAction(kickstartAction); ValidatorError cobblerError =3D cmd.store(); if (cobblerError !=3D null) { return cobblerError; @@ -621,13 +622,13 @@ public class KickstartScheduleCommand extends BaseSys= temOperation { server, cobblerProfileLabel); cmd.setKickstartHost(host); cmd.setKernelOptions(kernelOptions); - cmd.setPostKernelOptions(postKernelOptions); = + cmd.setPostKernelOptions(postKernelOptions); + cmd.setScheduledAction(kickstartAction); ValidatorError cobblerError =3D cmd.store(); if (cobblerError !=3D null) { return cobblerError; } = } - SystemRecord rec =3D SystemRecord.lookupById(CobblerXMLRPCHelper.g= etConnection( this.getUser().getLogin()), this.getServer().getCobblerId(= )); = @@ -1556,5 +1557,5 @@ public class KickstartScheduleCommand extends BaseSys= temOperation { */ public void setPostKernelOptions(String postKernelOptionsIn) { this.postKernelOptions =3D postKernelOptionsIn; - } = + } } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= SystemCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/c= obbler/CobblerSystemCreateCommand.java index 72aefb0..0ad2ca1 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemC= reateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemC= reateCommand.java @@ -15,6 +15,7 @@ package com.redhat.rhn.manager.kickstart.cobbler; = import com.redhat.rhn.common.validator.ValidatorError; +import com.redhat.rhn.domain.action.Action; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.server.NetworkInterface; import com.redhat.rhn.domain.server.Server; @@ -46,7 +47,7 @@ import java.util.Set; public class CobblerSystemCreateCommand extends CobblerCommand { = private static Logger log =3D Logger.getLogger(CobblerSystemCreateComm= and.class); - = + private Action scheduledAction; private Server server; private String mediaPath; private String profileName; @@ -353,5 +354,17 @@ public class CobblerSystemCreateCommand extends Cobble= rCommand { */ public void setPostKernelOptions(String postKernelOptionsIn) { this.postKernelOptions =3D postKernelOptionsIn; - } = + } + + /** + * Set the scheduled action associated to this command. + * @param kickstartAction ks action associated to this command + */ + public void setScheduledAction(Action kickstartAction) { + scheduledAction =3D kickstartAction; + } + = + protected Action getScheduledAction() { + return scheduledAction; + } } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= VirtualSystemCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/= cobbler/CobblerVirtualSystemCommand.java index 7c0d5d4..c9d0984 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtual= SystemCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtual= SystemCommand.java @@ -14,6 +14,9 @@ */ package com.redhat.rhn.manager.kickstart.cobbler; = +import com.redhat.rhn.common.validator.ValidatorError; +import com.redhat.rhn.domain.action.kickstart.KickstartGuestAction; +import com.redhat.rhn.domain.action.kickstart.KickstartGuestActionDetails; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; @@ -120,5 +123,43 @@ public class CobblerVirtualSystemCommand extends Cobbl= erSystemCreateCommand { } } = + = + /** + * Updates the cobbler virt attributes based on = + * params provided + * @param memoryMB the memory in MB + * @param diskSizeGb the diskSize in GB + * @param vcpus the number of cpus + * @param diskPath the disk path of the virt image. + */ + protected void setupVirtAttributes(int memoryMB, int diskSizeGb, + int vcpus, String diskPath) { + SystemRecord rec =3D SystemRecord.lookupByName( + CobblerXMLRPCHelper.getConnection(user), getCobblerSystemR= ecordName()); + if (rec !=3D null) { + rec.setVirtRam(memoryMB); + rec.setVirtFileSize(diskSizeGb); + rec.setVirtCpus(vcpus); + rec.setVirtPath(diskPath); + rec.save(); = + } + } + = + /** + * {@inheritDoc} + */ + @Override + public ValidatorError store() { + ValidatorError error =3D super.store(); + if (error =3D=3D null) { + KickstartGuestAction action =3D (KickstartGuestAction) getSche= duledAction(); + KickstartGuestActionDetails details =3D action.getKickstartGue= stActionDetails(); + setupVirtAttributes(details.getMemory().intValue(), + details.getDiskGb().intValue(), + details.getVcpus().intValue(), + details.getDiskPath()); + } + return error; + } = } diff --git a/java/code/src/org/cobbler/SystemRecord.java b/java/code/src/or= g/cobbler/SystemRecord.java index b46279d..d5c4f13 100644 --- a/java/code/src/org/cobbler/SystemRecord.java +++ b/java/code/src/org/cobbler/SystemRecord.java @@ -284,14 +284,14 @@ public class SystemRecord extends CobblerObject { /** * @param virtFileSizeIn the VirtFileSize */ - public void setVirtFileSize(long virtFileSizeIn) { + public void setVirtFileSize(int virtFileSizeIn) { modify(VIRT_FILE_SIZE, virtFileSizeIn); } = /** * @param virtRamIn the VirtRam */ - public void setVirtRam(long virtRamIn) { + public void setVirtRam(int virtRamIn) { modify(VIRT_RAM, virtRamIn); } = --===============4537572321554274504==-- From partha at fedoraproject.org Thu Aug 20 11:57:46 2015 Content-Type: multipart/mixed; boundary="===============0865370939140695586==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Tue, 23 Jun 2009 00:40:41 +0000 Message-ID: <20090623004041.A82DA12027E@lists.fedorahosted.org> --===============0865370939140695586== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/action/kickstart/KickstartGuestActionD= etails.hbm.xml | 2 = java/code/src/com/redhat/rhn/domain/action/kickstart/KickstartGuestActionD= etails.java | 14 +-- java/code/src/com/redhat/rhn/manager/action/ActionManager.java = | 2 = java/code/src/com/redhat/rhn/manager/action/test/ActionManagerTest.java = | 4 = java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.ja= va | 7 - java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreate= Command.java | 17 +++- java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtualSyste= mCommand.java | 41 ++++++++++ java/code/src/org/cobbler/SystemRecord.java = | 4 = 8 files changed, 73 insertions(+), 18 deletions(-) New commits: commit 305721aeb3ce1c972b6aa7474d126935ab8702bb Author: Partha Aji Date: Mon Jun 22 20:39:53 2009 -0400 507097 - Fixed guest provisioning virt settings = Fixed guest provisioning to correctly set the virt params in cobbler system record. diff --git a/java/code/src/com/redhat/rhn/domain/action/kickstart/Kickstart= GuestActionDetails.hbm.xml b/java/code/src/com/redhat/rhn/domain/action/kic= kstart/KickstartGuestActionDetails.hbm.xml index d07e0d5..c7e2853 100644 --- a/java/code/src/com/redhat/rhn/domain/action/kickstart/KickstartGuestAc= tionDetails.hbm.xml +++ b/java/code/src/com/redhat/rhn/domain/action/kickstart/KickstartGuestAc= tionDetails.hbm.xml @@ -19,7 +19,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - + diff --git a/java/code/src/com/redhat/rhn/domain/action/kickstart/Kickstart= GuestActionDetails.java b/java/code/src/com/redhat/rhn/domain/action/kickst= art/KickstartGuestActionDetails.java index 9a4a484..2362078 100644 --- a/java/code/src/com/redhat/rhn/domain/action/kickstart/KickstartGuestAc= tionDetails.java +++ b/java/code/src/com/redhat/rhn/domain/action/kickstart/KickstartGuestAc= tionDetails.java @@ -23,7 +23,7 @@ public class KickstartGuestActionDetails extends BaseKick= startActionDetails { = private Long kickstartSessionId; private String guestName; - private Long memKb; + private Long memMb; private Long vcpus; private Long diskGb; private String virtBridge; @@ -63,17 +63,17 @@ public class KickstartGuestActionDetails extends BaseKi= ckstartActionDetails { } = /** - * @return Returns the memKb + * @return Returns the mem in MB */ - public Long getMemKb() { - return memKb; + public Long getMemory() { + return memMb; } = /** - * @param memKbIn the memKb to set. + * @param memMbIn the memory in MB */ - public void setMemKb(Long memKbIn) { - this.memKb =3D memKbIn; + public void setMemory(Long memMbIn) { + this.memMb =3D memMbIn; } = /** diff --git a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java= b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java index ef23890..2850ec1 100644 --- a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java +++ b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java @@ -1452,7 +1452,7 @@ public class ActionManager extends BaseManager { kad.setParentAction(ksAction); = kad.setDiskGb(pcmd.getLocalStorageSize()); - kad.setMemKb(pcmd.getMemoryAllocation().longValue() * 1024); + kad.setMemory(pcmd.getMemoryAllocation().longValue()); kad.setVirtBridge(pcmd.getVirtBridge()); kad.setDiskPath(pcmd.getFilePath()); kad.setVcpus(new Long(pcmd.getVirtualCpus())); diff --git a/java/code/src/com/redhat/rhn/manager/action/test/ActionManager= Test.java b/java/code/src/com/redhat/rhn/manager/action/test/ActionManagerT= est.java index 06005ed..048e4e9 100644 --- a/java/code/src/com/redhat/rhn/manager/action/test/ActionManagerTest.ja= va +++ b/java/code/src/com/redhat/rhn/manager/action/test/ActionManagerTest.ja= va @@ -613,7 +613,7 @@ public class ActionManagerTest extends RhnBaseTestCase { kickstartHost); = command.setGuestName("testGuest1"); - command.setMemoryAllocation(262144L); + command.setMemoryAllocation(256L); command.setLocalStorageSize(2L); command.setVirtualCpus(2L); command.setKickstartSession(ksSession); @@ -637,7 +637,7 @@ public class ActionManagerTest extends RhnBaseTestCase { assertNotNull(kad); assertEquals(kad, kad2); = - assertEquals("268435456", kad.getMemKb().toString()); + assertEquals("256", kad.getMemory().toString()); assertEquals("2", kad.getVcpus().toString()); assertEquals("testGuest1", kad.getGuestName()); assertEquals("2", kad.getDiskGb().toString()); diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSchedu= leCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSc= heduleCommand.java index e0e9d42..27ddc0b 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java @@ -610,6 +610,7 @@ public class KickstartScheduleCommand extends BaseSyste= mOperation { cmd.setKickstartHost(host); cmd.setKernelOptions(getExtraOptions()); cmd.setPostKernelOptions(postKernelOptions); + cmd.setScheduledAction(kickstartAction); ValidatorError cobblerError =3D cmd.store(); if (cobblerError !=3D null) { return cobblerError; @@ -621,13 +622,13 @@ public class KickstartScheduleCommand extends BaseSys= temOperation { server, cobblerProfileLabel); cmd.setKickstartHost(host); cmd.setKernelOptions(kernelOptions); - cmd.setPostKernelOptions(postKernelOptions); = + cmd.setPostKernelOptions(postKernelOptions); + cmd.setScheduledAction(kickstartAction); ValidatorError cobblerError =3D cmd.store(); if (cobblerError !=3D null) { return cobblerError; } = } - SystemRecord rec =3D SystemRecord.lookupById(CobblerXMLRPCHelper.g= etConnection( this.getUser().getLogin()), this.getServer().getCobblerId(= )); = @@ -1556,5 +1557,5 @@ public class KickstartScheduleCommand extends BaseSys= temOperation { */ public void setPostKernelOptions(String postKernelOptionsIn) { this.postKernelOptions =3D postKernelOptionsIn; - } = + } } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= SystemCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/c= obbler/CobblerSystemCreateCommand.java index 72aefb0..0ad2ca1 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemC= reateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemC= reateCommand.java @@ -15,6 +15,7 @@ package com.redhat.rhn.manager.kickstart.cobbler; = import com.redhat.rhn.common.validator.ValidatorError; +import com.redhat.rhn.domain.action.Action; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.server.NetworkInterface; import com.redhat.rhn.domain.server.Server; @@ -46,7 +47,7 @@ import java.util.Set; public class CobblerSystemCreateCommand extends CobblerCommand { = private static Logger log =3D Logger.getLogger(CobblerSystemCreateComm= and.class); - = + private Action scheduledAction; private Server server; private String mediaPath; private String profileName; @@ -353,5 +354,17 @@ public class CobblerSystemCreateCommand extends Cobble= rCommand { */ public void setPostKernelOptions(String postKernelOptionsIn) { this.postKernelOptions =3D postKernelOptionsIn; - } = + } + + /** + * Set the scheduled action associated to this command. + * @param kickstartAction ks action associated to this command + */ + public void setScheduledAction(Action kickstartAction) { + scheduledAction =3D kickstartAction; + } + = + protected Action getScheduledAction() { + return scheduledAction; + } } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= VirtualSystemCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/= cobbler/CobblerVirtualSystemCommand.java index 7c0d5d4..c9d0984 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtual= SystemCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtual= SystemCommand.java @@ -14,6 +14,9 @@ */ package com.redhat.rhn.manager.kickstart.cobbler; = +import com.redhat.rhn.common.validator.ValidatorError; +import com.redhat.rhn.domain.action.kickstart.KickstartGuestAction; +import com.redhat.rhn.domain.action.kickstart.KickstartGuestActionDetails; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; @@ -120,5 +123,43 @@ public class CobblerVirtualSystemCommand extends Cobbl= erSystemCreateCommand { } } = + = + /** + * Updates the cobbler virt attributes based on = + * params provided + * @param memoryMB the memory in MB + * @param diskSizeGb the diskSize in GB + * @param vcpus the number of cpus + * @param diskPath the disk path of the virt image. + */ + protected void setupVirtAttributes(int memoryMB, int diskSizeGb, + int vcpus, String diskPath) { + SystemRecord rec =3D SystemRecord.lookupByName( + CobblerXMLRPCHelper.getConnection(user), getCobblerSystemR= ecordName()); + if (rec !=3D null) { + rec.setVirtRam(memoryMB); + rec.setVirtFileSize(diskSizeGb); + rec.setVirtCpus(vcpus); + rec.setVirtPath(diskPath); + rec.save(); = + } + } + = + /** + * {@inheritDoc} + */ + @Override + public ValidatorError store() { + ValidatorError error =3D super.store(); + if (error =3D=3D null) { + KickstartGuestAction action =3D (KickstartGuestAction) getSche= duledAction(); + KickstartGuestActionDetails details =3D action.getKickstartGue= stActionDetails(); + setupVirtAttributes(details.getMemory().intValue(), + details.getDiskGb().intValue(), + details.getVcpus().intValue(), + details.getDiskPath()); + } + return error; + } = } diff --git a/java/code/src/org/cobbler/SystemRecord.java b/java/code/src/or= g/cobbler/SystemRecord.java index b46279d..d5c4f13 100644 --- a/java/code/src/org/cobbler/SystemRecord.java +++ b/java/code/src/org/cobbler/SystemRecord.java @@ -284,14 +284,14 @@ public class SystemRecord extends CobblerObject { /** * @param virtFileSizeIn the VirtFileSize */ - public void setVirtFileSize(long virtFileSizeIn) { + public void setVirtFileSize(int virtFileSizeIn) { modify(VIRT_FILE_SIZE, virtFileSizeIn); } = /** * @param virtRamIn the VirtRam */ - public void setVirtRam(long virtRamIn) { + public void setVirtRam(int virtRamIn) { modify(VIRT_RAM, virtRamIn); } = --===============0865370939140695586==-- From partha at fedoraproject.org Thu Aug 20 11:57:46 2015 Content-Type: multipart/mixed; boundary="===============8118784007050647840==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Tue, 23 Jun 2009 00:50:45 +0000 Message-ID: <20090623005045.4D06D12027E@lists.fedorahosted.org> --===============8118784007050647840== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/action/kickstart/KickstartGuestActionD= etails.hbm.xml | 2 +- java/code/src/com/redhat/rhn/domain/action/kickstart/KickstartGuestActionD= etails.java | 4 ++-- java/code/src/com/redhat/rhn/manager/action/ActionManager.java = | 2 +- java/code/src/com/redhat/rhn/manager/action/test/ActionManagerTest.java = | 2 +- java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtualSyste= mCommand.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 94cf6e3f64e2e9c7d4f9dfb6c14660d9b70f11d3 Author: Partha Aji Date: Mon Jun 22 20:53:12 2009 -0400 Fixed a nitpick that memory didnt sya memMb diff --git a/java/code/src/com/redhat/rhn/domain/action/kickstart/Kickstart= GuestActionDetails.hbm.xml b/java/code/src/com/redhat/rhn/domain/action/kic= kstart/KickstartGuestActionDetails.hbm.xml index c7e2853..a9c4df2 100644 --- a/java/code/src/com/redhat/rhn/domain/action/kickstart/KickstartGuestAc= tionDetails.hbm.xml +++ b/java/code/src/com/redhat/rhn/domain/action/kickstart/KickstartGuestAc= tionDetails.hbm.xml @@ -19,7 +19,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - + diff --git a/java/code/src/com/redhat/rhn/domain/action/kickstart/Kickstart= GuestActionDetails.java b/java/code/src/com/redhat/rhn/domain/action/kickst= art/KickstartGuestActionDetails.java index 2362078..00210d0 100644 --- a/java/code/src/com/redhat/rhn/domain/action/kickstart/KickstartGuestAc= tionDetails.java +++ b/java/code/src/com/redhat/rhn/domain/action/kickstart/KickstartGuestAc= tionDetails.java @@ -65,14 +65,14 @@ public class KickstartGuestActionDetails extends BaseKi= ckstartActionDetails { /** * @return Returns the mem in MB */ - public Long getMemory() { + public Long getMemMb() { return memMb; } = /** * @param memMbIn the memory in MB */ - public void setMemory(Long memMbIn) { + public void setMemMb(Long memMbIn) { this.memMb =3D memMbIn; } = diff --git a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java= b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java index 2850ec1..78ac5b5 100644 --- a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java +++ b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java @@ -1452,7 +1452,7 @@ public class ActionManager extends BaseManager { kad.setParentAction(ksAction); = kad.setDiskGb(pcmd.getLocalStorageSize()); - kad.setMemory(pcmd.getMemoryAllocation().longValue()); + kad.setMemMb(pcmd.getMemoryAllocation().longValue()); kad.setVirtBridge(pcmd.getVirtBridge()); kad.setDiskPath(pcmd.getFilePath()); kad.setVcpus(new Long(pcmd.getVirtualCpus())); diff --git a/java/code/src/com/redhat/rhn/manager/action/test/ActionManager= Test.java b/java/code/src/com/redhat/rhn/manager/action/test/ActionManagerT= est.java index 048e4e9..d705ac8 100644 --- a/java/code/src/com/redhat/rhn/manager/action/test/ActionManagerTest.ja= va +++ b/java/code/src/com/redhat/rhn/manager/action/test/ActionManagerTest.ja= va @@ -637,7 +637,7 @@ public class ActionManagerTest extends RhnBaseTestCase { assertNotNull(kad); assertEquals(kad, kad2); = - assertEquals("256", kad.getMemory().toString()); + assertEquals("256", kad.getMemMb().toString()); assertEquals("2", kad.getVcpus().toString()); assertEquals("testGuest1", kad.getGuestName()); assertEquals("2", kad.getDiskGb().toString()); diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= VirtualSystemCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/= cobbler/CobblerVirtualSystemCommand.java index c9d0984..69adcd2 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtual= SystemCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtual= SystemCommand.java @@ -154,7 +154,7 @@ public class CobblerVirtualSystemCommand extends Cobble= rSystemCreateCommand { if (error =3D=3D null) { KickstartGuestAction action =3D (KickstartGuestAction) getSche= duledAction(); KickstartGuestActionDetails details =3D action.getKickstartGue= stActionDetails(); - setupVirtAttributes(details.getMemory().intValue(), + setupVirtAttributes(details.getMemMb().intValue(), details.getDiskGb().intValue(), details.getVcpus().intValue(), details.getDiskPath()); --===============8118784007050647840==-- From partha at fedoraproject.org Thu Aug 20 11:57:46 2015 Content-Type: multipart/mixed; boundary="===============2737589502038435976==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Tue, 23 Jun 2009 00:51:49 +0000 Message-ID: <20090623005149.7A8ED12027E@lists.fedorahosted.org> --===============2737589502038435976== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/action/kickstart/KickstartGuestActionD= etails.hbm.xml | 2 +- java/code/src/com/redhat/rhn/domain/action/kickstart/KickstartGuestActionD= etails.java | 4 ++-- java/code/src/com/redhat/rhn/manager/action/ActionManager.java = | 2 +- java/code/src/com/redhat/rhn/manager/action/test/ActionManagerTest.java = | 2 +- java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtualSyste= mCommand.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 67ad9e42a8c83364a28b30b1e011acca94606104 Author: Partha Aji Date: Mon Jun 22 20:53:12 2009 -0400 Fixed a nitpick that memory didnt sya memMb diff --git a/java/code/src/com/redhat/rhn/domain/action/kickstart/Kickstart= GuestActionDetails.hbm.xml b/java/code/src/com/redhat/rhn/domain/action/kic= kstart/KickstartGuestActionDetails.hbm.xml index c7e2853..a9c4df2 100644 --- a/java/code/src/com/redhat/rhn/domain/action/kickstart/KickstartGuestAc= tionDetails.hbm.xml +++ b/java/code/src/com/redhat/rhn/domain/action/kickstart/KickstartGuestAc= tionDetails.hbm.xml @@ -19,7 +19,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - + diff --git a/java/code/src/com/redhat/rhn/domain/action/kickstart/Kickstart= GuestActionDetails.java b/java/code/src/com/redhat/rhn/domain/action/kickst= art/KickstartGuestActionDetails.java index 2362078..00210d0 100644 --- a/java/code/src/com/redhat/rhn/domain/action/kickstart/KickstartGuestAc= tionDetails.java +++ b/java/code/src/com/redhat/rhn/domain/action/kickstart/KickstartGuestAc= tionDetails.java @@ -65,14 +65,14 @@ public class KickstartGuestActionDetails extends BaseKi= ckstartActionDetails { /** * @return Returns the mem in MB */ - public Long getMemory() { + public Long getMemMb() { return memMb; } = /** * @param memMbIn the memory in MB */ - public void setMemory(Long memMbIn) { + public void setMemMb(Long memMbIn) { this.memMb =3D memMbIn; } = diff --git a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java= b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java index 2850ec1..78ac5b5 100644 --- a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java +++ b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java @@ -1452,7 +1452,7 @@ public class ActionManager extends BaseManager { kad.setParentAction(ksAction); = kad.setDiskGb(pcmd.getLocalStorageSize()); - kad.setMemory(pcmd.getMemoryAllocation().longValue()); + kad.setMemMb(pcmd.getMemoryAllocation().longValue()); kad.setVirtBridge(pcmd.getVirtBridge()); kad.setDiskPath(pcmd.getFilePath()); kad.setVcpus(new Long(pcmd.getVirtualCpus())); diff --git a/java/code/src/com/redhat/rhn/manager/action/test/ActionManager= Test.java b/java/code/src/com/redhat/rhn/manager/action/test/ActionManagerT= est.java index 048e4e9..d705ac8 100644 --- a/java/code/src/com/redhat/rhn/manager/action/test/ActionManagerTest.ja= va +++ b/java/code/src/com/redhat/rhn/manager/action/test/ActionManagerTest.ja= va @@ -637,7 +637,7 @@ public class ActionManagerTest extends RhnBaseTestCase { assertNotNull(kad); assertEquals(kad, kad2); = - assertEquals("256", kad.getMemory().toString()); + assertEquals("256", kad.getMemMb().toString()); assertEquals("2", kad.getVcpus().toString()); assertEquals("testGuest1", kad.getGuestName()); assertEquals("2", kad.getDiskGb().toString()); diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= VirtualSystemCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/= cobbler/CobblerVirtualSystemCommand.java index c9d0984..69adcd2 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtual= SystemCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtual= SystemCommand.java @@ -154,7 +154,7 @@ public class CobblerVirtualSystemCommand extends Cobble= rSystemCreateCommand { if (error =3D=3D null) { KickstartGuestAction action =3D (KickstartGuestAction) getSche= duledAction(); KickstartGuestActionDetails details =3D action.getKickstartGue= stActionDetails(); - setupVirtAttributes(details.getMemory().intValue(), + setupVirtAttributes(details.getMemMb().intValue(), details.getDiskGb().intValue(), details.getVcpus().intValue(), details.getDiskPath()); --===============2737589502038435976==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:46 2015 Content-Type: multipart/mixed; boundary="===============8126546096921289196==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - projects/oracle-server-scripts spacewalk/setup Date: Tue, 23 Jun 2009 10:25:03 +0000 Message-ID: <20090623102503.ECF3412037D@lists.fedorahosted.org> --===============8126546096921289196== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable projects/oracle-server-scripts/oracle-server-scripts.spec | 9 +++++--- spacewalk/setup/lib/Spacewalk/Setup.pm | 15 ---------= ----- spacewalk/setup/share/oracle/upgrade-db-10g.sh | 8 +++++++ spacewalk/setup/share/oracle/upgrade-db.sh | 11 ++++++---- 4 files changed, 21 insertions(+), 22 deletions(-) New commits: commit e2c1f49c7b0a605e085fbd3ed730112a39d2d888 Author: Milan Zazrivec Date: Tue Jun 23 11:59:01 2009 +0200 update records in /etc/oratab in db upgrade scripts diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/S= pacewalk/Setup.pm index f010c7c..2bbd642 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -650,8 +650,6 @@ sub oracle_setup_db { my $opts =3D shift; my $answers =3D shift; = - oracle_upgrade_setup_oratab($opts); - print loc("* Setting up Oracle environment.\n"); = oracle_check_for_users_and_groups(); @@ -663,19 +661,6 @@ sub oracle_setup_db { oracle_populate_db($opts, $answers); } = -sub oracle_upgrade_setup_oratab { - my $opts =3D shift; - - # 5.2 to 5.3 and beyond upgrades: edit rhnsat entry in /etc/oratab - if ($opts->{'upgrade'} and is_embedded_db()) { - print loc("** Database: setting up /etc/oratab\n"); - if (not -f "/etc/oratab") { - die loc("File /etc/oratab does not exist.\n"); - } - system('sed -i "s/^rhnsat:\(.\+\):N$/rhnsat:\1:Y/g" /etc/oratab'); - } -} - sub oracle_upgrade_start_db { my $opts =3D shift; if (is_embedded_db()) { diff --git a/spacewalk/setup/share/oracle/upgrade-db-10g.sh b/spacewalk/set= up/share/oracle/upgrade-db-10g.sh index 6540aec..e65eecc 100644 --- a/spacewalk/setup/share/oracle/upgrade-db-10g.sh +++ b/spacewalk/setup/share/oracle/upgrade-db-10g.sh @@ -51,6 +51,14 @@ ORACLE_CONFIG_DIR=3D$ORACLE_BASE/config/10.2.0 export ORACLE_SID=3D$DB_NAME . oraenv = +# If the record for satellite database exists, substitute it with new valu= e. +# Otherwise create a new record. +if grep -q "^$ORACLE_SID:.*$" /etc/oratab; then + sed -i "s;^$ORACLE_SID:.*$;$ORACLE_SID:$ORACLE_HOME:Y;" /etc/oratab +else + echo "$ORACLE_SID:$ORACLE_HOME:Y" >> /etc/oratab +fi + # upgrade database UPGRADE_TMPL=3D$ORACLE_ADMIN_DIR/embedded-upgradedb-10g.tmpl m4 $UPGRADE_TMPL -I$ORACLE_ADMIN_DIR \ diff --git a/spacewalk/setup/share/oracle/upgrade-db.sh b/spacewalk/setup/s= hare/oracle/upgrade-db.sh index bccf2df..be9667b 100644 --- a/spacewalk/setup/share/oracle/upgrade-db.sh +++ b/spacewalk/setup/share/oracle/upgrade-db.sh @@ -56,13 +56,16 @@ ORACLE_CONFIG_9I_DIR=3D$ORACLE_BASE/config/9.2.0 # change env to rhnsat instance export ORACLE_SID=3D$DB_NAME = -# In case the oratab entry for embedded database does not exist, create it -grep -q "^$ORACLE_SID:.*$" /etc/oratab || echo "$ORACLE_SID:$ORACLE_HOME:Y= " >> /etc/oratab - +# If the record for satellite database exists, substitute it with new valu= e. +# Otherwise create a new record. +if grep -q "^$ORACLE_SID:.*$" /etc/oratab; then + sed -i "s;^$ORACLE_SID:.*$;$ORACLE_SID:$ORACLE_HOME:Y;" /etc/oratab +else + echo "$ORACLE_SID:$ORACLE_HOME:Y" >> /etc/oratab +fi = . oraenv = - # modify listener LISTENER_ORA=3Dnetwork/admin/listener.ora [ -f $ORACLE_HOME/$LISTENER_ORA ] || \ commit 53953da3eec93fe4e5ce6b35fb803b9d3f63824e Author: Milan Zazrivec Date: Tue Jun 23 11:29:39 2009 +0200 handle existing embedded entries in /etc/oratab during install = If the entry exists, substitute it with the new value (during package upgrade for example). diff --git a/projects/oracle-server-scripts/oracle-server-scripts.spec b/pr= ojects/oracle-server-scripts/oracle-server-scripts.spec index 7ef4fe5..5b7b8c0 100644 --- a/projects/oracle-server-scripts/oracle-server-scripts.spec +++ b/projects/oracle-server-scripts/oracle-server-scripts.spec @@ -69,9 +69,12 @@ exit 0 = %post # set ORACLE_HOME -grep -q "embedded:%{oracle_home}:N" /etc/oratab || \ -echo "embedded:%{oracle_home}:N" >> /etc/oratab || \ -echo "Unable to add 'embedded:%{oracle_home}:N' entry to /etc/oratab" >&2 +if grep -q "^embedded:.*$" /etc/oratab; then + sed -i "s;^embedded:.*$;embedded:%{oracle_home}:N;" /etc/oratab +else + echo "embedded:%{oracle_home}:N" >> /etc/oratab || \ + echo "Unable to add 'embedded:%{oracle_home}:N' entry to /etc/oratab" >&2 +fi = # setup environment for oracle user [ -f %{oracle_base}/.bash_profile ] \ --===============8126546096921289196==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:46 2015 Content-Type: multipart/mixed; boundary="===============4367267718871093584==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 2 commits - projects/oracle-server-scripts spacewalk/setup Date: Tue, 23 Jun 2009 10:25:46 +0000 Message-ID: <20090623102546.9D33D12037D@lists.fedorahosted.org> --===============4367267718871093584== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable projects/oracle-server-scripts/oracle-server-scripts.spec | 9 +++++--- spacewalk/setup/lib/Spacewalk/Setup.pm | 15 ---------= ----- spacewalk/setup/share/oracle/upgrade-db-10g.sh | 8 +++++++ spacewalk/setup/share/oracle/upgrade-db.sh | 11 ++++++---- 4 files changed, 21 insertions(+), 22 deletions(-) New commits: commit b76ef2a8a6b2181d0c6dfaf07b8153293acb047d Author: Milan Zazrivec Date: Tue Jun 23 11:59:01 2009 +0200 update records in /etc/oratab in db upgrade scripts diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/S= pacewalk/Setup.pm index 0fa0c6a..8b3fc29 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -650,8 +650,6 @@ sub oracle_setup_db { my $opts =3D shift; my $answers =3D shift; = - oracle_upgrade_setup_oratab($opts); - print loc("* Setting up Oracle environment.\n"); = oracle_check_for_users_and_groups(); @@ -663,19 +661,6 @@ sub oracle_setup_db { oracle_populate_db($opts, $answers); } = -sub oracle_upgrade_setup_oratab { - my $opts =3D shift; - - # 5.2 to 5.3 and beyond upgrades: edit rhnsat entry in /etc/oratab - if ($opts->{'upgrade'} and is_embedded_db()) { - print loc("** Database: setting up /etc/oratab\n"); - if (not -f "/etc/oratab") { - die loc("File /etc/oratab does not exist.\n"); - } - system('sed -i "s/^rhnsat:\(.\+\):N$/rhnsat:\1:Y/g" /etc/oratab'); - } -} - sub oracle_upgrade_start_db { my $opts =3D shift; if (is_embedded_db()) { diff --git a/spacewalk/setup/share/oracle/upgrade-db-10g.sh b/spacewalk/set= up/share/oracle/upgrade-db-10g.sh index 6540aec..e65eecc 100644 --- a/spacewalk/setup/share/oracle/upgrade-db-10g.sh +++ b/spacewalk/setup/share/oracle/upgrade-db-10g.sh @@ -51,6 +51,14 @@ ORACLE_CONFIG_DIR=3D$ORACLE_BASE/config/10.2.0 export ORACLE_SID=3D$DB_NAME . oraenv = +# If the record for satellite database exists, substitute it with new valu= e. +# Otherwise create a new record. +if grep -q "^$ORACLE_SID:.*$" /etc/oratab; then + sed -i "s;^$ORACLE_SID:.*$;$ORACLE_SID:$ORACLE_HOME:Y;" /etc/oratab +else + echo "$ORACLE_SID:$ORACLE_HOME:Y" >> /etc/oratab +fi + # upgrade database UPGRADE_TMPL=3D$ORACLE_ADMIN_DIR/embedded-upgradedb-10g.tmpl m4 $UPGRADE_TMPL -I$ORACLE_ADMIN_DIR \ diff --git a/spacewalk/setup/share/oracle/upgrade-db.sh b/spacewalk/setup/s= hare/oracle/upgrade-db.sh index bccf2df..be9667b 100644 --- a/spacewalk/setup/share/oracle/upgrade-db.sh +++ b/spacewalk/setup/share/oracle/upgrade-db.sh @@ -56,13 +56,16 @@ ORACLE_CONFIG_9I_DIR=3D$ORACLE_BASE/config/9.2.0 # change env to rhnsat instance export ORACLE_SID=3D$DB_NAME = -# In case the oratab entry for embedded database does not exist, create it -grep -q "^$ORACLE_SID:.*$" /etc/oratab || echo "$ORACLE_SID:$ORACLE_HOME:Y= " >> /etc/oratab - +# If the record for satellite database exists, substitute it with new valu= e. +# Otherwise create a new record. +if grep -q "^$ORACLE_SID:.*$" /etc/oratab; then + sed -i "s;^$ORACLE_SID:.*$;$ORACLE_SID:$ORACLE_HOME:Y;" /etc/oratab +else + echo "$ORACLE_SID:$ORACLE_HOME:Y" >> /etc/oratab +fi = . oraenv = - # modify listener LISTENER_ORA=3Dnetwork/admin/listener.ora [ -f $ORACLE_HOME/$LISTENER_ORA ] || \ commit 37c910bc23b779077c520db6c2ad4590ee4d12ff Author: Milan Zazrivec Date: Tue Jun 23 11:29:39 2009 +0200 handle existing embedded entries in /etc/oratab during install = If the entry exists, substitute it with the new value (during package upgrade for example). diff --git a/projects/oracle-server-scripts/oracle-server-scripts.spec b/pr= ojects/oracle-server-scripts/oracle-server-scripts.spec index cd4dce1..5d837ee 100644 --- a/projects/oracle-server-scripts/oracle-server-scripts.spec +++ b/projects/oracle-server-scripts/oracle-server-scripts.spec @@ -69,9 +69,12 @@ exit 0 = %post # set ORACLE_HOME -grep -q "embedded:%{oracle_home}:N" /etc/oratab || \ -echo "embedded:%{oracle_home}:N" >> /etc/oratab || \ -echo "Unable to add 'embedded:%{oracle_home}:N' entry to /etc/oratab" >&2 +if grep -q "^embedded:.*$" /etc/oratab; then + sed -i "s;^embedded:.*$;embedded:%{oracle_home}:N;" /etc/oratab +else + echo "embedded:%{oracle_home}:N" >> /etc/oratab || \ + echo "Unable to add 'embedded:%{oracle_home}:N' entry to /etc/oratab" >&2 +fi = # setup environment for oracle user [ -f %{oracle_base}/.bash_profile ] \ --===============4367267718871093584==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:46 2015 Content-Type: multipart/mixed; boundary="===============6154483232541617229==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - proxy/installer rel-eng/packages Date: Tue, 23 Jun 2009 12:04:00 +0000 Message-ID: <20090623120400.67A66120255@lists.fedorahosted.org> --===============6154483232541617229== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/installer/configure-proxy.sh | 4 +++- proxy/installer/spacewalk-proxy-installer.spec | 5 ++++- rel-eng/packages/spacewalk-proxy-installer | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) New commits: commit 897c419107279a2c930e7ba94d760e6e82400468 Author: Miroslav Such=C3=BD Date: Tue Jun 23 14:03:35 2009 +0200 Automatic commit of package [spacewalk-proxy-installer] release [0.6.16= -1]. diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/install= er/spacewalk-proxy-installer.spec index e91efdf..9914150 100644 --- a/proxy/installer/spacewalk-proxy-installer.spec +++ b/proxy/installer/spacewalk-proxy-installer.spec @@ -2,7 +2,7 @@ Name: spacewalk-proxy-installer Summary: Spacewalk Proxy Server Installer Group: Applications/Internet License: GPLv2 -Version: 0.6.15 +Version: 0.6.16 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz @@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE answers.txt = %changelog +* Tue Jun 23 2009 Miroslav Suchy 0.6.16-1 +- suggest sane default value of proxy for spacewalk too + * Wed Jun 17 2009 Michael Mraka 0.6.15-1 - fixed sgml errors in %%build - removed access_log directive on RHEL4 diff --git a/rel-eng/packages/spacewalk-proxy-installer b/rel-eng/packages/= spacewalk-proxy-installer index 94a1a15..96ca46c 100644 --- a/rel-eng/packages/spacewalk-proxy-installer +++ b/rel-eng/packages/spacewalk-proxy-installer @@ -1 +1 @@ -0.6.15-1 proxy/installer/ +0.6.16-1 proxy/installer/ commit 5c065964dbdb0df2dcf7897465ca09ff89de6d40 Author: Miroslav Such=C3=BD Date: Tue Jun 23 14:02:19 2009 +0200 suggest sane default value of proxy for spacewalk too diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure= -proxy.sh index db1728d..e7dd290 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -205,7 +205,9 @@ if [ "$RHN_PARENT" =3D=3D "rhn.redhat.com" ]; then WARNING fi = -default_or_input "Proxy version to activate" VERSION $(rhn-proxy-activate = --server=3D$RHN_PARENT --list-available-versions |sort|tail -n1) +VERSION_FROM_PARENT=3D$(rhn-proxy-activate --server=3D$RHN_PARENT --list-a= vailable-versions 2>/dev/null|sort|tail -n1) +VERSION_FROM_RPM=3D$(rpm -q --queryformat %{version} spacewalk-proxy-insta= ller|cut -d. -f1-2) +default_or_input "Proxy version to activate" VERSION ${VERSION_FROM_PARENT= :-$VERSION_FROM_RPM} = default_or_input "Traceback email" TRACEBACK_EMAIL '' = --===============6154483232541617229==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:46 2015 Content-Type: multipart/mixed; boundary="===============7025423786996844064==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-proxy-installer-0.6.16-1' Date: Tue, 23 Jun 2009 12:04:10 +0000 Message-ID: <20090623120410.ADBDE120306@lists.fedorahosted.org> --===============7025423786996844064== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-proxy-installer-0.6.16-1' created by Miroslav Such=C3=BD at 2009-06-23 12:03 +0000 Tagging package [spacewalk-proxy-installer] version [0.6.16-1] in directory= [proxy/installer/]. Changes since spacewalk-proxy-selinux-0.6.5-1: Devan Goodwin (6): Attempt to fix ChannelManagerTest.testListErrata. Fix monitoring action unit tests. Checkstyle fix. 422611 - Warn that satrm.py is not a supported script. Revert "503090 - Exclude rhnlib from kickstart profile sync." 503090 - Fix missing packages reported during rhnreg_ks. Justin Sherrill (4): 506608 - fixing issue where source packages could not be downloaded f= rom the package details page fixing a few issues with channel-to-update fixing small usage error in channel-to-update 506816 - fixing issue where virt hosts that begin to use sat 5.3 coul= d not install spacewalk-koan Milan Zazrivec (8): restart the satellite using shell script set new embedded db oratab entry only if it does not exist create embedded db entry only if it does not exist support for db upgrade with custom user set support for db upgrade with custom user set support for db upgrade with custom user set handle existing embedded entries in /etc/oratab during install update records in /etc/oratab in db upgrade scripts Miroslav Such=C3=BD (2): suggest sane default value of proxy for spacewalk too Automatic commit of package [spacewalk-proxy-installer] release [0.6.= 16-1]. Partha Aji (8): 506509 - Fixed ISE on Config Deploy pages 506509 - Fixed an ssm query.. Accidental typo.. Fix for html:errors and html:messages to be consitently viewed in the= UI 507338 - Fixed a spacewalk setup glitch where we not checkking for a = null value.. Added a fix to master to ignore profiles that have not yet been synce= d to cobbler.. 507046 & 507048 - Fixed a couple of cobbler issues 507097 - Fixed guest provisioning virt settings Fixed a nitpick that memory didnt sya memMb Pradeep Kilambi (8): fixing the unsubscriptable object error when package is not yet in rh= nPackage table 470335 - Fixing EOF error when poller tries to pickle dump the data t= o cache file. fixing rhnpush to work on fedora-11 clients. Replaced the deprecated = checksum modules and use hashlib instead. removing unused modules and some clean up merging missed chances from previous commit remove short package dependency on rpms. User might wanna skip the rp= ms and still import metadata. yum operations are not getting redirected as the GET requested is for= med at the plugin level and not through rhnlib. Adding repodata details for a given channel to channelDetails page. Shannon Hughes (4): 506693 - remove contact.pxt link from 404 message 506705 - removed invalid rhn require tag 506726 - do not allow links for null org channel management 506693 - removed more contact.pxt references --- backend/satellite_tools/disk_dumper/iss_actions.py = | 2 = backend/satellite_tools/satrm.py = | 8 = backend/server/rhnServer/server_kickstart.py = | 5 = backend/server/rhnServer/server_packages.py = | 5 = backend/spacewalk-backend.spec = | 2 = client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py = | 2 = client/rhel/yum-rhn-plugin/rhnplugin.py = | 2 = client/tools/rhn-virtualization/virtualization/poller_state_cache.py = | 5 = client/tools/rhnpush/Makefile.rhnpush = | 2 = client/tools/rhnpush/connection.py = | 18 = client/tools/rhnpush/rhnpush.py = | 30 = client/tools/rhnpush/solaris2mpm.py = | 18 = client/tools/rhnpush/uploadLib.py = | 273 ++- client/tools/rhnpush/uploadLib2.py = | 735 ---------- java/code/src/com/redhat/rhn/common/conf/Config.java = | 20 = java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml = | 9 = java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml = | 38 = java/code/src/com/redhat/rhn/common/errors/SatelliteExceptionHandler.java = | 58 = java/code/src/com/redhat/rhn/common/security/PermissionException.java = | 3 = java/code/src/com/redhat/rhn/domain/action/kickstart/KickstartGuestActionD= etails.hbm.xml | 2 = java/code/src/com/redhat/rhn/domain/action/kickstart/KickstartGuestActionD= etails.java | 14 = java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java = | 28 = java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTest.java = | 1 = java/code/src/com/redhat/rhn/frontend/action/channel/ChannelDetailsAction.= java | 9 = java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java = | 12 = java/code/src/com/redhat/rhn/frontend/action/configuration/files/LocalRevi= sionDeployAction.java | 4 = java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEdi= tAction.java | 2 = java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/= FilterActionTest.java | 6 = java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteAct= ionTest.java | 2 = java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsActi= on.java | 9 = java/code/src/com/redhat/rhn/frontend/dto/ConfigGlobalDeployDto.java = | 24 = java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xm= l | 3 = java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml= | 46 = java/code/src/com/redhat/rhn/manager/MissingCapabilityException.java = | 56 = java/code/src/com/redhat/rhn/manager/action/ActionManager.java = | 12 = java/code/src/com/redhat/rhn/manager/action/test/ActionManagerTest.java = | 4 = java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java = | 37 = java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java = | 5 = java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManager.ja= va | 6 = java/code/src/com/redhat/rhn/manager/download/DownloadManager.java = | 9 = java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.ja= va | 22 = java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCom= mand.java | 17 = java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreat= eCommand.java | 5 = java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreate= Command.java | 17 = java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtualSyste= mCommand.java | 41 = java/code/src/com/redhat/rhn/manager/system/SystemManager.java = | 18 = java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java = | 32 = java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java = | 1 = java/code/src/org/cobbler/SystemRecord.java = | 4 = java/code/webapp/WEB-INF/decorators/layout_c.jsp = | 5 = java/code/webapp/WEB-INF/pages/activationkeys/create.jsp = | 7 = java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp = | 6 = java/code/webapp/WEB-INF/pages/activationkeys/edit.jsp = | 2 = java/code/webapp/WEB-INF/pages/activationkeys/list.jsp = | 7 = java/code/webapp/WEB-INF/pages/activationkeys/packages/listeditpackages.js= p | 2 = java/code/webapp/WEB-INF/pages/admin/addresses.jsp = | 5 = java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp = | 6 = java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp = | 6 = java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp = | 6 = java/code/webapp/WEB-INF/pages/admin/config/general.jsp = | 6 = java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp = | 8 = java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp = | 6 = java/code/webapp/WEB-INF/pages/admin/config/restart.jsp = | 6 = java/code/webapp/WEB-INF/pages/admin/disableself.jsp = | 7 = java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp = | 7 = java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp = | 8 = java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp = | 6 = java/code/webapp/WEB-INF/pages/admin/errata/publisheddeleteconfirm.jsp = | 4 = java/code/webapp/WEB-INF/pages/admin/errata/unpublisheddeleteconfirm.jsp = | 4 = java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filter= create.jsp | 8 = java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filter= edit.jsp | 8 = java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filter= s.jsp | 8 = java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/method= -create.jsp | 6 = java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/method= s.jsp | 6 = java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.jsp = | 2 = java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp = | 2 = java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp = | 7 = java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.js= p | 8 = java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp = | 8 = java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp = | 8 = java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesremoveco= nfirm.jsp | 6 = java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.j= sp | 6 = java/code/webapp/WEB-INF/pages/admin/multiorg/affectedsystems.jsp = | 6 = java/code/webapp/WEB-INF/pages/admin/multiorg/deletesatadmin.jsp = | 6 = java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp = | 6 = java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp = | 6 = java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp = | 9 = java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp = | 7 = java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp = | 6 = java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp = | 5 = java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp = | 6 = java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp = | 6 = java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp = | 6 = java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp = | 6 = java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp = | 9 = java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementdetails.j= sp | 6 = java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp = | 6 = java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp = | 8 = java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp = | 6 = java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.j= sp | 6 = java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp = | 8 = java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp = | 7 = java/code/webapp/WEB-INF/pages/admin/users/changeemail.jsp = | 8 = java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp = | 6 = java/code/webapp/WEB-INF/pages/admin/users/edit_address.jsp = | 2 = java/code/webapp/WEB-INF/pages/admin/users/localepreferences.jsp = | 2 = java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp = | 6 = java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp = | 2 = java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp = | 6 = java/code/webapp/WEB-INF/pages/admin/users/userpreferences.jsp = | 2 = java/code/webapp/WEB-INF/pages/channel/all.jsp = | 8 = java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp = | 8 = java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp = | 41 = java/code/webapp/WEB-INF/pages/channel/custom.jsp = | 10 = java/code/webapp/WEB-INF/pages/channel/entitlements.jsp = | 6 = java/code/webapp/WEB-INF/pages/channel/erratalist.jsp = | 9 = java/code/webapp/WEB-INF/pages/channel/manage/add.jsp = | 10 = java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp = | 8 = java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp = | 8 = java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp = | 8 = java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp = | 12 = java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp = | 8 = java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp = | 10 = java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp = | 10 = java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp = | 10 = java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp = | 12 = java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp = | 6 = java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp = | 9 = java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp = | 10 = java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp = | 12 = java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp = | 10 = java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp = | 10 = java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp = | 10 = java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp = | 12 = java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp = | 25 = java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackage= s.jsp | 11 = java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompack= ages.jsp | 8 = java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp = | 8 = java/code/webapp/WEB-INF/pages/channel/packagelist.jsp = | 9 = java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp = | 8 = java/code/webapp/WEB-INF/pages/channel/popular.jsp = | 10 = java/code/webapp/WEB-INF/pages/channel/redhat.jsp = | 10 = java/code/webapp/WEB-INF/pages/channel/relevant.jsp = | 10 = java/code/webapp/WEB-INF/pages/channel/retired.jsp = | 8 = java/code/webapp/WEB-INF/pages/channel/shared.jsp = | 8 = java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp = | 5 = java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp = | 3 = java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp = | 3 = java/code/webapp/WEB-INF/pages/common/errors/missingcapability.jsp = | 23 = java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-head= er.jspf | 5 = java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/deta= ils-header.jspf | 5 = java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/delete= header.jspf | 4 = java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploy= global.jspf | 9 = java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploy= local.jspf | 17 = java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header= .jspf | 6 = java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/manage= _header.jspf | 7 = java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf = | 7 = java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf = | 5 = java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.= jspf | 4 = java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf = | 5 = java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.js= pf | 6 = java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf= | 4 = java/code/webapp/WEB-INF/pages/common/fragments/login_form.jspf = | 3 = java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf = | 5 = java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf = | 5 = java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf= | 5 = java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf = | 5 = java/code/webapp/WEB-INF/pages/common/login.jsp = | 6 = java/code/webapp/WEB-INF/pages/common/relogin.jsp = | 5 = java/code/webapp/WEB-INF/pages/configuration/channel/addfiles.jsp = | 6 = java/code/webapp/WEB-INF/pages/configuration/channel/channelOverview.jsp = | 1 = java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp = | 5 = java/code/webapp/WEB-INF/pages/configuration/channel/channelfiles.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.jsp = | 8 = java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp = | 2 = java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp = | 1 = java/code/webapp/WEB-INF/pages/configuration/channel/filecreate.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/channel/fileimport.jsp = | 6 = java/code/webapp/WEB-INF/pages/configuration/channel/fileup.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp = | 8 = java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/files/comparedeployed.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/files/comparefile.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/files/comparerevision.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/files/copycentral.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp = | 8 = java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp= | 6 = java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp = | 6 = java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp = | 6 = java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp = | 6 = java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp = | 6 = java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp = | 8 = java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp = | 5 = java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp = | 4 = java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp = | 3 = java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp = | 3 = java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp = | 10 = java/code/webapp/WEB-INF/pages/errata/addchannels.jsp = | 10 = java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp = | 10 = java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp = | 6 = java/code/webapp/WEB-INF/pages/errata/all.jsp = | 6 = java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp = | 8 = java/code/webapp/WEB-INF/pages/errata/create.jsp = | 12 = java/code/webapp/WEB-INF/pages/errata/delete.jsp = | 8 = java/code/webapp/WEB-INF/pages/errata/edit.jsp = | 13 = java/code/webapp/WEB-INF/pages/errata/editchannels.jsp = | 10 = java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp = | 8 = java/code/webapp/WEB-INF/pages/errata/notify.jsp = | 8 = java/code/webapp/WEB-INF/pages/errata/overview.jsp = | 6 = java/code/webapp/WEB-INF/pages/errata/packagepush.jsp = | 10 = java/code/webapp/WEB-INF/pages/errata/packages/add.jsp = | 8 = java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp = | 8 = java/code/webapp/WEB-INF/pages/errata/packages/list.jsp = | 8 = java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp = | 8 = java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp = | 8 = java/code/webapp/WEB-INF/pages/errata/published.jsp = | 5 = java/code/webapp/WEB-INF/pages/errata/relevant.jsp = | 6 = java/code/webapp/WEB-INF/pages/errata/unpublished.jsp = | 5 = java/code/webapp/WEB-INF/pages/help/docsearch.jsp = | 8 = java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp = | 6 = java/code/webapp/WEB-INF/pages/keys/keycreate.jsp = | 6 = java/code/webapp/WEB-INF/pages/keys/keyedit.jsp = | 6 = java/code/webapp/WEB-INF/pages/keys/keys.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/activationkeys.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/assignedpackages.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/cryptokeys.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/file_preservation_lists.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/kickstartips.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/kickstartoptions.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp = | 4 = java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp = | 9 = java/code/webapp/WEB-INF/pages/kickstart/kickstartvariables.jsp = | 14 = java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp = | 9 = java/code/webapp/WEB-INF/pages/kickstart/locale.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/post.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/pre.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/scriptcreate.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp = | 7 = java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/troubleshooting.jsp = | 6 = java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.js= p | 4 = java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp = | 5 = java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/second.jsp = | 5 = java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/third.jsp = | 5 = java/code/webapp/WEB-INF/pages/monitoring/probes.jsp = | 6 = java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp = | 8 = java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp = | 7 = java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp = | 8 = java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp = | 6 = java/code/webapp/WEB-INF/pages/profiles/delete.jsp = | 7 = java/code/webapp/WEB-INF/pages/profiles/details.jsp = | 3 = java/code/webapp/WEB-INF/pages/profiles/list.jsp = | 8 = java/code/webapp/WEB-INF/pages/profiles/packagelist.jsp = | 3 = java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp = | 11 = java/code/webapp/WEB-INF/pages/schedule/actiondetails.jsp = | 6 = java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp = | 8 = java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp = | 10 = java/code/webapp/WEB-INF/pages/schedule/inprogresssystems.jsp = | 6 = java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp = | 8 = java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp = | 8 = java/code/webapp/WEB-INF/pages/software/downloads/download.jsp = | 6 = java/code/webapp/WEB-INF/pages/software/downloads/isohelp.jsp = | 8 = java/code/webapp/WEB-INF/pages/software/downloads/isotree.jsp = | 8 = java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.jsp = | 8 = java/code/webapp/WEB-INF/pages/ssm/packageinstall.jsp = | 3 = java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp = | 3 = java/code/webapp/WEB-INF/pages/ssm/packagelist.jsp = | 3 = java/code/webapp/WEB-INF/pages/ssm/packageremove.jsp = | 3 = java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp = | 3 = java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp = | 3 = java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp = | 3 = java/code/webapp/WEB-INF/pages/ssm/packageverify.jsp = | 3 = java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp = | 3 = java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp = | 8 = java/code/webapp/WEB-INF/pages/ssm/view-log.jsp = | 8 = java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp = | 7 = java/code/webapp/WEB-INF/pages/systems/customkey/listcustomkeys.jsp = | 7 = java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.js= p | 7 = java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf = | 6 = java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfi= rm.jsp | 6 = java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinsta= ll.jsp | 6 = java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinsta= llconfirm.jsp | 6 = java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.= jsp | 6 = java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_= patchset.jsp | 9 = java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/patchset= list.jsp | 6 = java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparepr= ofiles.jsp | 6 = java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesy= stems.jsp | 6 = java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/create.js= p | 2 = java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/delete.js= p | 6 = java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/missingpk= gs.jsp | 6 = java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.= jsp | 6 = java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofi= le.jsp | 6 = java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsyste= m.jsp | 6 = java/code/webapp/WEB-INF/pages/systems/details/packages/scheduleremote.jsp= | 6 = java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp = | 6 = java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/fi= rst.jsp | 3 = java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguest= s_confirm.jsp | 6 = java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguest= slist.jsp | 6 = java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp = | 6 = java/code/webapp/WEB-INF/pages/systems/grouplist.jsp = | 6 = java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp = | 6 = java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp = | 6 = java/code/webapp/WEB-INF/pages/systems/overview.jsp = | 6 = java/code/webapp/WEB-INF/pages/systems/probes/create.jsp = | 2 = java/code/webapp/WEB-INF/pages/systems/probes/delete.jsp = | 2 = java/code/webapp/WEB-INF/pages/systems/probes/details.jsp = | 6 = java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp = | 2 = java/code/webapp/WEB-INF/pages/systems/probes/index.jsp = | 6 = java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservat= ion_create.jsp | 6 = java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservat= ion_edit.jsp | 6 = java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservat= ion_list.jsp | 6 = java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservat= ionlistconfirm.jsp | 6 = java/code/webapp/WEB-INF/pages/systems/proxylist.jsp = | 6 = java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp = | 6 = java/code/webapp/WEB-INF/pages/systems/systemlist.jsp = | 6 = java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp = | 9 = java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp = | 6 = java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp = | 6 = java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp = | 6 = java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp = | 3 = java/code/webapp/WEB-INF/pages/user/edit/localepreference.jsp = | 5 = java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp = | 2 = java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp = | 10 = java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp = | 5 = java/code/webapp/WEB-INF/pages/user/edit/yourpreferences.jsp = | 5 = java/code/webapp/WEB-INF/pages/yourrhn.jsp = | 6 = java/code/webapp/WEB-INF/struts-config.xml = | 7 = projects/oracle-server-scripts/oracle-server-scripts.spec = | 8 = proxy/installer/configure-proxy.sh = | 4 = proxy/installer/spacewalk-proxy-installer.spec = | 5 = rel-eng/packages/spacewalk-proxy-installer = | 2 = scripts/channel-to-update-level/README = | 3 = scripts/channel-to-update-level/create-channel-update = | 14 = spacewalk/setup/bin/spacewalk-setup = | 2 = spacewalk/setup/lib/Spacewalk/Setup.pm = | 20 = spacewalk/setup/share/oracle/upgrade-db-10g.sh = | 36 = spacewalk/setup/share/oracle/upgrade-db.sh = | 39 = spacewalk/setup/share/upgrade/rhn-enable-push.pl = | 2 = 374 files changed, 961 insertions(+), 2848 deletions(-) --- --===============7025423786996844064==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:46 2015 Content-Type: multipart/mixed; boundary="===============4509229120188150728==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: backend/server Date: Tue, 23 Jun 2009 13:33:41 +0000 Message-ID: <20090623133341.822AF120255@lists.fedorahosted.org> --===============4509229120188150728== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/rhnChannel.py | 1 + 1 file changed, 1 insertion(+) New commits: commit 344863fb4660e9d0c40a7cc0a9332ab136984d41 Author: Pradeep Kilambi Date: Tue Jun 23 09:33:34 2009 -0400 507593 - fixing eus registration tracebacks diff --git a/backend/server/rhnChannel.py b/backend/server/rhnChannel.py index 292783f..8193d11 100644 --- a/backend/server/rhnChannel.py +++ b/backend/server/rhnChannel.py @@ -16,6 +16,7 @@ = import time import string +import rpm from rhn.rpclib import xmlrpclib = from types import IntType, ListType, DictType --===============4509229120188150728==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:46 2015 Content-Type: multipart/mixed; boundary="===============8259068867929253119==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - backend/server Date: Tue, 23 Jun 2009 13:34:06 +0000 Message-ID: <20090623133406.16BD3120255@lists.fedorahosted.org> --===============8259068867929253119== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/rhnChannel.py | 1 + 1 file changed, 1 insertion(+) New commits: commit 07acf360c14cc532b9f91b9070d66361dd793acc Author: Pradeep Kilambi Date: Tue Jun 23 09:33:34 2009 -0400 507593 - fixing eus registration tracebacks diff --git a/backend/server/rhnChannel.py b/backend/server/rhnChannel.py index 292783f..8193d11 100644 --- a/backend/server/rhnChannel.py +++ b/backend/server/rhnChannel.py @@ -16,6 +16,7 @@ = import time import string +import rpm from rhn.rpclib import xmlrpclib = from types import IntType, ListType, DictType --===============8259068867929253119==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:46 2015 Content-Type: multipart/mixed; boundary="===============8833347847377736659==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: 3 commits - backend/common backend/HACKING backend/server backend/test Date: Tue, 23 Jun 2009 14:44:59 +0000 Message-ID: <20090623144459.06243120255@lists.fedorahosted.org> --===============8833347847377736659== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/HACKING | 10 = backend/common/rhnLib.py | 16 - backend/server/handlers/xmlrpc/__init__.py | 1 = backend/server/rhnSession.py | 3 = backend/test/non-unit/server/rhnSQL/dbtests.py | 200 +++++++++++= +++++ backend/test/suites/dbtests.py | 200 -----------= ----- backend/test/suites/rhnsqltests.py | 71 ----- backend/test/test_query1.py | 23 - backend/test/unit/spacewalk/test/common/rhnLib-tests.py | 36 ++ backend/test/unit/spacewalk/test/server/rhnsql-tests.py | 63 +++++ backend/test/unit/spacewalk/test/setpath.py | 31 ++ 11 files changed, 341 insertions(+), 313 deletions(-) New commits: commit 18764839aafef9cdce16a138cd4fcd5b64e7fb35 Author: Devan Goodwin Date: Tue Jun 23 11:39:12 2009 -0300 Update HACKING file for backend test instructions. diff --git a/backend/HACKING b/backend/HACKING index c476a1a..8637cd5 100644 --- a/backend/HACKING +++ b/backend/HACKING @@ -1,13 +1,10 @@ Before running the backend unit tests you'll need to do the following: = - * Install python-nose. + * yum install python-nose python-pgsql * export SPACEWALK_GIT=3D~/src/spacewalk * Adjust accordingly to point to the top level of your spacewalk git cl= one. * Probably wise to add to your ~/.bashrc or equivalent. = To run the pure unit tests (no disk/network/db access): = - nosetests test/unit/ - -To run the non-pure unit tests, you'll need a ~/.spacewalk-dev.conf. -See test/spacewalk-dev.conf.sample for a starting point. + nosetests -s test/unit/ commit c49680cc9ec953fae6e115e7551daad7df65eafd Author: Devan Goodwin Date: Tue Jun 23 11:19:49 2009 -0300 Integrate some PostgreSQL rhnSQL driver unit tests. diff --git a/backend/test/non-unit/server/rhnSQL/rhnsqltests.py b/backend/t= est/non-unit/server/rhnSQL/rhnsqltests.py deleted file mode 100644 index c429cb5..0000000 --- a/backend/test/non-unit/server/rhnSQL/rhnsqltests.py +++ /dev/null @@ -1,71 +0,0 @@ -# -# Copyright (c) 2008 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. -# - -""" -Pure unit tests for components of rhnSQL. -""" - -import unittest - -from server import rhnSQL -from server.rhnSQL.driver_postgresql import convert_named_query_params - -class RhnSQLTests(unittest.TestCase): - """ Pure unit tests for components of rhnSQL. """ - - def test_convert_named_query_params(self): - query =3D "INSERT INTO people(id, name, phone) VALUES(:id, :name, = :phone)" - expected_query =3D \ - "INSERT INTO people(id, name, phone) VALUES($1, $2, $3)" - - (new_query, param_index, args_found) =3D convert_named_query_param= s(query) - self.assertEquals(expected_query, new_query) - self.assertEquals(3, len(param_index.keys())) - self.assertEquals(3, args_found) - self.assertEquals([1], param_index['id']) - self.assertEquals([2], param_index['name']) - self.assertEquals([3], param_index['phone']) - - def test_convert_named_params_none_required(self): - query =3D "SELECT * FROM people" - - (new_query, param_index, args_found) =3D convert_named_query_param= s(query) - self.assertEquals(query, new_query) - self.assertEquals(0, len(param_index.keys())) - - def test_convert_named_params_multiple_uses(self): - query =3D "INSERT INTO people(a, b, c, d) VALUES(:a, :b, :a, :b)" - expected_query =3D \ - "INSERT INTO people(a, b, c, d) VALUES($1, $2, $3, $4)" - - (new_query, param_index, args_found) =3D convert_named_query_param= s(query) - self.assertEquals(expected_query, new_query) - self.assertEquals(4, args_found) - self.assertEquals(2, len(param_index.keys())) - self.assertEquals([1, 3], param_index['a']) - self.assertEquals([2, 4], param_index['b']) - - - - - -def suite(): - suite =3D unittest.TestSuite() - suite.addTest(unittest.makeSuite(RhnSQLTests)) - return suite - - -if __name__ =3D=3D "__main__": - unittest.main(defaultTest=3D"suite") diff --git a/backend/test/test_query1.py b/backend/test/test_query1.py deleted file mode 100644 index e08ba68..0000000 --- a/backend/test/test_query1.py +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (c) 2008 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. = -# -from server import rhnSQL - -s1 =3D rhnSQL.Statement(""" - select 1 from dual -""") - -s2 =3D rhnSQL.Statement(""" - select googoo from rhnChannel -""") diff --git a/backend/test/unit/spacewalk/test/server/__init__.py b/backend/= test/unit/spacewalk/test/server/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/backend/test/unit/spacewalk/test/server/rhnsql-tests.py b/back= end/test/unit/spacewalk/test/server/rhnsql-tests.py new file mode 100644 index 0000000..5b10877 --- /dev/null +++ b/backend/test/unit/spacewalk/test/server/rhnsql-tests.py @@ -0,0 +1,63 @@ +# +# Copyright (c) 2008 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. +# + +""" +Pure unit tests for components of rhnSQL. + +NOTE: Not hitting the database here! +""" + +import unittest +import spacewalk.test.setpath + +from server import rhnSQL +from server.rhnSQL.driver_postgresql import convert_named_query_params + +class RhnSQLTests(unittest.TestCase): + """ Pure unit tests for components of rhnSQL. """ + + def test_convert_named_query_params(self): + query =3D "INSERT INTO people(id, name, phone) VALUES(:id, :name, = :phone)" + expected_query =3D \ + "INSERT INTO people(id, name, phone) VALUES($1, $2, $3)" + + (new_query, param_index, args_found) =3D convert_named_query_param= s(query) + self.assertEquals(expected_query, new_query) + self.assertEquals(3, len(param_index.keys())) + self.assertEquals(3, args_found) + self.assertEquals([1], param_index['id']) + self.assertEquals([2], param_index['name']) + self.assertEquals([3], param_index['phone']) + + def test_convert_named_params_none_required(self): + query =3D "SELECT * FROM people" + + (new_query, param_index, args_found) =3D convert_named_query_param= s(query) + self.assertEquals(query, new_query) + self.assertEquals(0, len(param_index.keys())) + + def test_convert_named_params_multiple_uses(self): + query =3D "INSERT INTO people(a, b, c, d) VALUES(:a, :b, :a, :b)" + expected_query =3D \ + "INSERT INTO people(a, b, c, d) VALUES($1, $2, $3, $4)" + + (new_query, param_index, args_found) =3D convert_named_query_param= s(query) + self.assertEquals(expected_query, new_query) + self.assertEquals(4, args_found) + self.assertEquals(2, len(param_index.keys())) + self.assertEquals([1, 3], param_index['a']) + self.assertEquals([2, 4], param_index['b']) + + commit b045198c80b796ad50ec989e1387551725da0fc1 Author: Devan Goodwin Date: Fri Jun 12 09:55:53 2009 -0300 First cut of a unit test framework for Python backend. diff --git a/backend/HACKING b/backend/HACKING new file mode 100644 index 0000000..c476a1a --- /dev/null +++ b/backend/HACKING @@ -0,0 +1,13 @@ +Before running the backend unit tests you'll need to do the following: + + * Install python-nose. + * export SPACEWALK_GIT=3D~/src/spacewalk + * Adjust accordingly to point to the top level of your spacewalk git cl= one. + * Probably wise to add to your ~/.bashrc or equivalent. + +To run the pure unit tests (no disk/network/db access): + + nosetests test/unit/ + +To run the non-pure unit tests, you'll need a ~/.spacewalk-dev.conf. +See test/spacewalk-dev.conf.sample for a starting point. diff --git a/backend/common/rhnLib.py b/backend/common/rhnLib.py index 7ae2c8b..4a54b04 100644 --- a/backend/common/rhnLib.py +++ b/backend/common/rhnLib.py @@ -27,11 +27,6 @@ import select import urlparse = = -############### -### FUNCTIONS -############### - - def setHeaderValue(mp_table, name, values): """ Function that correctly sets headers in an Apache-like table @@ -642,14 +637,3 @@ def createPath(path, user=3D'apache', group=3D'root', = chmod=3D0755, logging=3D1): # Changing permissions failed; ignore the error sys.stderr.write("Changing owner for %s failed\n" % path) = -def _test_parseUrl(): - print 'Testing parseUrl:' - print '(addressing scheme, network location, path,' - print ' parameters, query, fragment identifier)' - print parseUrl('') - print parseUrl('somehostname') - print parseUrl('http://somehostname') - print parseUrl('https://somehostname') - print parseUrl('https://somehostname:123') - print parseUrl('https://somehostname:123/ABCDE') - print diff --git a/backend/server/handlers/xmlrpc/__init__.py b/backend/server/ha= ndlers/xmlrpc/__init__.py index a3b9083..26b2fbb 100644 --- a/backend/server/handlers/xmlrpc/__init__.py +++ b/backend/server/handlers/xmlrpc/__init__.py @@ -1,4 +1,3 @@ -#!/usr/bin/python # # Copyright (c) 2008 Red Hat, Inc. # diff --git a/backend/server/rhnSession.py b/backend/server/rhnSession.py index 7e0c992..c1cd336 100644 --- a/backend/server/rhnSession.py +++ b/backend/server/rhnSession.py @@ -1,4 +1,3 @@ -#!/usr/bin/python # # Copyright (c) 2008 Red Hat, Inc. # @@ -52,7 +51,7 @@ class Session: range(1, 5)) = def get_secrets(self): - # Validates the secrets from teh config file + # Validates the secrets from the config file secrets =3D self._get_secrets() if len(secrets) !=3D len(filter(None, secrets)): # the list of secrets has unset items diff --git a/backend/test/non-unit/server/__init__.py b/backend/test/non-un= it/server/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/backend/test/non-unit/server/rhnSQL/__init__.py b/backend/test= /non-unit/server/rhnSQL/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/backend/test/non-unit/server/rhnSQL/dbtests.py b/backend/test/= non-unit/server/rhnSQL/dbtests.py new file mode 100644 index 0000000..ff7e59f --- /dev/null +++ b/backend/test/non-unit/server/rhnSQL/dbtests.py @@ -0,0 +1,200 @@ +# +# Copyright (c) 2008 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. +# + +""" +Database specific tests for rhnSQL drivers. + +These tests require a database connection, usually configured in a +rhntests-*.py script. +""" + +import unittest + +from random import randint + +from server import rhnSQL +from server.rhnSQL import sql_base + +TEST_IDS =3D [1, 2, 3] +TEST_NAMES =3D ["Bill", "Susan", "Joe"] +TEST_NUMS =3D [900.12, 600.49, 34.98] + +class RhnSQLDatabaseTests(unittest.TestCase): + """ + Database connection tests that can be run against any supported databa= se. + """ + + def setUp(self): + # Expect self.temp_table to have been created by subclass by now: + + #insert_query =3D "INSERT INTO %s(id, name) VALUES($1, $2)" % \ + # self.temp_table + #cursor =3D rhnSQL.prepare(insert_query) + #ids =3D [1, 2, 3, 4, 5] + #names =3D ["Bill", "Ted", "Mary", "Tom", "Susan"] + #cursor.executemany([ids, names]) + + insert_query =3D "INSERT INTO %s(id, name, num) VALUES(:id, :name,= :num)" % \ + self.temp_table + cursor =3D rhnSQL.prepare(insert_query) + cursor.execute(id=3DTEST_IDS[0], name=3DTEST_NAMES[0], num=3DTEST_= NUMS[0]) + cursor.execute(id=3DTEST_IDS[1], name=3DTEST_NAMES[1], num=3DTEST_= NUMS[1]) + cursor.execute(id=3DTEST_IDS[2], name=3DTEST_NAMES[2], num=3DTEST_= NUMS[2]) + + def tearDown(self): + drop_table_query =3D "DROP TABLE %s" % self.temp_table + cursor =3D rhnSQL.prepare(drop_table_query) + cursor.execute() + rhnSQL.commit() + + def test_execute_not_all_variables_bound(self): + query =3D "INSERT INTO %s(id, name) VALUES(:id, :name)" % \ + self.temp_table + cursor =3D rhnSQL.prepare(query) + self.assertRaises(sql_base.SQLError, cursor.execute, name=3D"Blah") + + def test_statement_prepare_error(self): + query =3D "aaa bbb ccc" + cursor =3D rhnSQL.prepare(query) + self.assertRaises(rhnSQL.SQLStatementPrepareError, + cursor.execute) + rhnSQL.rollback() + + def test_execute_bindbyname_extra_params_passed(self): + query =3D "SELECT * FROM %s WHERE id =3D :id" % self.temp_table + cursor =3D rhnSQL.prepare(query) + cursor.execute(id=3DTEST_IDS[0], name=3D"Sam") # name should be ig= nored + results =3D cursor.fetchone() + self.assertEquals(TEST_IDS[0], results[0]) + self.assertEquals(TEST_NAMES[0], results[1]) + + def test_executemany(self): + query =3D "INSERT INTO %s(id, name) VALUES(:id, :name)" \ + % self.temp_table + ids =3D [1000, 1001] + names =3D ["Somebody", "Else"] + + cursor =3D rhnSQL.prepare(query) + cursor.executemany(id=3Dids, name=3Dnames) + + query =3D rhnSQL.prepare("SELECT * FROM %s WHERE id >=3D 1000 ORDE= R BY ID" + % self.temp_table) + query.execute() + rows =3D query.fetchall() + self.assertEquals(2, len(rows)) + + self.assertEquals(1000, rows[0][0]) + self.assertEquals(1001, rows[1][0]) + self.assertEquals("Somebody", rows[0][1]) + self.assertEquals("Else", rows[1][1]) + + def test_executemany2(self): + query =3D "SELECT * FROM %s" \ + % self.temp_table + cursor =3D rhnSQL.prepare(query) + cursor.executemany() + + def test_numeric_columns(self): + h =3D rhnSQL.prepare("SELECT num FROM %s WHERE id =3D %s" % + (self.temp_table, TEST_IDS[0])) + h.execute() + row =3D h.fetchone() + self.assertEqual(TEST_NUMS[0], row[0]) + + def test_fetchone(self): + query =3D "SELECT * FROM %s WHERE id =3D 1 ORDER BY id" % self.tem= p_table + cursor =3D rhnSQL.prepare(query) + cursor.execute() + results =3D cursor.fetchone() + self.assertEquals(TEST_IDS[0], results[0]) + self.assertEquals(TEST_NAMES[0], results[1]) + + def test_fetchone_dict(self): + query =3D "SELECT * FROM %s WHERE id =3D 1 ORDER BY id" % self.tem= p_table + cursor =3D rhnSQL.prepare(query) + cursor.execute() + results =3D cursor.fetchone_dict() + self.assertEquals(TEST_IDS[0], results['id']) + self.assertEquals(TEST_NAMES[0], results['name']) + self.assertEquals(TEST_NUMS[0], results['num']) + + def test_fetchall(self): + query =3D rhnSQL.prepare("SELECT * FROM %s ORDER BY id" % + self.temp_table) + query.execute() + rows =3D query.fetchall() + self.assertEquals(len(TEST_IDS), len(rows)) + + i =3D 0 + while i < len(TEST_IDS): + self.assertEquals(TEST_IDS[i], rows[i][0]) + self.assertEquals(TEST_NAMES[i], rows[i][1]) + i =3D i + 1 + + def test_fetchall_dict(self): + query =3D rhnSQL.prepare("SELECT * FROM %s ORDER BY id" % + self.temp_table) + query.execute() + rows =3D query.fetchall_dict() + self.assertEquals(len(TEST_IDS), len(rows)) + + i =3D 0 + while i < len(TEST_IDS): + self.assertEquals(TEST_IDS[i], rows[i]['id']) + self.assertEquals(TEST_NAMES[i], rows[i]['name']) + i =3D i + 1 + + + +class PostgreSQLDatabaseTests(RhnSQLDatabaseTests): + QUERY_CREATE_TABLE =3D """ + CREATE TABLE %s(id INT, name TEXT, num NUMERIC(5,2)) + """ + + def setUp(self): + self.temp_table =3D "testtable%s" % randint(1, 10000000) + create_table_query =3D self.QUERY_CREATE_TABLE % self.temp_table + cursor =3D rhnSQL.prepare(create_table_query) + cursor.execute() + + RhnSQLDatabaseTests.setUp(self) + + + +class OracleDatabaseTests(RhnSQLDatabaseTests): + QUERY_CREATE_TABLE =3D """ + CREATE TABLE %s(id NUMBER, name VARCHAR2(256), num NUMBER(5,2)) + """ + + def setUp(self): + self.temp_table =3D "testtable%s" % randint(1, 10000000) + create_table_query =3D self.QUERY_CREATE_TABLE % self.temp_table + cursor =3D rhnSQL.prepare(create_table_query) + cursor.execute() + + RhnSQLDatabaseTests.setUp(self) + + + +def postgresql_suite(): + suite =3D unittest.TestSuite() + suite.addTest(unittest.makeSuite(PostgreSQLDatabaseTests)) + return suite + +def oracle_suite(): + suite =3D unittest.TestSuite() + suite.addTest(unittest.makeSuite(OracleDatabaseTests)) + return suite + diff --git a/backend/test/non-unit/server/rhnSQL/rhnsqltests.py b/backend/t= est/non-unit/server/rhnSQL/rhnsqltests.py new file mode 100644 index 0000000..c429cb5 --- /dev/null +++ b/backend/test/non-unit/server/rhnSQL/rhnsqltests.py @@ -0,0 +1,71 @@ +# +# Copyright (c) 2008 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. +# + +""" +Pure unit tests for components of rhnSQL. +""" + +import unittest + +from server import rhnSQL +from server.rhnSQL.driver_postgresql import convert_named_query_params + +class RhnSQLTests(unittest.TestCase): + """ Pure unit tests for components of rhnSQL. """ + + def test_convert_named_query_params(self): + query =3D "INSERT INTO people(id, name, phone) VALUES(:id, :name, = :phone)" + expected_query =3D \ + "INSERT INTO people(id, name, phone) VALUES($1, $2, $3)" + + (new_query, param_index, args_found) =3D convert_named_query_param= s(query) + self.assertEquals(expected_query, new_query) + self.assertEquals(3, len(param_index.keys())) + self.assertEquals(3, args_found) + self.assertEquals([1], param_index['id']) + self.assertEquals([2], param_index['name']) + self.assertEquals([3], param_index['phone']) + + def test_convert_named_params_none_required(self): + query =3D "SELECT * FROM people" + + (new_query, param_index, args_found) =3D convert_named_query_param= s(query) + self.assertEquals(query, new_query) + self.assertEquals(0, len(param_index.keys())) + + def test_convert_named_params_multiple_uses(self): + query =3D "INSERT INTO people(a, b, c, d) VALUES(:a, :b, :a, :b)" + expected_query =3D \ + "INSERT INTO people(a, b, c, d) VALUES($1, $2, $3, $4)" + + (new_query, param_index, args_found) =3D convert_named_query_param= s(query) + self.assertEquals(expected_query, new_query) + self.assertEquals(4, args_found) + self.assertEquals(2, len(param_index.keys())) + self.assertEquals([1, 3], param_index['a']) + self.assertEquals([2, 4], param_index['b']) + + + + + +def suite(): + suite =3D unittest.TestSuite() + suite.addTest(unittest.makeSuite(RhnSQLTests)) + return suite + + +if __name__ =3D=3D "__main__": + unittest.main(defaultTest=3D"suite") diff --git a/backend/test/suites/dbtests.py b/backend/test/suites/dbtests.py deleted file mode 100644 index 9429db4..0000000 --- a/backend/test/suites/dbtests.py +++ /dev/null @@ -1,200 +0,0 @@ -# -# Copyright (c) 2008 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. -# - -""" -Database specific tests for rhnSQL drivers. - -These tests require a database connection, usually configured in a = -rhntests-*.py script. -""" - -import unittest - -from random import randint - -from server import rhnSQL -from server.rhnSQL import sql_base - -TEST_IDS =3D [1, 2, 3] -TEST_NAMES =3D ["Bill", "Susan", "Joe"] -TEST_NUMS =3D [900.12, 600.49, 34.98] - -class RhnSQLDatabaseTests(unittest.TestCase): - """ = - Database connection tests that can be run against any supported databa= se. - """ - - def setUp(self): - # Expect self.temp_table to have been created by subclass by now: - - #insert_query =3D "INSERT INTO %s(id, name) VALUES($1, $2)" % \ - # self.temp_table - #cursor =3D rhnSQL.prepare(insert_query) - #ids =3D [1, 2, 3, 4, 5] - #names =3D ["Bill", "Ted", "Mary", "Tom", "Susan"] - #cursor.executemany([ids, names]) - - insert_query =3D "INSERT INTO %s(id, name, num) VALUES(:id, :name,= :num)" % \ - self.temp_table - cursor =3D rhnSQL.prepare(insert_query) - cursor.execute(id=3DTEST_IDS[0], name=3DTEST_NAMES[0], num=3DTEST_= NUMS[0]) - cursor.execute(id=3DTEST_IDS[1], name=3DTEST_NAMES[1], num=3DTEST_= NUMS[1]) - cursor.execute(id=3DTEST_IDS[2], name=3DTEST_NAMES[2], num=3DTEST_= NUMS[2]) - - def tearDown(self): - drop_table_query =3D "DROP TABLE %s" % self.temp_table - cursor =3D rhnSQL.prepare(drop_table_query) - cursor.execute() - rhnSQL.commit() - - def test_execute_not_all_variables_bound(self): - query =3D "INSERT INTO %s(id, name) VALUES(:id, :name)" % \ - self.temp_table - cursor =3D rhnSQL.prepare(query) - self.assertRaises(sql_base.SQLError, cursor.execute, name=3D"Blah") - - def test_statement_prepare_error(self): - query =3D "aaa bbb ccc" - cursor =3D rhnSQL.prepare(query) - self.assertRaises(rhnSQL.SQLStatementPrepareError, - cursor.execute) - rhnSQL.rollback() - - def test_execute_bindbyname_extra_params_passed(self): - query =3D "SELECT * FROM %s WHERE id =3D :id" % self.temp_table - cursor =3D rhnSQL.prepare(query) - cursor.execute(id=3DTEST_IDS[0], name=3D"Sam") # name should be ig= nored - results =3D cursor.fetchone() - self.assertEquals(TEST_IDS[0], results[0]) - self.assertEquals(TEST_NAMES[0], results[1]) - - def test_executemany(self): - query =3D "INSERT INTO %s(id, name) VALUES(:id, :name)" \ - % self.temp_table - ids =3D [1000, 1001] - names =3D ["Somebody", "Else"] - - cursor =3D rhnSQL.prepare(query) - cursor.executemany(id=3Dids, name=3Dnames) - - query =3D rhnSQL.prepare("SELECT * FROM %s WHERE id >=3D 1000 ORDE= R BY ID" - % self.temp_table) - query.execute() - rows =3D query.fetchall() - self.assertEquals(2, len(rows)) - - self.assertEquals(1000, rows[0][0]) - self.assertEquals(1001, rows[1][0]) - self.assertEquals("Somebody", rows[0][1]) - self.assertEquals("Else", rows[1][1]) - - def test_executemany2(self): - query =3D "SELECT * FROM %s" \ - % self.temp_table - cursor =3D rhnSQL.prepare(query) - cursor.executemany() - - def test_numeric_columns(self): - h =3D rhnSQL.prepare("SELECT num FROM %s WHERE id =3D %s" % - (self.temp_table, TEST_IDS[0])) - h.execute() - row =3D h.fetchone() - self.assertEqual(TEST_NUMS[0], row[0]) - - def test_fetchone(self): - query =3D "SELECT * FROM %s WHERE id =3D 1 ORDER BY id" % self.tem= p_table - cursor =3D rhnSQL.prepare(query) - cursor.execute() - results =3D cursor.fetchone() - self.assertEquals(TEST_IDS[0], results[0]) - self.assertEquals(TEST_NAMES[0], results[1]) - - def test_fetchone_dict(self): - query =3D "SELECT * FROM %s WHERE id =3D 1 ORDER BY id" % self.tem= p_table - cursor =3D rhnSQL.prepare(query) - cursor.execute() - results =3D cursor.fetchone_dict() - self.assertEquals(TEST_IDS[0], results['id']) - self.assertEquals(TEST_NAMES[0], results['name']) - self.assertEquals(TEST_NUMS[0], results['num']) - - def test_fetchall(self): - query =3D rhnSQL.prepare("SELECT * FROM %s ORDER BY id" % - self.temp_table) - query.execute() - rows =3D query.fetchall() - self.assertEquals(len(TEST_IDS), len(rows)) - - i =3D 0 - while i < len(TEST_IDS): - self.assertEquals(TEST_IDS[i], rows[i][0]) - self.assertEquals(TEST_NAMES[i], rows[i][1]) - i =3D i + 1 - - def test_fetchall_dict(self): - query =3D rhnSQL.prepare("SELECT * FROM %s ORDER BY id" % - self.temp_table) - query.execute() - rows =3D query.fetchall_dict() - self.assertEquals(len(TEST_IDS), len(rows)) - - i =3D 0 - while i < len(TEST_IDS): - self.assertEquals(TEST_IDS[i], rows[i]['id']) - self.assertEquals(TEST_NAMES[i], rows[i]['name']) - i =3D i + 1 - - - -class PostgreSQLDatabaseTests(RhnSQLDatabaseTests): - QUERY_CREATE_TABLE =3D """ - CREATE TABLE %s(id INT, name TEXT, num NUMERIC(5,2)) - """ - - def setUp(self): - self.temp_table =3D "testtable%s" % randint(1, 10000000) - create_table_query =3D self.QUERY_CREATE_TABLE % self.temp_table - cursor =3D rhnSQL.prepare(create_table_query) - cursor.execute() - - RhnSQLDatabaseTests.setUp(self) - - - -class OracleDatabaseTests(RhnSQLDatabaseTests): - QUERY_CREATE_TABLE =3D """ - CREATE TABLE %s(id NUMBER, name VARCHAR2(256), num NUMBER(5,2)) - """ - - def setUp(self): - self.temp_table =3D "testtable%s" % randint(1, 10000000) - create_table_query =3D self.QUERY_CREATE_TABLE % self.temp_table - cursor =3D rhnSQL.prepare(create_table_query) - cursor.execute() - - RhnSQLDatabaseTests.setUp(self) - - - -def postgresql_suite(): - suite =3D unittest.TestSuite() - suite.addTest(unittest.makeSuite(PostgreSQLDatabaseTests)) - return suite - -def oracle_suite(): - suite =3D unittest.TestSuite() - suite.addTest(unittest.makeSuite(OracleDatabaseTests)) - return suite - diff --git a/backend/test/suites/rhnsqltests.py b/backend/test/suites/rhnsq= ltests.py deleted file mode 100644 index 835a3a3..0000000 --- a/backend/test/suites/rhnsqltests.py +++ /dev/null @@ -1,71 +0,0 @@ -# -# Copyright (c) 2008 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. -# - -""" -Pure unit tests for components of rhnSQL. -""" - -import unittest - -from server import rhnSQL -from server.rhnSQL.driver_postgresql import convert_named_query_params - -class RhnSQLTests(unittest.TestCase): - """ Pure unit tests for components of rhnSQL. """ - - def test_convert_named_query_params(self): - query =3D "INSERT INTO people(id, name, phone) VALUES(:id, :name, = :phone)" - expected_query =3D \ - "INSERT INTO people(id, name, phone) VALUES($1, $2, $3)" - - (new_query, param_index, args_found) =3D convert_named_query_param= s(query) - self.assertEquals(expected_query, new_query) = - self.assertEquals(3, len(param_index.keys())) - self.assertEquals(3, args_found) - self.assertEquals([1], param_index['id']) - self.assertEquals([2], param_index['name']) - self.assertEquals([3], param_index['phone']) - - def test_convert_named_params_none_required(self): - query =3D "SELECT * FROM people" - - (new_query, param_index, args_found) =3D convert_named_query_param= s(query) - self.assertEquals(query, new_query) = - self.assertEquals(0, len(param_index.keys())) - - def test_convert_named_params_multiple_uses(self): - query =3D "INSERT INTO people(a, b, c, d) VALUES(:a, :b, :a, :b)" - expected_query =3D \ - "INSERT INTO people(a, b, c, d) VALUES($1, $2, $3, $4)" - - (new_query, param_index, args_found) =3D convert_named_query_param= s(query) - self.assertEquals(expected_query, new_query) = - self.assertEquals(4, args_found) - self.assertEquals(2, len(param_index.keys())) - self.assertEquals([1, 3], param_index['a']) - self.assertEquals([2, 4], param_index['b']) - - - - - -def suite(): - suite =3D unittest.TestSuite() - suite.addTest(unittest.makeSuite(RhnSQLTests)) - return suite - - -if __name__ =3D=3D "__main__": - unittest.main(defaultTest=3D"suite") diff --git a/backend/test/unit/spacewalk/__init__.py b/backend/test/unit/sp= acewalk/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/backend/test/unit/spacewalk/test/__init__.py b/backend/test/un= it/spacewalk/test/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/backend/test/unit/spacewalk/test/common/__init__.py b/backend/= test/unit/spacewalk/test/common/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/backend/test/unit/spacewalk/test/common/rhnLib-tests.py b/back= end/test/unit/spacewalk/test/common/rhnLib-tests.py new file mode 100644 index 0000000..6a060d3 --- /dev/null +++ b/backend/test/unit/spacewalk/test/common/rhnLib-tests.py @@ -0,0 +1,36 @@ +# +# Copyright (c) 2008 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. +# + +import unittest + +import spacewalk.test.setpath +from common.rhnLib import parseUrl + +class RhnLibTests(unittest.TestCase): + + def testParseUrl(self): + self.assertEquals(('', '', '', '', '', ''), + parseUrl('')) + self.assertEquals(('', 'somehostname', '', '', '', ''), + parseUrl('somehostname')) + self.assertEquals(('http', 'somehostname', '', '', '', ''), + parseUrl('http://somehostname')) + self.assertEquals(('https', 'somehostname', '', '', '', ''), + parseUrl('https://somehostname')) + self.assertEquals(('https', 'somehostname:123', '', '', '', ''), + parseUrl('https://somehostname:123')) + self.assertEquals(('https', 'somehostname:123', '/ABCDE', '', '', = ''), + parseUrl('https://somehostname:123/ABCDE')) + diff --git a/backend/test/unit/spacewalk/test/setpath.py b/backend/test/uni= t/spacewalk/test/setpath.py new file mode 100644 index 0000000..15296ba --- /dev/null +++ b/backend/test/unit/spacewalk/test/setpath.py @@ -0,0 +1,31 @@ +import sys +import os +import os.path +import unittest + +PYTHON_PATH_SETUP =3D False + +def setup_python_path(): + """ + Configure the Python path to run the backend tests from a source check= out. + Can be called many times in a test run, but should only actually do + something the first time. + """ + global PYTHON_PATH_SETUP + if PYTHON_PATH_SETUP: + print "PYTHONPATH already configured, skipping." + return + print "Configuring PYTHONPATH..." + if not os.environ.has_key('SPACEWALK_GIT'): + raise Exception("SPACEWALK_GIT environment variable not set") + + gitdir =3D os.path.expanduser(os.environ['SPACEWALK_GIT']) + sys.path.insert(0, os.path.join(gitdir, "client/rhel/rhnlib/")) + sys.path.insert(0, os.path.join(gitdir, "backend")) + PYTHON_PATH_SETUP =3D True + +setup_python_path() + + + + --===============8833347847377736659==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:46 2015 Content-Type: multipart/mixed; boundary="===============0932257312391099450==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to '/refs/heads/repo-sync' Date: Tue, 23 Jun 2009 16:54:08 +0000 Message-ID: <20090623165408.AD62E120255@lists.fedorahosted.org> --===============0932257312391099450== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable New branch '/refs/heads/repo-sync' available with the following commits: --===============0932257312391099450==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:46 2015 Content-Type: multipart/mixed; boundary="===============1932126801242400406==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'refs/heads/repo-sync' - 0 commits - Date: Tue, 23 Jun 2009 16:56:09 +0000 Message-ID: <20090623165609.46A89120255@lists.fedorahosted.org> --===============1932126801242400406== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Rebased ref, commits from common ancestor: --===============1932126801242400406==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:46 2015 Content-Type: multipart/mixed; boundary="===============7936566474147364791==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'repo-sync' Date: Tue, 23 Jun 2009 16:58:11 +0000 Message-ID: <20090623165811.7E5F8120255@lists.fedorahosted.org> --===============7936566474147364791== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable New branch 'repo-sync' available with the following commits: --===============7936566474147364791==-- From partha at fedoraproject.org Thu Aug 20 11:57:46 2015 Content-Type: multipart/mixed; boundary="===============6433075772122132211==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Tue, 23 Jun 2009 18:12:54 +0000 Message-ID: <20090623181255.034A0120255@lists.fedorahosted.org> --===============6433075772122132211== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDetai= lsAction.java | 17 ++++ java/code/webapp/WEB-INF/pages/systems/probes/details.jsp = | 36 ++++++---- 2 files changed, 37 insertions(+), 16 deletions(-) New commits: commit b9384a103a7e51afe3a2e524172280b3f37dae3f Author: Partha Aji Date: Tue Jun 23 14:07:22 2009 -0400 506702 - Converted probe details page to use the new list to get the co= rrect csv diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitorin= g/ProbeDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/sy= stems/monitoring/ProbeDetailsAction.java index 03a0dcd..43419c5 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/Probe= DetailsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/Probe= DetailsAction.java @@ -26,6 +26,8 @@ import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.frontend.action.common.DateRangePicker; import com.redhat.rhn.frontend.action.common.DateRangePicker.DatePickerRes= ults; import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.Listable; import com.redhat.rhn.manager.monitoring.MonitoringManager; = import org.apache.commons.lang.BooleanUtils; @@ -41,6 +43,7 @@ import java.sql.Timestamp; import java.util.Calendar; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; = import javax.servlet.http.HttpServletRequest; @@ -53,7 +56,7 @@ import javax.servlet.http.HttpServletResponse; * = * @version $Rev$ */ -public class ProbeDetailsAction extends BaseProbeAction { +public class ProbeDetailsAction extends BaseProbeAction implements Listabl= e { = public static final String IS_SUITE_PROBE =3D "is_suite_probe"; public static final String SHOW_LOG =3D "show_log"; @@ -164,7 +167,9 @@ public class ProbeDetailsAction extends BaseProbeAction= { MonitoringManager.getInstance().getProbeStateChangeDat= a(probe, = new Timestamp(dates.getStart().getCalendar().g= etTimeInMillis()), new Timestamp(dates.getEnd().getCalendar().get= TimeInMillis())); - req.setAttribute("pageList", dr); + req.setAttribute(ListHelper.LIST, dr); + ListHelper helper =3D new ListHelper(this, req); + helper.execute(); } } = = @@ -203,4 +208,12 @@ public class ProbeDetailsAction extends BaseProbeActio= n { return mapping.findForward("default"); } = + /** + * part of the Listable interface + * {@inheritDoc} + */ + public List getResult(RequestContext context) { + return (List)context.getRequest().getAttribute(ListHelper.LIST); + } + } diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp b/ja= va/code/webapp/WEB-INF/pages/systems/probes/details.jsp index 9e5b5a5..dcae87c 100644 --- a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp @@ -3,7 +3,7 @@ <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/fmt" prefix=3D"fmt" %> <%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> <%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> - +<%@ taglib uri=3D"http://rhn.redhat.com/tags/list" prefix=3D"rl" %> @@ -107,19 +107,27 @@

                                      - - - - ${current.entryDate} - - - ${current.state} - - - ${current.htmlifiedMessage} - - - + + + + + + + + + + + +
                                      --===============6433075772122132211==-- From partha at fedoraproject.org Thu Aug 20 11:57:46 2015 Content-Type: multipart/mixed; boundary="===============4816876100089279458==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Tue, 23 Jun 2009 18:13:56 +0000 Message-ID: <20090623181356.E491E120255@lists.fedorahosted.org> --===============4816876100089279458== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDetai= lsAction.java | 17 ++++ java/code/webapp/WEB-INF/pages/systems/probes/details.jsp = | 36 ++++++---- 2 files changed, 37 insertions(+), 16 deletions(-) New commits: commit 7c3849809897007a5caaf9f7de59ef91653e6fac Author: Partha Aji Date: Tue Jun 23 14:07:22 2009 -0400 506702 - Converted probe details page to use the new list to get the co= rrect csv diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitorin= g/ProbeDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/sy= stems/monitoring/ProbeDetailsAction.java index 03a0dcd..43419c5 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/Probe= DetailsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/Probe= DetailsAction.java @@ -26,6 +26,8 @@ import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.frontend.action.common.DateRangePicker; import com.redhat.rhn.frontend.action.common.DateRangePicker.DatePickerRes= ults; import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.Listable; import com.redhat.rhn.manager.monitoring.MonitoringManager; = import org.apache.commons.lang.BooleanUtils; @@ -41,6 +43,7 @@ import java.sql.Timestamp; import java.util.Calendar; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; = import javax.servlet.http.HttpServletRequest; @@ -53,7 +56,7 @@ import javax.servlet.http.HttpServletResponse; * = * @version $Rev$ */ -public class ProbeDetailsAction extends BaseProbeAction { +public class ProbeDetailsAction extends BaseProbeAction implements Listabl= e { = public static final String IS_SUITE_PROBE =3D "is_suite_probe"; public static final String SHOW_LOG =3D "show_log"; @@ -164,7 +167,9 @@ public class ProbeDetailsAction extends BaseProbeAction= { MonitoringManager.getInstance().getProbeStateChangeDat= a(probe, = new Timestamp(dates.getStart().getCalendar().g= etTimeInMillis()), new Timestamp(dates.getEnd().getCalendar().get= TimeInMillis())); - req.setAttribute("pageList", dr); + req.setAttribute(ListHelper.LIST, dr); + ListHelper helper =3D new ListHelper(this, req); + helper.execute(); } } = = @@ -203,4 +208,12 @@ public class ProbeDetailsAction extends BaseProbeActio= n { return mapping.findForward("default"); } = + /** + * part of the Listable interface + * {@inheritDoc} + */ + public List getResult(RequestContext context) { + return (List)context.getRequest().getAttribute(ListHelper.LIST); + } + } diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp b/ja= va/code/webapp/WEB-INF/pages/systems/probes/details.jsp index 90e9572..a20fef5 100644 --- a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp @@ -3,7 +3,7 @@ <%@ taglib uri=3D"http://java.sun.com/jsp/jstl/fmt" prefix=3D"fmt" %> <%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> <%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> - +<%@ taglib uri=3D"http://rhn.redhat.com/tags/list" prefix=3D"rl" %> @@ -113,19 +113,27 @@

                                      - - - - ${current.entryDate} - - - ${current.state} - - - ${current.htmlifiedMessage} - - - + + + + + + + + + + + +
                                      --===============4816876100089279458==-- From tgl at fedoraproject.org Thu Aug 20 11:57:46 2015 Content-Type: multipart/mixed; boundary="===============7965685932904354449==" MIME-Version: 1.0 From: Tom Lane To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'pgsql' - schema/spacewalk Date: Tue, 23 Jun 2009 18:53:32 +0000 Message-ID: <20090623185332.8C34D120255@lists.fedorahosted.org> --===============7965685932904354449== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable schema/spacewalk/postgres/packages/rhn_channel.pkb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) New commits: commit ab6e999301787cf3ca5dd03b35afe11d11e8425f Author: Tom Lane Date: Tue Jun 23 14:49:25 2009 -0400 Merge recent fixes for 485870 and 498467 into Postgres files. diff --git a/schema/spacewalk/postgres/packages/rhn_channel.pkb b/schema/sp= acewalk/postgres/packages/rhn_channel.pkb index fdb35e6..be74ba0 100644 --- a/schema/spacewalk/postgres/packages/rhn_channel.pkb +++ b/schema/spacewalk/postgres/packages/rhn_channel.pkb @@ -75,7 +75,7 @@ update pg_settings set setting =3D 'rhn_channel,' || sett= ing where name =3D 'search_ VALUES (channel_family_id_val, user_id_in, server_id_in); END$$ language plpgsql; = - CREATE OR REPLACE FUNCTION subscribe_server(server_id_in IN NUMERIC, c= hannel_id_in NUMERIC, immediate_in NUMERIC default 1, user_id_in in numeric= default null) returns void + CREATE OR REPLACE FUNCTION subscribe_server(server_id_in IN NUMERIC, c= hannel_id_in NUMERIC, immediate_in NUMERIC default 1, user_id_in in numeric= default null, recalcfamily_in NUMERIC default 1) returns void AS $$ declare channel_parent_val rhnChannel.parent_channel%TYPE; @@ -178,8 +178,10 @@ update pg_settings set setting =3D 'rhn_channel,' || s= etting where name =3D 'search_ ); UPDATE rhnServer SET channels_changed =3D current_timestamp WH= ERE id =3D server_id_in; INSERT INTO rhnServerChannel (server_id, channel_id) VALUES (s= erver_id_in, channel_id_in); - - perform rhn_channel.update_family_counts(channel_family_id_val= , server_org_id_val); + IF recalcfamily_in > 0 + THEN + perform rhn_channel.update_family_counts(channel_family_id= _val, server_org_id_val); + END IF; perform queue_server(server_id_in, immediate_in); ELSE perform rhn_exception.raise_exception('channel_family_no_subsc= riptions'); @@ -723,7 +725,7 @@ update pg_settings set setting =3D 'rhn_channel,' || se= tting where name =3D 'search_ declare current_members_count numeric :=3D 0; begin - select count(sc.server_id) + select count(distinct sc.server_id) into current_members_count from rhnChannelFamilyMembers cfm, rhnServerChannel sc, @@ -1058,7 +1060,7 @@ update pg_settings set setting =3D 'rhn_channel,' || = setting where name =3D 'search_ RETURNS numeric AS $$ declare - channel_name varchar(64); + channel_name varchar(256); priority numeric; end_of_life_val timestamptz; org_id_val numeric; --===============7965685932904354449==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:46 2015 Content-Type: multipart/mixed; boundary="===============2801884328833203985==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - backend/server Date: Tue, 23 Jun 2009 19:08:13 +0000 Message-ID: <20090623190813.F3705120255@lists.fedorahosted.org> --===============2801884328833203985== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/importlib/backend.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 01c8fa89603001b001b012094ec0c1f9a1c48426 Author: Pradeep Kilambi Date: Tue Jun 23 15:07:59 2009 -0400 505680 - channel_product_id is computed based on the name, product and = version so it will not match the cache as cache is always None. Also dont u= pdate the channel_product_id uless the id is different from whats being upd= ated diff --git a/backend/server/importlib/backend.py b/backend/server/importlib= /backend.py index 1d39047..1c0ba13 100644 --- a/backend/server/importlib/backend.py +++ b/backend/server/importlib/backend.py @@ -1132,6 +1132,7 @@ class Backend: UPDATE rhnChannel SET channel_product_id =3D :channel_product_id WHERE id =3D :id + AND channel_product_id <> :channel_product_id """) = statement.execute(id =3D channel.id, @@ -2009,7 +2010,7 @@ def _buildExternalValue(dict, entry, tableObj): def computeDiff(hash1, hash2, diffHash, diffobj, prefix=3DNone): # Compare if the key-values of hash1 are a subset of hash2's difference =3D 0 - ignore_keys =3D ['last_modified'] + ignore_keys =3D ['last_modified', 'channel_product_id'] = for k, v in hash1.items(): if k in ignore_keys: --===============2801884328833203985==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:46 2015 Content-Type: multipart/mixed; boundary="===============5706972419913197631==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: backend/server Date: Tue, 23 Jun 2009 19:08:44 +0000 Message-ID: <20090623190844.5ED82120255@lists.fedorahosted.org> --===============5706972419913197631== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/importlib/backend.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 20b2878e81f71f0774490703fdfc178960ef5dec Author: Pradeep Kilambi Date: Tue Jun 23 15:07:59 2009 -0400 505680 - channel_product_id is computed based on the name, product and = version so it will not match the cache as cache is always None. Also dont u= pdate the channel_product_id uless the id is different from whats being upd= ated diff --git a/backend/server/importlib/backend.py b/backend/server/importlib= /backend.py index 1d39047..1c0ba13 100644 --- a/backend/server/importlib/backend.py +++ b/backend/server/importlib/backend.py @@ -1132,6 +1132,7 @@ class Backend: UPDATE rhnChannel SET channel_product_id =3D :channel_product_id WHERE id =3D :id + AND channel_product_id <> :channel_product_id """) = statement.execute(id =3D channel.id, @@ -2009,7 +2010,7 @@ def _buildExternalValue(dict, entry, tableObj): def computeDiff(hash1, hash2, diffHash, diffobj, prefix=3DNone): # Compare if the key-values of hash1 are a subset of hash2's difference =3D 0 - ignore_keys =3D ['last_modified'] + ignore_keys =3D ['last_modified', 'channel_product_id'] = for k, v in hash1.items(): if k in ignore_keys: --===============5706972419913197631==-- From partha at fedoraproject.org Thu Aug 20 11:57:46 2015 Content-Type: multipart/mixed; boundary="===============5116779570139919628==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Tue, 23 Jun 2009 21:20:05 +0000 Message-ID: <20090623212005.B7A6C120255@lists.fedorahosted.org> --===============5116779570139919628== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/Probe= DetailsActionTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 3f4ffbd9b63cae255b4761eea954064ffeb5c680 Author: Partha Aji Date: Tue Jun 23 17:20:33 2009 -0400 Fixed a unit test diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitorin= g/test/ProbeDetailsActionTest.java b/java/code/src/com/redhat/rhn/frontend/= action/systems/monitoring/test/ProbeDetailsActionTest.java index ba70bc5..628a7ad 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/= ProbeDetailsActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/= ProbeDetailsActionTest.java @@ -29,6 +29,7 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.action.systems.monitoring.ProbeDetailsActio= n; import com.redhat.rhn.frontend.context.Context; import com.redhat.rhn.frontend.struts.RhnAction; +import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; import com.redhat.rhn.manager.monitoring.test.MonitoringManagerTest; import com.redhat.rhn.testing.ActionHelper; import com.redhat.rhn.testing.RhnBaseTestCase; @@ -143,8 +144,8 @@ public class ProbeDetailsActionTest extends RhnBaseTest= Case { assertNotNull(ah.getForm().get(ProbeDetailsAction.METRICS)); = // Graph and Event log - assertNotNull(ah.getRequest().getAttribute("pageList")); - DataResult dr =3D (DataResult) ah.getRequest().getAttribute("pageL= ist"); + assertNotNull(ah.getRequest().getAttribute(ListHelper.LIST)); + DataResult dr =3D (DataResult) ah.getRequest().getAttribute(ListHe= lper.LIST); assertTrue(dr.size() > 0); assertTrue(dr.getTotalSize() > 0); assertEquals(1, dr.getStart()); --===============5116779570139919628==-- From partha at fedoraproject.org Thu Aug 20 11:57:46 2015 Content-Type: multipart/mixed; boundary="===============5507916236733840516==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Tue, 23 Jun 2009 21:21:20 +0000 Message-ID: <20090623212120.3EC62120255@lists.fedorahosted.org> --===============5507916236733840516== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/Probe= DetailsActionTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 3408857fd763b5cf1c4d2c1d13b5f6930e1162c9 Author: Partha Aji Date: Tue Jun 23 17:20:33 2009 -0400 Fixed a unit test diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitorin= g/test/ProbeDetailsActionTest.java b/java/code/src/com/redhat/rhn/frontend/= action/systems/monitoring/test/ProbeDetailsActionTest.java index ba70bc5..628a7ad 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/= ProbeDetailsActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/= ProbeDetailsActionTest.java @@ -29,6 +29,7 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.action.systems.monitoring.ProbeDetailsActio= n; import com.redhat.rhn.frontend.context.Context; import com.redhat.rhn.frontend.struts.RhnAction; +import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; import com.redhat.rhn.manager.monitoring.test.MonitoringManagerTest; import com.redhat.rhn.testing.ActionHelper; import com.redhat.rhn.testing.RhnBaseTestCase; @@ -143,8 +144,8 @@ public class ProbeDetailsActionTest extends RhnBaseTest= Case { assertNotNull(ah.getForm().get(ProbeDetailsAction.METRICS)); = // Graph and Event log - assertNotNull(ah.getRequest().getAttribute("pageList")); - DataResult dr =3D (DataResult) ah.getRequest().getAttribute("pageL= ist"); + assertNotNull(ah.getRequest().getAttribute(ListHelper.LIST)); + DataResult dr =3D (DataResult) ah.getRequest().getAttribute(ListHe= lper.LIST); assertTrue(dr.size() > 0); assertTrue(dr.getTotalSize() > 0); assertEquals(1, dr.getStart()); --===============5507916236733840516==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:46 2015 Content-Type: multipart/mixed; boundary="===============0211458372422666591==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - spacewalk/setup Date: Wed, 24 Jun 2009 12:29:43 +0000 Message-ID: <20090624122943.5A516120263@lists.fedorahosted.org> --===============0211458372422666591== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/setup/lib/Spacewalk/Setup.pm | 6 +++--- spacewalk/setup/share/oracle/upgrade-db-10g.sh | 3 ++- spacewalk/setup/share/oracle/upgrade-db.sh | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) New commits: commit 942db9dede9654ca3c7b79d1761125514a51b398 Author: Milan Zazrivec Date: Wed Jun 24 14:23:55 2009 +0200 no in-place editing of /etc/oratab under oracle user = Ordinarily, oracle user does not have permissions to rename objects under /etc directory, hence no in-place editing of /etc/oratab under oracle user is possible. This needs to be replaced by a two-step procedure. diff --git a/spacewalk/setup/share/oracle/upgrade-db-10g.sh b/spacewalk/set= up/share/oracle/upgrade-db-10g.sh index e65eecc..1bbee9d 100644 --- a/spacewalk/setup/share/oracle/upgrade-db-10g.sh +++ b/spacewalk/setup/share/oracle/upgrade-db-10g.sh @@ -54,7 +54,8 @@ export ORACLE_SID=3D$DB_NAME # If the record for satellite database exists, substitute it with new valu= e. # Otherwise create a new record. if grep -q "^$ORACLE_SID:.*$" /etc/oratab; then - sed -i "s;^$ORACLE_SID:.*$;$ORACLE_SID:$ORACLE_HOME:Y;" /etc/oratab + oratab=3D$(sed "s;^$ORACLE_SID:.*$;$ORACLE_SID:$ORACLE_HOME:Y;" /etc/orat= ab) + echo "$oratab" > /etc/oratab else echo "$ORACLE_SID:$ORACLE_HOME:Y" >> /etc/oratab fi diff --git a/spacewalk/setup/share/oracle/upgrade-db.sh b/spacewalk/setup/s= hare/oracle/upgrade-db.sh index be9667b..bd0f291 100644 --- a/spacewalk/setup/share/oracle/upgrade-db.sh +++ b/spacewalk/setup/share/oracle/upgrade-db.sh @@ -59,7 +59,8 @@ export ORACLE_SID=3D$DB_NAME # If the record for satellite database exists, substitute it with new valu= e. # Otherwise create a new record. if grep -q "^$ORACLE_SID:.*$" /etc/oratab; then - sed -i "s;^$ORACLE_SID:.*$;$ORACLE_SID:$ORACLE_HOME:Y;" /etc/oratab + oratab=3D$(sed "s;^$ORACLE_SID:.*$;$ORACLE_SID:$ORACLE_HOME:Y;" /etc/orat= ab) + echo "$oratab" > /etc/oratab else echo "$ORACLE_SID:$ORACLE_HOME:Y" >> /etc/oratab fi commit 3dbad2fbda7e5c3358f9d41105c13147f91816a4 Author: Milan Zazrivec Date: Wed Jun 24 14:15:35 2009 +0200 remove extraneous backslash characters diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/S= pacewalk/Setup.pm index 2bbd642..b2bb45d 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -728,9 +728,9 @@ EOQ -err_message =3D> "Could not upgrade database.\n", -err_code =3D> 15, -system_opts =3D> ['/sbin/runuser', 'oracle', '-c', - SHARED_DIR . '/oracle/' . $upgrade_scr= ipt . \ - " --db " . $answers->{'db-sid'} . \ - " --user " . $answers->{'db-user'}]); + SHARED_DIR . '/oracle/' . $upgrade_scr= ipt . + " --db $answers->{'db-sid'}" . + " --user $answers->{'db-user'}"]); = system_or_exit(['service', 'oracle', 'restart'], 41, 'Could not restart oracle service'); --===============0211458372422666591==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:46 2015 Content-Type: multipart/mixed; boundary="===============8043120458609130610==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - 2 commits - spacewalk/setup Date: Wed, 24 Jun 2009 12:30:35 +0000 Message-ID: <20090624123035.51A45120263@lists.fedorahosted.org> --===============8043120458609130610== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/setup/lib/Spacewalk/Setup.pm | 6 +++--- spacewalk/setup/share/oracle/upgrade-db-10g.sh | 3 ++- spacewalk/setup/share/oracle/upgrade-db.sh | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) New commits: commit d7a2c47c20513aa5edeee6e07b8f8be1bc991a9a Author: Milan Zazrivec Date: Wed Jun 24 14:23:55 2009 +0200 no in-place editing of /etc/oratab under oracle user = Ordinarily, oracle user does not have permissions to rename objects under /etc directory, hence no in-place editing of /etc/oratab under oracle user is possible. This needs to be replaced by a two-step procedure. diff --git a/spacewalk/setup/share/oracle/upgrade-db-10g.sh b/spacewalk/set= up/share/oracle/upgrade-db-10g.sh index e65eecc..1bbee9d 100644 --- a/spacewalk/setup/share/oracle/upgrade-db-10g.sh +++ b/spacewalk/setup/share/oracle/upgrade-db-10g.sh @@ -54,7 +54,8 @@ export ORACLE_SID=3D$DB_NAME # If the record for satellite database exists, substitute it with new valu= e. # Otherwise create a new record. if grep -q "^$ORACLE_SID:.*$" /etc/oratab; then - sed -i "s;^$ORACLE_SID:.*$;$ORACLE_SID:$ORACLE_HOME:Y;" /etc/oratab + oratab=3D$(sed "s;^$ORACLE_SID:.*$;$ORACLE_SID:$ORACLE_HOME:Y;" /etc/orat= ab) + echo "$oratab" > /etc/oratab else echo "$ORACLE_SID:$ORACLE_HOME:Y" >> /etc/oratab fi diff --git a/spacewalk/setup/share/oracle/upgrade-db.sh b/spacewalk/setup/s= hare/oracle/upgrade-db.sh index be9667b..bd0f291 100644 --- a/spacewalk/setup/share/oracle/upgrade-db.sh +++ b/spacewalk/setup/share/oracle/upgrade-db.sh @@ -59,7 +59,8 @@ export ORACLE_SID=3D$DB_NAME # If the record for satellite database exists, substitute it with new valu= e. # Otherwise create a new record. if grep -q "^$ORACLE_SID:.*$" /etc/oratab; then - sed -i "s;^$ORACLE_SID:.*$;$ORACLE_SID:$ORACLE_HOME:Y;" /etc/oratab + oratab=3D$(sed "s;^$ORACLE_SID:.*$;$ORACLE_SID:$ORACLE_HOME:Y;" /etc/orat= ab) + echo "$oratab" > /etc/oratab else echo "$ORACLE_SID:$ORACLE_HOME:Y" >> /etc/oratab fi commit d37d1c97b8c5a8b7357836455c8a872a773ef07a Author: Milan Zazrivec Date: Wed Jun 24 14:15:35 2009 +0200 remove extraneous backslash characters diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/S= pacewalk/Setup.pm index 8b3fc29..80cec19 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -728,9 +728,9 @@ EOQ -err_message =3D> "Could not upgrade database.\n", -err_code =3D> 15, -system_opts =3D> ['/sbin/runuser', 'oracle', '-c', - SHARED_DIR . '/oracle/' . $upgrade_scr= ipt . \ - " --db " . $answers->{'db-sid'} . \ - " --user " . $answers->{'db-user'}]); + SHARED_DIR . '/oracle/' . $upgrade_scr= ipt . + " --db $answers->{'db-sid'}" . + " --user $answers->{'db-user'}"]); = system_or_exit(['service', 'oracle', 'restart'], 41, 'Could not restart oracle service'); --===============8043120458609130610==-- From tlestach at fedoraproject.org Thu Aug 20 11:57:47 2015 Content-Type: multipart/mixed; boundary="===============0267879416476559539==" MIME-Version: 1.0 From: Tomas Lestach To: spacewalk-commits at lists.fedorahosted.org Subject: monitoring/SatConfig Date: Wed, 24 Jun 2009 13:24:48 +0000 Message-ID: <20090624132448.DFA36120263@lists.fedorahosted.org> --===============0267879416476559539== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable monitoring/SatConfig/cluster/SatCluster.pm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) New commits: commit e525be888ea322e4c503bf99db59f2986ffe4765 Author: Tomas Lestach Date: Wed Jun 24 15:12:54 2009 +0200 490783 - preventing to read a config file, that must not exist = cron job runs monitor-queue as nocpulse user, so it has no rights to cr= eate a config file in /etc/nocpulse/ diff --git a/monitoring/SatConfig/cluster/SatCluster.pm b/monitoring/SatCon= fig/cluster/SatCluster.pm index 5f0ddef..58ab47b 100644 --- a/monitoring/SatConfig/cluster/SatCluster.pm +++ b/monitoring/SatConfig/cluster/SatCluster.pm @@ -48,13 +48,17 @@ sub initialize print FILE "[garbage]\n"; close(FILE); } - $config =3D Config::IniFiles->new(-file=3D>$self->get_configFilename); - $self->set_config($config); - $self->set_id($self->configValueOf('id')); - $self->set_nodeId($self->configValueOf('nodeId')); - $self->set_description($self->configValueOf('description')); - $self->set_customerId($self->configValueOf('customerId')); - $self->set_npIP($self->configValueOf('npIP')); + # notice that FILE must not exist + # (nocpulse user has no write access in /etc/nocpulse) + if ( -f $self->get_configFilename) { + $config =3D Config::IniFiles->new(-file=3D>$self->get_configFilena= me); + $self->set_config($config); + $self->set_id($self->configValueOf('id')); + $self->set_nodeId($self->configValueOf('nodeId')); + $self->set_description($self->configValueOf('description')); + $self->set_customerId($self->configValueOf('customerId')); + $self->set_npIP($self->configValueOf('npIP')); + } return $self; } = --===============0267879416476559539==-- From tlestach at fedoraproject.org Thu Aug 20 11:57:47 2015 Content-Type: multipart/mixed; boundary="===============8339122243486866468==" MIME-Version: 1.0 From: Tomas Lestach To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - monitoring/SatConfig Date: Wed, 24 Jun 2009 13:27:24 +0000 Message-ID: <20090624132724.99036120263@lists.fedorahosted.org> --===============8339122243486866468== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable monitoring/SatConfig/cluster/SatCluster.pm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) New commits: commit 25f9d1c308813615913face691fa5caeba99a2d4 Author: Tomas Lestach Date: Wed Jun 24 15:12:54 2009 +0200 490783 - preventing to read a config file, that must not exist = cron job runs monitor-queue as nocpulse user, so it has no rights to cr= eate a config file in /etc/nocpulse/ diff --git a/monitoring/SatConfig/cluster/SatCluster.pm b/monitoring/SatCon= fig/cluster/SatCluster.pm index 5f0ddef..58ab47b 100644 --- a/monitoring/SatConfig/cluster/SatCluster.pm +++ b/monitoring/SatConfig/cluster/SatCluster.pm @@ -48,13 +48,17 @@ sub initialize print FILE "[garbage]\n"; close(FILE); } - $config =3D Config::IniFiles->new(-file=3D>$self->get_configFilename); - $self->set_config($config); - $self->set_id($self->configValueOf('id')); - $self->set_nodeId($self->configValueOf('nodeId')); - $self->set_description($self->configValueOf('description')); - $self->set_customerId($self->configValueOf('customerId')); - $self->set_npIP($self->configValueOf('npIP')); + # notice that FILE must not exist + # (nocpulse user has no write access in /etc/nocpulse) + if ( -f $self->get_configFilename) { + $config =3D Config::IniFiles->new(-file=3D>$self->get_configFilena= me); + $self->set_config($config); + $self->set_id($self->configValueOf('id')); + $self->set_nodeId($self->configValueOf('nodeId')); + $self->set_description($self->configValueOf('description')); + $self->set_customerId($self->configValueOf('customerId')); + $self->set_npIP($self->configValueOf('npIP')); + } return $self; } = --===============8339122243486866468==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:47 2015 Content-Type: multipart/mixed; boundary="===============1232308821801025787==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Wed, 24 Jun 2009 14:47:36 +0000 Message-ID: <20090624144736.66957120263@lists.fedorahosted.org> --===============1232308821801025787== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/org/cobbler/CobblerObject.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit fd8b3c65aa284ca9e270e367edc0012692c18955 Author: Justin Sherrill Date: Wed Jun 24 10:48:02 2009 -0400 hopeflly fixing unit test diff --git a/java/code/src/org/cobbler/CobblerObject.java b/java/code/src/o= rg/cobbler/CobblerObject.java index 4c2e693..172fc18 100644 --- a/java/code/src/org/cobbler/CobblerObject.java +++ b/java/code/src/org/cobbler/CobblerObject.java @@ -477,7 +477,8 @@ public abstract class CobblerObject { * @return returns the red hat key as a string */ public Set getRedHatManagementKeySet() { - String[] sets =3D ((String) dataMap.get(REDHAT_KEY)).split(","); + String keys =3D StringUtils.defaultString(getRedHatManagementKey()= ); + String[] sets =3D (keys).split(","); Set set =3D new HashSet(); set.addAll(Arrays.asList(sets)); return set; --===============1232308821801025787==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:47 2015 Content-Type: multipart/mixed; boundary="===============6419919728973078802==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Wed, 24 Jun 2009 14:49:18 +0000 Message-ID: <20090624144918.0D8FD120263@lists.fedorahosted.org> --===============6419919728973078802== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/org/cobbler/CobblerObject.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 8721691ae0d6738c2e6d21838f238c512ac433b3 Author: Justin Sherrill Date: Wed Jun 24 10:48:02 2009 -0400 hopeflly fixing unit test diff --git a/java/code/src/org/cobbler/CobblerObject.java b/java/code/src/o= rg/cobbler/CobblerObject.java index 4c2e693..172fc18 100644 --- a/java/code/src/org/cobbler/CobblerObject.java +++ b/java/code/src/org/cobbler/CobblerObject.java @@ -477,7 +477,8 @@ public abstract class CobblerObject { * @return returns the red hat key as a string */ public Set getRedHatManagementKeySet() { - String[] sets =3D ((String) dataMap.get(REDHAT_KEY)).split(","); + String keys =3D StringUtils.defaultString(getRedHatManagementKey()= ); + String[] sets =3D (keys).split(","); Set set =3D new HashSet(); set.addAll(Arrays.asList(sets)); return set; --===============6419919728973078802==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:47 2015 Content-Type: multipart/mixed; boundary="===============6558925717758398181==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: 3 commits - spacewalk/config Date: Wed, 24 Jun 2009 16:18:17 +0000 Message-ID: <20090624161817.33402120263@lists.fedorahosted.org> --===============6558925717758398181== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/tomcat5/server.xml |= 394 ++++++++++ spacewalk/config/spacewalk-config.spec |= 5 = 2 files changed, 398 insertions(+), 1 deletion(-) New commits: commit 4d4c5de265176bc517e9d03d4a8df4cd56076919 Author: John Matthews Date: Wed Jun 24 12:12:16 2009 -0400 specfile update diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spac= ewalk-config.spec index c761a1b..8ade8ea 100644 --- a/spacewalk/config/spacewalk-config.spec +++ b/spacewalk/config/spacewalk-config.spec @@ -54,7 +54,6 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{prepdir}%{_sysconfdir}/tomcat5 -%config(noreplace) %{_sysconfdir}/tomcat5/server.xml %attr(0755,root,root) %{_sysconfdir}/rhn/satellite-httpd/conf/satidmap.pl %attr(0755,root,root) %{_sysconfdir}/rhn/satellite-httpd/conf/startup.pl %config(noreplace) %{_sysconfdir}/rhn/satellite-httpd/conf/rhn/rhn_monitor= ing.conf commit e9fefd8f5097f6f849b39753eba558983f4f2e81 Author: John Matthews Date: Wed Jun 24 12:01:12 2009 -0400 507679 - add server.xml to spacewalk-config package diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spac= ewalk-config.spec index 50c81ec..c761a1b 100644 --- a/spacewalk/config/spacewalk-config.spec +++ b/spacewalk/config/spacewalk-config.spec @@ -2,7 +2,7 @@ = Name: spacewalk-config Summary: Spacewalk Configuration -Version: 0.6.5 +Version: 0.6.6 Release: 1%{?dist} URL: http://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz @@ -54,6 +54,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{prepdir}%{_sysconfdir}/tomcat5 +%config(noreplace) %{_sysconfdir}/tomcat5/server.xml %attr(0755,root,root) %{_sysconfdir}/rhn/satellite-httpd/conf/satidmap.pl %attr(0755,root,root) %{_sysconfdir}/rhn/satellite-httpd/conf/startup.pl %config(noreplace) %{_sysconfdir}/rhn/satellite-httpd/conf/rhn/rhn_monitor= ing.conf @@ -114,6 +115,9 @@ fi = = %changelog +* Wed Jun 24 2009 John Matthews 0.6.6-1 +- 507679 - Added custom server.xml to force UTF8 encoding of GET parameter= s in tomcat + * Mon May 18 2009 Mike McCune 0.6.5-1 - 496104 - need to make the regexes for the rewrites a bit more flexible (mmccune(a)gmail.com) commit 24b60a9efdc5b9fcd5aab80a7bd6535be434c99e Author: John Matthews Date: Wed Jun 24 11:42:14 2009 -0400 507679 - Set URIEncoding to UTF-8 for tomcats server.xml config file Intent of this change is to force encoding of GET parameters to be in U= TF-8 This is the default server.xml from tomcat RPM with a change of URIEnco= ding=3D"UTF-8" added to the Connector elements. For background info reference: http://wiki.apache.org/tomcat/FAQ/Charac= terEncoding#Q2 diff --git a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/tomcat5/= server.xml b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/tomcat5/= server.xml new file mode 100644 index 0000000..e6ccb70 --- /dev/null +++ b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/tomcat5/server.= xml @@ -0,0 +1,394 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + = + + + + + + + + + + + + + + + = + = + + + + + + + + + + + + + + + + + + + + + + + + + + = + + = + = + + + + + + + + + + + + + + + + + + + --===============6558925717758398181==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:47 2015 Content-Type: multipart/mixed; boundary="===============7300583879543194580==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - spacewalk/config Date: Wed, 24 Jun 2009 16:22:27 +0000 Message-ID: <20090624162227.5D784120263@lists.fedorahosted.org> --===============7300583879543194580== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/tomcat5/server.xml |= 394 ++++++++++ 1 file changed, 394 insertions(+) New commits: commit b0d90ccfcb4298fbc5e8aced5231a7fd390945dc Author: John Matthews Date: Wed Jun 24 11:42:14 2009 -0400 507679 - Set URIEncoding to UTF-8 for tomcats server.xml config file Intent of this change is to force encoding of GET parameters to be in U= TF-8 This is the default server.xml from tomcat RPM with a change of URIEnco= ding=3D"UTF-8" added to the Connector elements. For background info reference: http://wiki.apache.org/tomcat/FAQ/Charac= terEncoding#Q2 diff --git a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/tomcat5/= server.xml b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/tomcat5/= server.xml new file mode 100644 index 0000000..e6ccb70 --- /dev/null +++ b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/tomcat5/server.= xml @@ -0,0 +1,394 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + = + + + + + + + + + + + + + + + = + = + + + + + + + + + + + + + + + + + + + + + + + + + + = + + = + = + + + + + + + + + + + + + + + + + + + --===============7300583879543194580==-- From partha at fedoraproject.org Thu Aug 20 11:57:47 2015 Content-Type: multipart/mixed; boundary="===============7551956864352835472==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Wed, 24 Jun 2009 16:34:42 +0000 Message-ID: <20090624163442.D114C120263@lists.fedorahosted.org> --===============7551956864352835472== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/conf/Config.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 72a7c0fd5148ccc994065f9b9ad9d7408bb5223b Author: Partha Aji Date: Wed Jun 24 12:36:31 2009 -0400 507888 - Set the default virt mem value to 512 instead of 256 = Apparently thats the minimum requirement. diff --git a/java/code/src/com/redhat/rhn/common/conf/Config.java b/java/co= de/src/com/redhat/rhn/common/conf/Config.java index 13fe9c3..ad40462 100644 --- a/java/code/src/com/redhat/rhn/common/conf/Config.java +++ b/java/code/src/com/redhat/rhn/common/conf/Config.java @@ -807,7 +807,7 @@ public class Config { * @return the memory size */ public int getDefaultVirtMemorySize() { - return getInt(VIRT_MEM, 256); + return getInt(VIRT_MEM, 512); } = /** --===============7551956864352835472==-- From partha at fedoraproject.org Thu Aug 20 11:57:47 2015 Content-Type: multipart/mixed; boundary="===============1628233606929773297==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Wed, 24 Jun 2009 16:37:07 +0000 Message-ID: <20090624163707.A7844120263@lists.fedorahosted.org> --===============1628233606929773297== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/conf/Config.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d2ed48aa33c2308209556cc0aad1fc2e890f6aeb Author: Partha Aji Date: Wed Jun 24 12:36:31 2009 -0400 507888 - Set the default virt mem value to 512 instead of 256 = Apparently thats the minimum requirement. diff --git a/java/code/src/com/redhat/rhn/common/conf/Config.java b/java/co= de/src/com/redhat/rhn/common/conf/Config.java index 13fe9c3..ad40462 100644 --- a/java/code/src/com/redhat/rhn/common/conf/Config.java +++ b/java/code/src/com/redhat/rhn/common/conf/Config.java @@ -807,7 +807,7 @@ public class Config { * @return the memory size */ public int getDefaultVirtMemorySize() { - return getInt(VIRT_MEM, 256); + return getInt(VIRT_MEM, 512); } = /** --===============1628233606929773297==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:47 2015 Content-Type: multipart/mixed; boundary="===============5753500949279003304==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - backend/server Date: Wed, 24 Jun 2009 16:41:37 +0000 Message-ID: <20090624164137.089ED120263@lists.fedorahosted.org> --===============5753500949279003304== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/importlib/packageImport.py | 3 +++ 1 file changed, 3 insertions(+) New commits: commit 8adaf8ad06d1368c9cc75d5aa499c392f29cf423 Author: Pradeep Kilambi Date: Wed Jun 24 12:41:25 2009 -0400 507867 - Schedule repo gen once the channel package associations is com= plete diff --git a/backend/server/importlib/packageImport.py b/backend/server/imp= ortlib/packageImport.py index 90ba02e..e1f84c6 100644 --- a/backend/server/importlib/packageImport.py +++ b/backend/server/importlib/packageImport.py @@ -121,6 +121,9 @@ class ChannelPackageSubscription(GenericPackageImport): self.compute_affected_channels(affected_channels) self.backend.update_newest_package_cache(caller=3Dself.caller, = affected_channels=3Dself.affected_channel_packages) + # Now that channel is updated, schedule the repo generation + taskomatic.add_to_repodata_queue_for_channel_package_subscription( + self.affected_channels, self.batch, self.caller) self.backend.commit() = def compute_affected_channels(self, affected_channels): --===============5753500949279003304==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:47 2015 Content-Type: multipart/mixed; boundary="===============1148517786327276688==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: backend/server Date: Wed, 24 Jun 2009 16:42:15 +0000 Message-ID: <20090624164215.55CB9120263@lists.fedorahosted.org> --===============1148517786327276688== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/importlib/packageImport.py | 3 +++ 1 file changed, 3 insertions(+) New commits: commit d0796a84441c62c199107552b7c8e9a2ce456ce8 Author: Pradeep Kilambi Date: Wed Jun 24 12:41:25 2009 -0400 507867 - Schedule repo gen once the channel package associations is com= plete diff --git a/backend/server/importlib/packageImport.py b/backend/server/imp= ortlib/packageImport.py index 90ba02e..e1f84c6 100644 --- a/backend/server/importlib/packageImport.py +++ b/backend/server/importlib/packageImport.py @@ -121,6 +121,9 @@ class ChannelPackageSubscription(GenericPackageImport): self.compute_affected_channels(affected_channels) self.backend.update_newest_package_cache(caller=3Dself.caller, = affected_channels=3Dself.affected_channel_packages) + # Now that channel is updated, schedule the repo generation + taskomatic.add_to_repodata_queue_for_channel_package_subscription( + self.affected_channels, self.batch, self.caller) self.backend.commit() = def compute_affected_channels(self, affected_channels): --===============1148517786327276688==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:47 2015 Content-Type: multipart/mixed; boundary="===============3576006205056920244==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Wed, 24 Jun 2009 16:55:30 +0000 Message-ID: <20090624165530.B0E97120263@lists.fedorahosted.org> --===============3576006205056920244== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsEditAc= tion.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f86dde69077d807952fb2d69f543277753f0f301 Author: Justin Sherrill Date: Wed Jun 24 12:56:14 2009 -0400 507863 - fixing issue where enabling remote commands would not be saved diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemD= etailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickst= art/SystemDetailsEditAction.java index 7749f7a..422b999 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsE= ditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsE= ditAction.java @@ -275,7 +275,7 @@ public class SystemDetailsEditAction extends RhnAction { SystemDetailsCommand command) { command.enableConfigManagement(BooleanUtils.toBoolean(form .getString("configManagement"))); - command.enableConfigManagement(BooleanUtils.toBoolean(form + command.enableRemoteCommands(BooleanUtils.toBoolean(form .getString("remoteCommands"))); = } --===============3576006205056920244==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:47 2015 Content-Type: multipart/mixed; boundary="===============7308288868188662899==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Wed, 24 Jun 2009 16:56:44 +0000 Message-ID: <20090624165644.841B2120263@lists.fedorahosted.org> --===============7308288868188662899== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsEditAc= tion.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bff7525533287be3f0dff9b3fa0c75ca88c688bb Author: Justin Sherrill Date: Wed Jun 24 12:56:14 2009 -0400 507863 - fixing issue where enabling remote commands would not be saved diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemD= etailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickst= art/SystemDetailsEditAction.java index 7749f7a..422b999 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsE= ditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsE= ditAction.java @@ -275,7 +275,7 @@ public class SystemDetailsEditAction extends RhnAction { SystemDetailsCommand command) { command.enableConfigManagement(BooleanUtils.toBoolean(form .getString("configManagement"))); - command.enableConfigManagement(BooleanUtils.toBoolean(form + command.enableRemoteCommands(BooleanUtils.toBoolean(form .getString("remoteCommands"))); = } --===============7308288868188662899==-- From partha at fedoraproject.org Thu Aug 20 11:57:47 2015 Content-Type: multipart/mixed; boundary="===============8882159828574279843==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Wed, 24 Jun 2009 19:13:47 +0000 Message-ID: <20090624191347.E6350120263@lists.fedorahosted.org> --===============8882159828574279843== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.ja= va | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 94b95df77f53a9fe2e1d48113ba75d2ad8a9db20 Author: Partha Aji Date: Wed Jun 24 14:04:37 2009 -0400 507862 - Fixed an ise that occured when config deploy was selected on a= profile diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSchedu= leCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSc= heduleCommand.java index 27ddc0b..07ad6c1 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java @@ -904,9 +904,9 @@ public class KickstartScheduleCommand extends BaseSyste= mOperation { // Now create ActivationKey ActivationKey key =3D ActivationKeyManager.getInstance(). createNewReActivationKey(creator, server, = note, session); + key.addEntitlement(ServerConstants.getServerGroupTypeProvisioningE= ntitled()); key.setDeployConfigs(deployConfigs); key.setUsageLimit(usageLimit); - key.addEntitlement(ServerConstants.getServerGroupTypeProvisioningE= ntitled()); if (KickstartVirtualizationType.paraHost(). equals(ksdata.getKickstartDefaults().getVirtualizationType= ())) { //we'll have to setup the key for virt --===============8882159828574279843==-- From partha at fedoraproject.org Thu Aug 20 11:57:47 2015 Content-Type: multipart/mixed; boundary="===============7300055537219513386==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Wed, 24 Jun 2009 19:14:59 +0000 Message-ID: <20090624191459.553F9120263@lists.fedorahosted.org> --===============7300055537219513386== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.ja= va | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 24dd150022d81e1e4c767f26cbff0120ce6db64c Author: Partha Aji Date: Wed Jun 24 14:04:37 2009 -0400 507862 - Fixed an ise that occured when config deploy was selected on a= profile diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSchedu= leCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSc= heduleCommand.java index 27ddc0b..07ad6c1 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java @@ -904,9 +904,9 @@ public class KickstartScheduleCommand extends BaseSyste= mOperation { // Now create ActivationKey ActivationKey key =3D ActivationKeyManager.getInstance(). createNewReActivationKey(creator, server, = note, session); + key.addEntitlement(ServerConstants.getServerGroupTypeProvisioningE= ntitled()); key.setDeployConfigs(deployConfigs); key.setUsageLimit(usageLimit); - key.addEntitlement(ServerConstants.getServerGroupTypeProvisioningE= ntitled()); if (KickstartVirtualizationType.paraHost(). equals(ksdata.getKickstartDefaults().getVirtualizationType= ())) { //we'll have to setup the key for virt --===============7300055537219513386==-- From shughes at fedoraproject.org Thu Aug 20 11:57:47 2015 Content-Type: multipart/mixed; boundary="===============1036038696483753207==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Wed, 24 Jun 2009 20:25:10 +0000 Message-ID: <20090624202510.6740C120263@lists.fedorahosted.org> --===============1036038696483753207== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java | 1= 1 +++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) New commits: commit 83d060e4b3a9ee48a9d113210075ec2fd50000f9 Author: Shannon Hughes Date: Wed Jun 24 16:16:57 2009 -0400 507533 - added catch around unhandled exception for pkg in mutiple chan= nels diff --git a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManage= r.java b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.ja= va index ded9c09..8467e61 100644 --- a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java +++ b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java @@ -39,6 +39,7 @@ import com.redhat.rhn.domain.token.ActivationKey; import com.redhat.rhn.domain.token.ActivationKeyFactory; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.channel.ChannelManager; +import com.redhat.rhn.manager.channel.MultipleChannelsWithPackageException; import com.redhat.rhn.manager.entitlement.EntitlementManager; import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper; import com.redhat.rhn.manager.rhnpackage.PackageManager; @@ -497,8 +498,16 @@ public class ActivationKeyManager { //we know its the channel we want if it has the rhncfg package= in it. Long bcid =3D key.getBaseChannel().getId(); log.debug("found basechannel: " + bcid); - Long cid =3D ChannelManager.findChildChannelWithPackage(key.ge= tOrg(), bcid, + Long cid; + try { + cid =3D ChannelManager.findChildChannelWithPackage(key.getOr= g(), bcid, packageName); + } + catch (MultipleChannelsWithPackageException mcwpe) { + log.debug("can not subscribe due to multiple channels have= package " + + packageName); + return false; + } if (cid =3D=3D null) { // Didnt find it .. log.debug("didnt find a child channel with the package."); return false; --===============1036038696483753207==-- From shughes at fedoraproject.org Thu Aug 20 11:57:47 2015 Content-Type: multipart/mixed; boundary="===============3854444327173559541==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Wed, 24 Jun 2009 20:25:59 +0000 Message-ID: <20090624202559.035B6120263@lists.fedorahosted.org> --===============3854444327173559541== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java | 1= 1 +++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) New commits: commit 745c85659592f1fa395be230645749ef7f76f9a8 Author: Shannon Hughes Date: Wed Jun 24 16:16:57 2009 -0400 507533 - added catch around unhandled exception for pkg in mutiple chan= nels diff --git a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManage= r.java b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.ja= va index ded9c09..8467e61 100644 --- a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java +++ b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java @@ -39,6 +39,7 @@ import com.redhat.rhn.domain.token.ActivationKey; import com.redhat.rhn.domain.token.ActivationKeyFactory; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.channel.ChannelManager; +import com.redhat.rhn.manager.channel.MultipleChannelsWithPackageException; import com.redhat.rhn.manager.entitlement.EntitlementManager; import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper; import com.redhat.rhn.manager.rhnpackage.PackageManager; @@ -497,8 +498,16 @@ public class ActivationKeyManager { //we know its the channel we want if it has the rhncfg package= in it. Long bcid =3D key.getBaseChannel().getId(); log.debug("found basechannel: " + bcid); - Long cid =3D ChannelManager.findChildChannelWithPackage(key.ge= tOrg(), bcid, + Long cid; + try { + cid =3D ChannelManager.findChildChannelWithPackage(key.getOr= g(), bcid, packageName); + } + catch (MultipleChannelsWithPackageException mcwpe) { + log.debug("can not subscribe due to multiple channels have= package " + + packageName); + return false; + } if (cid =3D=3D null) { // Didnt find it .. log.debug("didnt find a child channel with the package."); return false; --===============3854444327173559541==-- From partha at fedoraproject.org Thu Aug 20 11:57:47 2015 Content-Type: multipart/mixed; boundary="===============0433432773129363447==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Wed, 24 Jun 2009 20:41:51 +0000 Message-ID: <20090624204151.12B5112033B@lists.fedorahosted.org> --===============0433432773129363447== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java | = 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 770422a0c1bfa0edeb27692020a7a10ea1b4b81c Author: Partha Aji Date: Wed Jun 24 16:42:53 2009 -0400 492206 - Fixed kickstart template error = Basically the url in the case of a cobbler error was pointing to the wrong page.. diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManage= r.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.ja= va index 042b697..255769c 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java @@ -74,7 +74,7 @@ public class KickstartManager extends BaseManager { String text =3D renderKickstart(ksdata); if (text.contains("Traceback (most recent call last):")) { ValidatorException.raiseException("kickstart.jsp.error.tem= plate_generation", - KickstartUrlHelper.getCobblerProfileUrl(ksdata)); + KickstartUrlHelper.getFileDowloadPageUrl(ksdata)); } } catch (DownloadException de) { --===============0433432773129363447==-- From partha at fedoraproject.org Thu Aug 20 11:57:47 2015 Content-Type: multipart/mixed; boundary="===============6311192654653984994==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Wed, 24 Jun 2009 20:43:19 +0000 Message-ID: <20090624204319.8EE08120263@lists.fedorahosted.org> --===============6311192654653984994== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java | = 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6c1cd48560b5ce0232f444659523053dbdf5d09a Author: Partha Aji Date: Wed Jun 24 16:42:53 2009 -0400 492206 - Fixed kickstart template error = Basically the url in the case of a cobbler error was pointing to the wrong page.. diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManage= r.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.ja= va index 042b697..255769c 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java @@ -74,7 +74,7 @@ public class KickstartManager extends BaseManager { String text =3D renderKickstart(ksdata); if (text.contains("Traceback (most recent call last):")) { ValidatorException.raiseException("kickstart.jsp.error.tem= plate_generation", - KickstartUrlHelper.getCobblerProfileUrl(ksdata)); + KickstartUrlHelper.getFileDowloadPageUrl(ksdata)); } } catch (DownloadException de) { --===============6311192654653984994==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:47 2015 Content-Type: multipart/mixed; boundary="===============6033757111829732428==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: rel-eng/packages spacewalk/config Date: Wed, 24 Jun 2009 22:01:21 +0000 Message-ID: <20090624220121.65A76120263@lists.fedorahosted.org> --===============6033757111829732428== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/spacewalk-config | 2 +- spacewalk/config/spacewalk-config.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 6dc44f2b58f00afcf70e1675b52f5d1e9d712174 Author: John Matthews Date: Wed Jun 24 17:56:02 2009 -0400 Automatic commit of package [spacewalk-config] release [0.6.7-1]. diff --git a/rel-eng/packages/spacewalk-config b/rel-eng/packages/spacewalk= -config index 9414473..2f739b8 100644 --- a/rel-eng/packages/spacewalk-config +++ b/rel-eng/packages/spacewalk-config @@ -1 +1 @@ -0.6.5-1 spacewalk/config/ +0.6.7-1 spacewalk/config/ diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spac= ewalk-config.spec index 8ade8ea..0e42c3b 100644 --- a/spacewalk/config/spacewalk-config.spec +++ b/spacewalk/config/spacewalk-config.spec @@ -2,7 +2,7 @@ = Name: spacewalk-config Summary: Spacewalk Configuration -Version: 0.6.6 +Version: 0.6.7 Release: 1%{?dist} URL: http://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz @@ -114,7 +114,7 @@ fi = = %changelog -* Wed Jun 24 2009 John Matthews 0.6.6-1 +* Wed Jun 24 2009 John Matthews 0.6.7-1 - 507679 - Added custom server.xml to force UTF8 encoding of GET parameter= s in tomcat = * Mon May 18 2009 Mike McCune 0.6.5-1 --===============6033757111829732428==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:47 2015 Content-Type: multipart/mixed; boundary="===============0342133899331332770==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-config-0.6.7-1' Date: Wed, 24 Jun 2009 22:01:26 +0000 Message-ID: <20090624220126.95F821202FD@lists.fedorahosted.org> --===============0342133899331332770== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-config-0.6.7-1' created by John Matthews at 2009-06-24 21:56 +0000 Tagging package [spacewalk-config] version [0.6.7-1] in directory [spacewal= k/config/]. Changes since spacewalk-proxy-installer-0.6.16-1: Devan Goodwin (3): First cut of a unit test framework for Python backend. Integrate some PostgreSQL rhnSQL driver unit tests. Update HACKING file for backend test instructions. John Matthews (4): 507679 - Set URIEncoding to UTF-8 for tomcats server.xml config file 507679 - add server.xml to spacewalk-config package specfile update Automatic commit of package [spacewalk-config] release [0.6.7-1]. Justin Sherrill (2): hopeflly fixing unit test 507863 - fixing issue where enabling remote commands would not be sav= ed Milan Zazrivec (2): remove extraneous backslash characters no in-place editing of /etc/oratab under oracle user Partha Aji (5): 506702 - Converted probe details page to use the new list to get the = correct csv Fixed a unit test 507888 - Set the default virt mem value to 512 instead of 256 507862 - Fixed an ise that occured when config deploy was selected on= a profile 492206 - Fixed kickstart template error Pradeep Kilambi (3): 507593 - fixing eus registration tracebacks 505680 - channel_product_id is computed based on the name, product an= d version so it will not match the cache as cache is always None. Also dont= update the channel_product_id uless the id is different from whats being u= pdated 507867 - Schedule repo gen once the channel package associations is c= omplete Shannon Hughes (1): 507533 - added catch around unhandled exception for pkg in mutiple ch= annels Tomas Lestach (1): 490783 - preventing to read a config file, that must not exist --- backend/HACKING = | 10 = backend/common/rhnLib.py = | 16 = backend/server/handlers/xmlrpc/__init__.py = | 1 = backend/server/importlib/backend.py = | 3 = backend/server/importlib/packageImport.py = | 3 = backend/server/rhnChannel.py = | 1 = backend/server/rhnSession.py = | 3 = backend/test/non-unit/server/rhnSQL/dbtests.py = | 200 +++++ backend/test/suites/dbtests.py = | 200 ----- backend/test/suites/rhnsqltests.py = | 71 - backend/test/test_query1.py = | 23 = backend/test/unit/spacewalk/test/common/rhnLib-tests.py = | 36 = backend/test/unit/spacewalk/test/server/rhnsql-tests.py = | 63 + backend/test/unit/spacewalk/test/setpath.py = | 31 = java/code/src/com/redhat/rhn/common/conf/Config.java = | 2 = java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsEditAc= tion.java | 2 = java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDetai= lsAction.java | 17 = java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/Probe= DetailsActionTest.java | 5 = java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java = | 2 = java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.ja= va | 2 = java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java = | 11 = java/code/src/org/cobbler/CobblerObject.java = | 3 = java/code/webapp/WEB-INF/pages/systems/probes/details.jsp = | 36 = monitoring/SatConfig/cluster/SatCluster.pm = | 18 = rel-eng/packages/spacewalk-config = | 2 = spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/tomcat5/server.xml = | 394 ++++++++++ spacewalk/config/spacewalk-config.spec = | 5 = spacewalk/setup/lib/Spacewalk/Setup.pm = | 6 = spacewalk/setup/share/oracle/upgrade-db-10g.sh = | 3 = spacewalk/setup/share/oracle/upgrade-db.sh = | 3 = 30 files changed, 820 insertions(+), 352 deletions(-) --- --===============0342133899331332770==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:47 2015 Content-Type: multipart/mixed; boundary="===============0413568315712850993==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'sha256-support' - schema/spacewalk Date: Wed, 24 Jun 2009 22:04:03 +0000 Message-ID: <20090624220403.AE355120263@lists.fedorahosted.org> --===============0413568315712850993== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable schema/spacewalk/rhnsat/tables/rhnPackageChecksum.sql | 25 +++++++++----= ----- 1 file changed, 13 insertions(+), 12 deletions(-) New commits: commit 2961816197ba1417eb6ffaa485ae4ddf1f4f4a37 Author: Pradeep Kilambi Date: Wed Jun 24 18:03:55 2009 -0400 design changes to rhnPackageChecksum diff --git a/schema/spacewalk/rhnsat/tables/rhnPackageChecksum.sql b/schema= /spacewalk/rhnsat/tables/rhnPackageChecksum.sql index 65b79df..cc4b1e3 100644 --- a/schema/spacewalk/rhnsat/tables/rhnPackageChecksum.sql +++ b/schema/spacewalk/rhnsat/tables/rhnPackageChecksum.sql @@ -20,23 +20,24 @@ create table rhnPackageChecksum ( - id number - constraint rhn_pkgchecksum_type_id_nn not null, - name varchar2(128) - constraint rhn_pkgchecksum_type_name_nn not null + package_id number + constraint rhn_pkgcs_nn not null + constraint rhn_pkgcs_id_fk + references rhnPackage(id), + md5sum varchar2(64) + constraint rhn_pkgcs_md5_nn not null, + sha256 varchar2(128) + constraint rhn_pkgcs_sha256_nn not null ) enable row movement ; = -create sequence rhn_package_checksum_id_seq start with 100; = +create index rhn_pkg_id_n_idx + on rhnPackageChecksum (package_id, md5sum, sha256) + tablespace [[64k_tbs]]; = -create index rhn_pkg_checksum_id_n_idx - on rhnPackageChecksum (id, name ) - tablespace [[64k_tbs]] - ; - -alter table rhnPackageChecksum add constraint rhn_pkg_checksum_id_pk prima= ry key (id); -alter table rhnPackageChecksum add constraint rhn_pkg_checksum_name_uq uni= que ( name ); +alter table rhnPackageChecksum add constraint rhn_pkgcs_id_pk primary key = ( package_id); +alter table rhnPackageChecksum add constraint rhn_pkgcs_id_uq unique ( pac= kage_id, md5sum, sha256 ); = -- -- Revision 1.1 2009/06/19 00:37:16 pkilambi --===============0413568315712850993==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:47 2015 Content-Type: multipart/mixed; boundary="===============6990546901505931113==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'sha256-support' - schema/spacewalk Date: Wed, 24 Jun 2009 22:06:22 +0000 Message-ID: <20090624220623.1AD91120263@lists.fedorahosted.org> --===============6990546901505931113== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/124-= rhnPackageChecksum.sql | 27 ++++------ 1 file changed, 13 insertions(+), 14 deletions(-) New commits: commit 4d355b80dada1e0eecfebcb0350c73fcc1d05a3d Author: Pradeep Kilambi Date: Wed Jun 24 18:06:14 2009 -0400 upgrade chnages to packageChecksum table diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-sch= ema-0.6/124-rhnPackageChecksum.sql b/schema/spacewalk/upgrade/spacewalk-sch= ema-0.5-to-spacewalk-schema-0.6/124-rhnPackageChecksum.sql index 1d870ce..f09ab87 100644 --- a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6= /124-rhnPackageChecksum.sql +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6= /124-rhnPackageChecksum.sql @@ -1,27 +1,26 @@ --- -- The types of checksum associated with a package... md5sum, sha1, sha256= ...? --- = create table rhnPackageChecksum ( - id number - constraint rhn_pkgchecksum_type_id_nn not null, - name varchar2(128) - constraint rhn_pkgchecksum_type_name_nn not null + package_id number + constraint rhn_pkgcs_nn not null + constraint rhn_pkgcs_id_fk + references rhnPackage(id), + md5sum varchar2(64) + constraint rhn_pkgcs_md5_nn not null, + sha256 varchar2(128) + constraint rhn_pkgcs_sha256_nn not null ) enable row movement ; = -create sequence rhn_package_checksum_id_seq start with 100; = - -create index rhn_pkg_checksum_id_n_idx - on rhnPackageChecksum (id, name ) - tablespace [[64k_tbs]] - ; +create index rhn_pkg_id_n_idx + on rhnPackageChecksum (package_id, md5sum, sha256) + tablespace [[64k_tbs]]; = -alter table rhnPackageChecksum add constraint rhn_pkg_checksum_id_pk prima= ry key (id); -alter table rhnPackageChecksum add constraint rhn_pkg_checksum_name_uq uni= que ( name ); +alter table rhnPackageChecksum add constraint rhn_pkgcs_id_pk primary key = ( package_id); +alter table rhnPackageChecksum add constraint rhn_pkgcs_id_uq unique ( pac= kage_id, md5sum, sha256 ); = -- -- Revision 1.1 2009/06/19 00:37:16 pkilambi --===============6990546901505931113==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:47 2015 Content-Type: multipart/mixed; boundary="===============8752516077857855127==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'sha256-support' - schema/spacewalk Date: Wed, 24 Jun 2009 22:07:59 +0000 Message-ID: <20090624220759.A16F7120263@lists.fedorahosted.org> --===============8752516077857855127== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable schema/spacewalk/rhnsat/tables/rhnPackageChecksum_data.sql = | 12 ---------- schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/125-= rhnPackageChecksum_data.sql | 12 ---------- 2 files changed, 24 deletions(-) New commits: commit bca0b3133bd6d870af736966ecfd6259367be0ed Author: Pradeep Kilambi Date: Wed Jun 24 18:07:52 2009 -0400 remove the data file diff --git a/schema/spacewalk/rhnsat/tables/rhnPackageChecksum_data.sql b/s= chema/spacewalk/rhnsat/tables/rhnPackageChecksum_data.sql deleted file mode 100644 index b0bff7e..0000000 --- a/schema/spacewalk/rhnsat/tables/rhnPackageChecksum_data.sql +++ /dev/null @@ -1,12 +0,0 @@ -insert into rhnPackageChecksum (id, name) values -(rhn_package_checksum_id_seq.nextval, 'md5' ); -insert into rhnPackageChecksum (id, name) values -(rhn_package_checksum_id_seq.nextval, 'sha1' ); -insert into rhnPackageChecksum (id, name) values -(rhn_package_checksum_id_seq.nextval, 'sha224' ); -insert into rhnPackageChecksum (id, name) values -(rhn_package_checksum_id_seq.nextval, 'sha256' ); -insert into rhnPackageChecksum (id, name) values -(rhn_package_checksum_id_seq.nextval, 'sha384' ); -insert into rhnPackageChecksum (id, name) values -(rhn_package_checksum_id_seq.nextval, 'sha512' ); diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-sch= ema-0.6/125-rhnPackageChecksum_data.sql b/schema/spacewalk/upgrade/spacewal= k-schema-0.5-to-spacewalk-schema-0.6/125-rhnPackageChecksum_data.sql deleted file mode 100644 index b0bff7e..0000000 --- a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6= /125-rhnPackageChecksum_data.sql +++ /dev/null @@ -1,12 +0,0 @@ -insert into rhnPackageChecksum (id, name) values -(rhn_package_checksum_id_seq.nextval, 'md5' ); -insert into rhnPackageChecksum (id, name) values -(rhn_package_checksum_id_seq.nextval, 'sha1' ); -insert into rhnPackageChecksum (id, name) values -(rhn_package_checksum_id_seq.nextval, 'sha224' ); -insert into rhnPackageChecksum (id, name) values -(rhn_package_checksum_id_seq.nextval, 'sha256' ); -insert into rhnPackageChecksum (id, name) values -(rhn_package_checksum_id_seq.nextval, 'sha384' ); -insert into rhnPackageChecksum (id, name) values -(rhn_package_checksum_id_seq.nextval, 'sha512' ); --===============8752516077857855127==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:47 2015 Content-Type: multipart/mixed; boundary="===============8712348120530785613==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'sha256-support' - schema/spacewalk Date: Wed, 24 Jun 2009 22:09:30 +0000 Message-ID: <20090624220930.A6E31120263@lists.fedorahosted.org> --===============8712348120530785613== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/126-= rhnpackage_checksum.sql | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) New commits: commit 88c8cb968530d2a787bf26f375f3f61c6dba580b Author: Pradeep Kilambi Date: Wed Jun 24 18:09:25 2009 -0400 fix the rhnpackage upgrade diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-sch= ema-0.6/126-rhnpackage_checksum.sql b/schema/spacewalk/upgrade/spacewalk-sc= hema-0.5-to-spacewalk-schema-0.6/126-rhnpackage_checksum.sql index 7ef455a..7eff471 100644 --- a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6= /126-rhnpackage_checksum.sql +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6= /126-rhnpackage_checksum.sql @@ -1,10 +1,5 @@ = -alter table rhnPackage rename column md5sum TO checksum; - -alter table rhnPackage - add checksum_id number -constraint rhn_pkg_checksum_id_fk - references rhnPackageChecksum(id); +alter table rhnPackage drop column md5sum; = show errors = --===============8712348120530785613==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:48 2015 Content-Type: multipart/mixed; boundary="===============4369620439347190439==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'sha256-support' - schema/spacewalk Date: Wed, 24 Jun 2009 22:26:32 +0000 Message-ID: <20090624222633.58F79120263@lists.fedorahosted.org> --===============4369620439347190439== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable schema/spacewalk/rhnsat/tables/rhnPackage.sql | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) New commits: commit 1732846e2e612e47ef5daf80dad6d90e73b9855b Author: Pradeep Kilambi Date: Wed Jun 24 18:26:24 2009 -0400 Since md5sum is part of unique constraint in rhnPackage table, adding s= ha256 to rhnPackage table itself. diff --git a/schema/spacewalk/rhnsat/tables/rhnPackage.sql b/schema/spacewa= lk/rhnsat/tables/rhnPackage.sql index 8e8b02e..96e2741 100644 --- a/schema/spacewalk/rhnsat/tables/rhnPackage.sql +++ b/schema/spacewalk/rhnsat/tables/rhnPackage.sql @@ -54,11 +54,10 @@ rhnPackage source_rpm_id number constraint rhn_package_srcrpmid_fk references rhnSourceRPM(id), - checksum varchar2(64) + md5sum varchar2(64) constraint rhn_package_md5_nn not null, - checksum_id number - constraint rhn_pkg_checksum_id_fk - references rhnPackageChecksum(id), + sha256 varchar2(256) + constraint rhn_package_sha256_nn not null, vendor varchar2(64) constraint rhn_package_vendor_nn not null, payload_format varchar2(32), @@ -89,7 +88,7 @@ rhnPackage create sequence rhn_package_id_seq; = create unique index rhn_package_md5_oid_uq - on rhnPackage(checksum, org_id) + on rhnPackage(md5sum, org_id) tablespace [[2m_tbs]] ; = --===============4369620439347190439==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:48 2015 Content-Type: multipart/mixed; boundary="===============1933632036272461654==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'sha256-support' - schema/spacewalk Date: Wed, 24 Jun 2009 22:32:58 +0000 Message-ID: <20090624223258.3BA92120263@lists.fedorahosted.org> --===============1933632036272461654== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/126-= rhnpackage_checksum.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 2111183bae70c7456e0b92577f85939db033dd27 Author: Pradeep Kilambi Date: Wed Jun 24 18:32:53 2009 -0400 upgrade changes to rhnPackage diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-sch= ema-0.6/126-rhnpackage_checksum.sql b/schema/spacewalk/upgrade/spacewalk-sc= hema-0.5-to-spacewalk-schema-0.6/126-rhnpackage_checksum.sql index 7eff471..b3a5ae1 100644 --- a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6= /126-rhnpackage_checksum.sql +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6= /126-rhnpackage_checksum.sql @@ -1,5 +1,6 @@ = -alter table rhnPackage drop column md5sum; +alter table rhnPackage add sha256 VARCHAR(128) +CONSTRAINT rhn_package_sha256_nn not null; = show errors = --===============1933632036272461654==-- From partha at fedoraproject.org Thu Aug 20 11:57:48 2015 Content-Type: multipart/mixed; boundary="===============5246636023418597528==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Thu, 25 Jun 2009 01:26:26 +0000 Message-ID: <20090625012626.1BE1F12033B@lists.fedorahosted.org> --===============5246636023418597528== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.ja= va | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) New commits: commit 0a04fd42044b2a05f777f9a6fd6136a6439880c7 Author: Partha Aji Date: Wed Jun 24 21:29:15 2009 -0400 Fix to make sure kernel param entries don;t get duplicated diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSchedu= leCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSc= heduleCommand.java index 07ad6c1..434b8f2 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java @@ -975,11 +975,7 @@ public class KickstartScheduleCommand extends BaseSyst= emOperation { // Get rid of the dhcp: String params =3D " ksdevice=3D" + staticDevice.substring( staticDevice.indexOf("dhcp:") + "dhcp:".length()); - if (!kOptions.contains("ksdevice=3Deth0")) { - retval.append(" ksdevice=3Deth0 "); - } - = - if (!kOptions.contains(params)) { + if (!kOptions.contains("ksdevice")) { retval.append(params); } staticDevice =3D ""; @@ -991,7 +987,7 @@ public class KickstartScheduleCommand extends BaseSyste= mOperation { = } else { - if (!kOptions.contains("ksdevice=3Deth0")) { + if (!kOptions.contains("ksdevice")) { retval.append("ksdevice=3Deth0"); } } --===============5246636023418597528==-- From partha at fedoraproject.org Thu Aug 20 11:57:48 2015 Content-Type: multipart/mixed; boundary="===============1569526600676407197==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Thu, 25 Jun 2009 01:28:52 +0000 Message-ID: <20090625012852.C1D9812033B@lists.fedorahosted.org> --===============1569526600676407197== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.ja= va | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) New commits: commit c9b7698d0c32beae01508691a19adfaa4f14ada7 Author: Partha Aji Date: Wed Jun 24 21:29:15 2009 -0400 Fix to make sure kernel param entries don;t get duplicated diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSchedu= leCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSc= heduleCommand.java index 07ad6c1..434b8f2 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleComma= nd.java @@ -975,11 +975,7 @@ public class KickstartScheduleCommand extends BaseSyst= emOperation { // Get rid of the dhcp: String params =3D " ksdevice=3D" + staticDevice.substring( staticDevice.indexOf("dhcp:") + "dhcp:".length()); - if (!kOptions.contains("ksdevice=3Deth0")) { - retval.append(" ksdevice=3Deth0 "); - } - = - if (!kOptions.contains(params)) { + if (!kOptions.contains("ksdevice")) { retval.append(params); } staticDevice =3D ""; @@ -991,7 +987,7 @@ public class KickstartScheduleCommand extends BaseSyste= mOperation { = } else { - if (!kOptions.contains("ksdevice=3Deth0")) { + if (!kOptions.contains("ksdevice")) { retval.append("ksdevice=3Deth0"); } } --===============1569526600676407197==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:48 2015 Content-Type: multipart/mixed; boundary="===============6865561773933049493==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: 15 commits - backend/common backend/satellite_tools backend/server proxy/proxy Date: Thu, 25 Jun 2009 11:17:46 +0000 Message-ID: <20090625111746.A5ACD1201ED@lists.fedorahosted.org> --===============6865561773933049493== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/common/rhnApache.py | 28 +-- backend/common/rhnRepository.py | 67 ++++---- backend/common/rhnTB.py | 34 ++-- backend/satellite_tools/disk_dumper/dumper.py | 56 +++---- backend/server/action/packages.py | 10 - backend/server/action/solarispkgs.py | 10 - backend/server/handlers/app/packages.py | 51 ++---- backend/server/handlers/xmlrpc/errata.py | 33 +--- backend/server/handlers/xmlrpc/getMethod.py | 11 - backend/server/handlers/xmlrpc/queue.py | 101 ++++++------- backend/server/handlers/xmlrpc/up2date.py | 198 +++++++++++++--------= ----- backend/server/rhnDependency.py | 130 ++++++++--------- proxy/proxy/broker/rhnRepository.py | 52 +++--- proxy/proxy/rhnShared.py | 8 - 14 files changed, 388 insertions(+), 401 deletions(-) New commits: commit 932b2a771f844b1b1920e9b17f6bec1202720797 Author: Miroslav Such=C3=BD Date: Wed Jun 24 11:44:38 2009 +0200 change comments to docstrings diff --git a/proxy/proxy/rhnShared.py b/proxy/proxy/rhnShared.py index 2ab73aa..9924917 100644 --- a/proxy/proxy/rhnShared.py +++ b/proxy/proxy/rhnShared.py @@ -167,7 +167,7 @@ class SharedHandler: return apply(conn_class, (), params) = def _parse_url(self, url): - # Returns scheme, host, port, path + """ Returns scheme, host, port, path. """ scheme, netloc, path, params, query, frag =3D rhnLib.parseUrl(url) host, port =3D urllib.splitnport(netloc) if (port <=3D 0): @@ -217,7 +217,7 @@ class SharedHandler: return self._handleServerResponse(status) = def _handleServerResponse(self, status): - """ This method can be overridden by subclasses who want to handle server + """ This method can be overridden by subclasses who want to handle= server responses in their own way. By default, we will wrap all the = headers up and send them back to the client with an error status. This m= ethod should return apache.OK if everything went according to plan. @@ -284,7 +284,7 @@ class SharedHandler: # --- PROTECTED METHODS --- = def _getHeaders(self, req): - #""" Copy the incoming headers. """ + """ Copy the incoming headers. """ = hdrs =3D UserDictCase() for k in req.headers_in.keys(): @@ -426,5 +426,3 @@ class SharedHandler: except IOError: buf =3D 0 = -#=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D - commit 007ddaa2a238f132cd785fe08764271de4b3b075 Author: Miroslav Such=C3=BD Date: Wed Jun 24 11:43:23 2009 +0200 change comments to docstrings diff --git a/proxy/proxy/broker/rhnRepository.py b/proxy/proxy/broker/rhnRe= pository.py index 61a676a..454518d 100644 --- a/proxy/proxy/broker/rhnRepository.py +++ b/proxy/proxy/broker/rhnRepository.py @@ -44,9 +44,7 @@ class NotLocalError(Exception): pass = = -# Class to access rhn-proxy's local package repository. class Repository(rhnRepository.Repository): - = """ Proxy local package repository lookup and manipulation code. """ = def __init__(self, @@ -82,10 +80,10 @@ class Repository(rhnRepository.Repository): # If the file name has parameters, it's a different kind of packag= e. # Determine the architecture requested so we can construct an = # appropriate filename. - if type(pkgFilename) =3D=3D types.ListType: + if type(pkgFilename) =3D=3D types.ListType: arch =3D pkgFilename[3] if isSolarisArch(arch): - pkgFilename =3D "%s-%s-%s.%s.pkg" % \ + pkgFilename =3D "%s-%s-%s.%s.pkg" % \ (pkgFilename[0], = pkgFilename[1], = pkgFilename[2], = @@ -151,15 +149,15 @@ class Repository(rhnRepository.Repository): return filePath = def _cacheObj(self, fileName, version, dataProducer, params=3DNone): - #""" The real workhorse for all flavors of listall - # It tries to pull data out of a file; if it doesn't work, - # it calls the data producer with the specified params to gener= ate - # the data, which is also cached. - # - # Returns a string from a cache file or, if the cache file is n= ot - # there, calls dataProducer to generate the object and caches t= he - # results - #""" + """ The real workhorse for all flavors of listall + It tries to pull data out of a file; if it doesn't work, + it calls the data producer with the specified params to genera= te + the data, which is also cached. + + Returns a string from a cache file or, if the cache file is not + there, calls dataProducer to generate the object and caches the + results + """ = log_debug(4, fileName, version, params) fileDir =3D self._getPkgListDir() @@ -182,12 +180,12 @@ class Repository(rhnRepository.Repository): return stringObject = def _getPkgListDir(self): - #""" Creates and returns the directory for cached lists of package= s. - # Used by _cacheObj. - # - # XXX: Problem exists here. If PKG_LIST_DIR can't be created - # due to ownership... this is bad... need to fix. - #""" + """ Creates and returns the directory for cached lists of packages. + Used by _cacheObj. + + XXX: Problem exists here. If PKG_LIST_DIR can't be created + due to ownership... this is bad... need to fix. + """ = log_debug(3, PKG_LIST_DIR) if not os.access(PKG_LIST_DIR, os.R_OK | os.X_OK): @@ -195,7 +193,7 @@ class Repository(rhnRepository.Repository): return PKG_LIST_DIR = def __channelPackageMapping(self): - #""" fetch package list on behalf of the client """ + """ fetch package list on behalf of the client """ = log_debug(6, self.rhnParentXMLRPC, self.httpProxy, self.httpProxyU= sername, self.httpProxyPassword) log_debug(6, self.clientInfo) @@ -233,7 +231,7 @@ def isSolarisArch(arch): return arch.find("solaris") !=3D -1 = def listPackages(function, channel, version): - #""" Generates a list of objects by calling the function """ + """ Generates a list of objects by calling the function """ = try: return function(channel, version) @@ -244,7 +242,7 @@ def listPackages(function, channel, version): = = def computePackagePath(nvrea, source=3D0, prepend=3D""): - # """ Finds the appropriate path, prepending something if necessary """ + """ Finds the appropriate path, prepending something if necessary """ = name =3D nvrea[0] release =3D nvrea[2] @@ -274,9 +272,9 @@ def computePackagePath(nvrea, source=3D0, prepend=3D""): # reg exp for splitting package names. re_rpmName =3D re.compile("^(.*)-([^-]*)-([^-]*)$") def parseRPMName(pkgName): - #""" IN: Package string in, n-n-n-v.v.v-r.r_r, format. - # OUT: Four strings (in a list): name, release, version, epoch. - #""" + """ IN: Package string in, n-n-n-v.v.v-r.r_r, format. + OUT: Four strings (in a list): name, release, version, epoch. + """ = reg =3D re_rpmName.match(pkgName) if reg =3D=3D None: @@ -292,7 +290,7 @@ def parseRPMName(pkgName): = = def cache(stringObject, dir, filename, version): - #""" Caches stringObject into a file and removes older files """ + """ Caches stringObject into a file and removes older files """ = # The directory should be readable, writable, seekable if not os.access(dir, os.R_OK | os.W_OK | os.X_OK): @@ -333,5 +331,3 @@ def cache(stringObject, dir, filename, version): # Older than this os.unlink(_file) = -#-------------------------------------------------------------------------= ------ - commit 9043974b2b4ff7966642f44e5f78afb37bedec6c Author: Miroslav Such=C3=BD Date: Wed Jun 24 11:38:14 2009 +0200 change comments to docstrings diff --git a/backend/server/handlers/xmlrpc/getMethod.py b/backend/server/h= andlers/xmlrpc/getMethod.py index 054a735..f8f1f16 100644 --- a/backend/server/handlers/xmlrpc/getMethod.py +++ b/backend/server/handlers/xmlrpc/getMethod.py @@ -32,9 +32,7 @@ class GetMethodException(Exception): = = def sanity(methodNameComps): - #""" - # Verifies if all the components have proper names - #""" + """ Verifies if all the components have proper names.""" # Allowed characters in each string alpha =3D string.lowercase + string.uppercase = allowedChars =3D alpha + string.digits + '_' @@ -52,10 +50,9 @@ def sanity(methodNameComps): = = def getMethod(methodName, abspath, baseClass): - #""" - #Retreive method given methodName, path to base of tree, and class/mod= ule - #route/label. - #""" + """ Retreive method given methodName, path to base of tree, and class/= module + route/label. + """ # First split the method name methodNameComps =3D string.split(baseClass, '.') + string.split(method= Name, '.') = # Sanity checks commit 7fa3e3364d8727e3345637e86cf3d18b6cdacfa8 Author: Miroslav Such=C3=BD Date: Wed Jun 24 11:36:38 2009 +0200 change comments to docstrings diff --git a/backend/server/rhnDependency.py b/backend/server/rhnDependency= .py index f728fbf..10585ed 100644 --- a/backend/server/rhnDependency.py +++ b/backend/server/rhnDependency.py @@ -299,8 +299,8 @@ class IncompleteLimitInfo(SolveDependenciesError): class MakeEvrError(SolveDependenciesError): pass = -# Now run one of those queries and return the results def __single_query(server_id, deps, query): + """ Now run one of those queries and return the results. """ ret =3D {} # first prepare the statement h =3D rhnSQL.prepare(query) @@ -310,8 +310,8 @@ def __single_query(server_id, deps, query): ret[dep] =3D map(lambda a: a[:4], data) return ret = -#Run one of the queries and return the results along with the arch. def __single_query_with_arch_and_id(server_id, deps, query): + """ Run one of the queries and return the results along with the arch.= """ ret =3D {} h =3D rhnSQL.prepare(query) for dep in deps: @@ -320,9 +320,10 @@ def __single_query_with_arch_and_id(server_id, deps, q= uery): ret[dep] =3D map(lambda a: a[:6], data) return ret = -# IN: 'e:name-version-release' or 'name-version-release:e' -# OUT: {'name':name, 'version':version, 'release':release, 'epoch':epoch } def make_evr(nvre): + """ IN: 'e:name-version-release' or 'name-version-release:e' + OUT: {'name':name, 'version':version, 'release':release, 'epoch':e= poch } + """ epoch =3D '' name =3D '' version =3D '' @@ -398,28 +399,26 @@ def find_by_files_all(server_id, deps): log_debug(4, server_id, deps) return __single_query(server_id, deps, __files_all_sql) = - - -#This version of solve_dependencies allows the caller to get all of the pa= ckages that solve a dependency and limit -#the packages that are returned to those that match the criteria defined b= y limit_operator and limit. This version -#of the function also returns the architecture label of the package[s] tha= t get returned. -# -#limit_operator can be any of: '<', '<=3D', '=3D=3D', '>=3D', or '>'. -#limit is a a string of the format [epoch:]name-version-release -#deps is a list of filenames that the packages that are returned must prov= ide. -#version is the version of the client that is calling the function. def solve_dependencies_with_limits(server_id, deps, version, all =3D 0, li= mit_operator=3DNone, limit =3D None): - - #Indexes for the tuple - #entry_index =3D 0 - #preference_index =3D 1 - - #Indexes for the list of package fields. - #name_index =3D 0 - #version_index =3D 1 - #release_index =3D 2 - #epoch_index =3D 3 - + """ This version of solve_dependencies allows the caller to get all of= the packages that solve a dependency and limit + the packages that are returned to those that match the criteria de= fined by limit_operator and limit. This version + of the function also returns the architecture label of the package= [s] that get returned. + + limit_operator can be any of: '<', '<=3D', '=3D=3D', '>=3D', or '>= '. + limit is a a string of the format [epoch:]name-version-release + deps is a list of filenames that the packages that are returned mu= st provide. + version is the version of the client that is calling the function. + + Indexes for the tuple + entry_index =3D 0 + preference_index =3D 1 + + Indexes for the list of package fields. + name_index =3D 0 + version_index =3D 1 + release_index =3D 2 + epoch_index =3D 3 + """ #Containers used while the packages get categorized, sorted, and filte= red. packages_all =3D {} package_list =3D [] @@ -562,27 +561,28 @@ def solve_dependencies_with_limits(server_id, deps, v= ersion, all =3D 0, limit_oper result.append(r) return result = -#Does the same thing as solve_dependencies, but also returns the architect= ure label with the package info. -#IN: = -# server_id :=3D id info of the server -# deps :=3D list of filenames that are needed by the caller -# version :=3D version of the client -# -#OUT: -# Dictionary with key values being the filnames in deps and the values b= eing a list of lists of package info. -# Example :=3D {'filename1' : [['name', 'version', 'release', 'epo= ch', 'architecture'], = -# ['name2', 'version2', 'release2', 'ep= och2', 'architecture2']]} = def solve_dependencies_arch(server_id, deps, version): - #Indexes for the tuple stored as the value in dict - #entry_index =3D 0 - #preference_index =3D 1 - - #indexes for the list nvre - #name_index =3D 0 - #version_index =3D 1 - #release_index =3D 2 - #epoch_index =3D 3 - = + """ Does the same thing as solve_dependencies, but also returns the ar= chitecture label with the package info. + IN: + server_id :=3D id info of the server + deps :=3D list of filenames that are needed by the caller + version :=3D version of the client + + OUT: + Dictionary with key values being the filnames in deps and the v= alues being a list of lists of package info. + Example :=3D {'filename1' : [['name', 'version', 'release= ', 'epoch', 'architecture'], + ['name2', 'version2', 'release= 2', 'epoch2', 'architecture2']]} + + Indexes for the tuple stored as the value in dict + entry_index =3D 0 + preference_index =3D 1 + + indexes for the list nvre + name_index =3D 0 + version_index =3D 1 + release_index =3D 2 + epoch_index =3D 3 + """ #list of the keys to the values in each row of the recordset. nvre =3D ['name', 'version', 'release', 'epoch', 'arch'] = @@ -666,17 +666,18 @@ def solve_dependencies_arch(server_id, deps, version): result.append(r) return result = -#the unchanged version of solve_dependencies. = -#IN: = -# server_id :=3D id info of the server -# deps :=3D list of filenames that are needed by the caller -# version :=3D version of the client -# -#OUT: -# Dictionary with key values being the filnames in deps and the values b= eing a list of lists of package info. -# Example :=3D {'filename1' : [['name', 'version', 'release', 'epo= ch'], = -# ['name2', 'version2', 'release2', 'ep= och2']]} = def solve_dependencies(server_id, deps, version): + """ The unchanged version of solve_dependencies. = + IN: = + server_id :=3D id info of the server + deps :=3D list of filenames that are needed by the caller + version :=3D version of the client + + OUT: + Dictionary with key values being the filnames in deps and the v= alues being a list of lists of package info. + Example :=3D {'filename1' : [['name', 'version', 'release= ', 'epoch'], = + ['name2', 'version2', 'release= 2', 'epoch2']]} = + """ # first, uniquify deps deplist =3D [] for dep in deps: @@ -749,10 +750,10 @@ def solve_dependencies(server_id, deps, version): = = = -#Intended to be passed to a list object's sort(). -#In: {'epoch': 'value', 'version':'value', 'release':'value'} def cmp_evr(pkg1, pkg2): - + """ Intended to be passed to a list object's sort(). + In: {'epoch': 'value', 'version':'value', 'release':'value'} + """ pkg1_epoch =3D pkg1['epoch'] pkg1_version =3D pkg1['version'] pkg1_release =3D pkg1['release'] @@ -774,13 +775,14 @@ def cmp_evr(pkg1, pkg2): return rpm.labelCompare((pkg1_epoch, pkg1_version, pkg1_release), (pkg2_epoch, pkg2_version, pkg2_release)) = -#Check to see if evr is within the limit. -#IN: evr =3D { 'epoch' : value, 'version':value, 'release':value } -# operator can be any of: '<', '<=3D', '=3D=3D', '>=3D', '>' -# limit =3D { 'epoch' : value, 'version':value, 'release':value } -#OUT: = -# 1 or 0 def test_evr(evr, operator, limit): + """ Check to see if evr is within the limit. + IN: evr =3D { 'epoch' : value, 'version':value, 'release':value } + operator can be any of: '<', '<=3D', '=3D=3D', '>=3D', '>' + limit =3D { 'epoch' : value, 'version':value, 'release':value } + OUT: = + 1 or 0 + """ good_operators =3D ['<', '<=3D', '=3D=3D', '>=3D', '>'] = if not operator in good_operators: commit d0045e977c5a286adb9628b1888224f369acef35 Author: Miroslav Such=C3=BD Date: Wed Jun 24 11:28:45 2009 +0200 change comments to docstrings diff --git a/backend/server/handlers/xmlrpc/up2date.py b/backend/server/han= dlers/xmlrpc/up2date.py index 5dbc832..d09e5c0 100644 --- a/backend/server/handlers/xmlrpc/up2date.py +++ b/backend/server/handlers/xmlrpc/up2date.py @@ -33,17 +33,16 @@ from server import rhnChannel, rhnHandler, rhnPackage, = rhnDependency,\ rhnCapability from server.rhnServer import server_route = -# -# Up2date Class - xml-rpc Server Functions that we will provide for the -# outside world. class Up2date(rhnHandler): + """ xml-rpc Server Functions that we will provide for the outside worl= d. + """ def __init__(self): - #"""Up2date Class Constructor - # - # o Initializes inherited class. - # o Appends the functions available to the outside world in the - # rhnHandler list. - #""" + """ Up2date Class Constructor + + o Initializes inherited class. + o Appends the functions available to the outside world in the + rhnHandler list. + """ rhnHandler.__init__(self) # Function list inherited from rhnHandler # This action garners control of what is available to the client. @@ -68,13 +67,12 @@ class Up2date(rhnHandler): self.functions.append('solveDependencies_arch') self.functions.append('solveDependencies_with_limits') = - - # Clients v2+ - # Log in routine. def login(self, system_id, extra_data=3D{}): - #"""Return a dictionary of session token/channel information. - # Also sets this information in the headers. - #""" + """ Clients v2+ + Log in routine. + Return a dictionary of session token/channel information. + Also sets this information in the headers. + """ log_debug(5, system_id) # Authenticate the system certificate. We need the user record # to generate the tokens @@ -146,8 +144,8 @@ class Up2date(rhnHandler): return loginDict = = - # Clients v2+ def listChannels(self, system_id): + """ Clients v2+ """ log_debug(5, system_id) # Stuff the action in the headers: transport =3D rhnFlags.get('outputTransportOptions') @@ -160,8 +158,8 @@ class Up2date(rhnHandler): return channelList = = - # Clients v2+ def subscribeChannels(self, system_id, channelNames, username, passwd): + """ Clients v2+ """ log_debug(5, system_id, channelNames, username, passwd) # Stuff the action in the headers: transport =3D rhnFlags.get('outputTransportOptions') @@ -176,8 +174,8 @@ class Up2date(rhnHandler): return 0 = = - # Clients v2+ def unsubscribeChannels(self, system_id, channelNames, username, passw= d): + """ Clients v2+ """ log_debug(3) # Stuff the action in the headers: transport =3D rhnFlags.get('outputTransportOptions') @@ -192,12 +190,12 @@ class Up2date(rhnHandler): return 0 = = - # Clients v1- - # Package listing in [[n,v,r,e],...] format. def listall(self, system_id): - #""" - # NOTE: format weirdness: epoch returned is either an integer or '= '. - #""" + """ Clients v1- + Package listing in [[n,v,r,e],...] format. + = + NOTE: format weirdness: epoch returned is either an integer or= ''. + """ log_debug(5, system_id) # Authenticate the system certificate self.auth_system(system_id) @@ -209,13 +207,13 @@ class Up2date(rhnHandler): # and now call into rhnChannel to find the data return rhnChannel.list_packages_for_server(self.server_id) = - # Clients v1- - # Package listing in [[n,v,r,e,s],...] format. def listall_size(self, system_id): - #""" - # NOTE: format weirdness: epoch returned is either an integer or '= '. - # size is an integer. - #""" + """ Clients v1- + Package listing in [[n,v,r,e,s],...] format. + + NOTE: format weirdness: epoch returned is either an integer or= ''. + size is an integer. + """ log_debug(5, system_id) # Authenticate the system certificate self.auth_system(system_id) @@ -228,16 +226,16 @@ class Up2date(rhnHandler): return rhnChannel.list_packages_for_server(self.server_id, need_size =3D 1) = - # Clients v1- def header(self, system_id, pkgList): - #""" - #IN: system_id: .... - # a package identifier (or a list of them) - # [n,v,r,e] or - # [[n,v,r,e],...] - #OUT: If Proxy: - # If Client: - #""" + """ Clients v1- + + IN: system_id: .... + a package identifier (or a list of them) + [n,v,r,e] or + [[n,v,r,e],...] + OUT: If Proxy: + If Client: + """ log_debug(5, system_id, pkgList) if type(pkgList) not in (ListType, TupleType) or not len(pkgList): log_error("Invalid package list spec", type(pkgList), @@ -287,9 +285,10 @@ class Up2date(rhnHandler): return rpmHeaders = = - # Clients v1- - # Get rpm package. def package(self, system_id, package): + """ Clients v1- + Get rpm package. + """ log_debug(5, "Begin", package) = # Have package in canonical form @@ -312,9 +311,10 @@ class Up2date(rhnHandler): return rpclib.File(open(filePath, "r"), name=3DfilePath) = = - # Clients v1- - # Get a source rpm package. def source_package(self, system_id, package): + """ Clients v1- + Get a source rpm package. + """ log_debug(5, "Begin", package) = # Have package in canonical form @@ -337,11 +337,11 @@ class Up2date(rhnHandler): return rpclib.File(open(filePath, "r"), name=3DfilePath) = = - # Clients v1- - # Get a source rpm package by its human readable filename. def source_package_by_name(self, system_id, filename): - #"""Just like source_package, but we get a package by filename. - #""" + """ Clients v1- + Get a source rpm package by its human readable filename. + Just like source_package, but we get a package by filename. + """ log_debug(5, "Begin", filename) = # Authenticate the system certificate and set the QoS data @@ -361,58 +361,57 @@ class Up2date(rhnHandler): return rpclib.File(open(filePath, "r"), name=3DfilePath) = = - # Clients v1- - # Solve dependencies for a given dependency problem list. def solvedep(self, system_id, deps): - #""" - #IN: a dependency problem list: [name, name, name, ...] - #RET: a package list: [[n,v,r,e],[n,v,r,e],...] That solves the - # dependencies. - #""" + """ Clients v1- + Solve dependencies for a given dependency problem list. + IN: a dependency problem list: [name, name, name, ...] + RET: a package list: [[n,v,r,e],[n,v,r,e],...] That solves the + dependencies. + """ log_debug(4, system_id) return self.__solveDep(system_id, deps, action =3D "solvedep", clientVersion =3D 1) = = - # Clients v2+ - # Solve dependencies for a given dependency problem list (newer versio= n) def solveDependencies(self, system_id, deps): - #""" - #IN: a dependency problem list: [name, name, name, ...] - #RET: a hash {name: [[n, v, r, e], [n, v, r, e], ...], ...} - #""" + """ Clients v2+ + Solve dependencies for a given dependency problem list (newer = version) + IN: a dependency problem list: [name, name, name, ...] + RET: a hash {name: [[n, v, r, e], [n, v, r, e], ...], ...} + """ log_debug(4, system_id) return self.__solveDep(system_id, deps, action =3D "solvedep", clientVersion =3D 2) = - #Does the same thing as solve_dependencies, but also returns the archi= tecture label with the - #package info. def solveDependencies_arch(self, system_id, deps): - #""" - #IN: a dependency problem list: [name, name, name, ...] - #RET: a hash {name: [[n, v, r, e, a], [n, v, r, e, a], ...], ...} - #""" + """ Does the same thing as solve_dependencies, but also returns th= e architecture label with the + package info. + IN: a dependency problem list: [name, name, name, ...] + RET: a hash {name: [[n, v, r, e, a], [n, v, r, e, a], ...], ..= .} + """ log_debug(4, system_id) return self.__solveDep_arch(system_id, deps, action =3D "solvedep", clientVersion =3D 2) = - #This version of solve_dependencies allows the caller to get all of th= e packages that solve a - #dependency and limit the packages that are returned to those that mat= ch the criteria defined - #by limit_operator and limit. This version of the function also return= s the architecture label - #of the package[s] that get returned. - # - #limit_operator can be any of: '<', '<=3D', '=3D=3D', '>=3D', or '>'. - #limit is a a string of the format [epoch:]name-version-release - #deps is a list of filenames that the packages that are returned must = provide. - #version is the version of the client that is calling the function. def solveDependencies_with_limits(self, system_id, deps, all=3D0, limi= t_operator =3D None, limit =3D None): + """ This version of solve_dependencies allows the caller to get al= l of the packages that solve a + dependency and limit the packages that are returned to those t= hat match the criteria defined + by limit_operator and limit. This version of the function also= returns the architecture label + of the package[s] that get returned. + + limit_operator can be any of: '<', '<=3D', '=3D=3D', '>=3D', o= r '>'. + limit is a a string of the format [epoch:]name-version-release + deps is a list of filenames that the packages that are returne= d must provide. + version is the version of the client that is calling the funct= ion. + """ log_debug(4, system_id) return self.__solveDep_with_limits( system_id, deps, action =3D "s= olvedep", = clientVersion =3D 2, all=3Dall, limit_operator=3Dlimit_operato= r, limit=3Dlimit) = - # Clients v2+ - # Add a history log for a performed action def history(self, system_id, summary, body =3D ""): + """ Clients v2+ + Add a history log for a performed action + """ log_debug(5, system_id, summary, body) # Authenticate the system certificate server =3D self.auth_system(system_id) @@ -430,9 +429,10 @@ class Up2date(rhnHandler): # --- PRIVATE METHODS --- = def __solveDep(self, system_id, deps, action, clientVersion): - # Response for clients: - # version 1: list - # version 2: hash + """ Response for clients: + version 1: list + version 2: hash + """ log_debug(5, system_id, deps, action, clientVersion) faultString =3D _("Invalid value %s (%s)") if type(deps) not in (ListType, TupleType): @@ -460,9 +460,10 @@ class Up2date(rhnHandler): return result = def __solveDep_arch(self, system_id, deps, action, clientVersion): - # Response for clients: - # version 1: list - # version 2: hash + """ Response for clients: + version 1: list + version 2: hash + """ log_debug(5, system_id, deps, action, clientVersion) faultString =3D _("Invalid value %s (%s)") if type(deps) not in (ListType, TupleType): @@ -491,9 +492,10 @@ class Up2date(rhnHandler): = = def __solveDep_with_limits(self, system_id, deps, action, clientVersio= n, all=3D0, limit_operator=3DNone, limit=3DNone): - # Response for clients: - # version 1: list - # version 2: hash + """ Response for clients: + version 1: list + version 2: hash + """ log_debug(5, system_id, deps, action, clientVersion) faultString =3D _("Invalid value %s (%s)") if type(deps) not in (ListType, TupleType): @@ -520,14 +522,15 @@ class Up2date(rhnHandler): transport['X-RHN-Action'] =3D action return result = -# Check for a package spec correctness -# Each package should be a list or a tuple of three or four members, -# name, version, release, [epoch] -# in case of lack of epoch we assume "" string -# WARNING: we need to make sure we bound ALL values as strings because -# the lack of epoch is suggested by the empty string (''), which is going -# to cause problems if epoch gets bound as an integer def check_package_spec(package): + """ Check for a package spec correctness + Each package should be a list or a tuple of three or four members, + name, version, release, [epoch] + in case of lack of epoch we assume "" string + WARNING: we need to make sure we bound ALL values as strings becau= se + the lack of epoch is suggested by the empty string (''), which is = going + to cause problems if epoch gets bound as an integer. + """ # This one checks for sane values for name, version, release def __check_Int_String(name, value, package =3D package): if type(value) not in (StringType, IntType): @@ -564,23 +567,20 @@ def check_package_spec(package): return [name, version, release, epoch] = = -# A class to handle the site selection... class Servers(rhnHandler): + """ A class to handle the site selection... """ def __init__(self): - #"""Servers Class Constructor - #""" + """Servers Class Constructor. """ rhnHandler.__init__(self) self.functions.append('get') self.functions.append('list') = - # older funtion that can be a noop def get(self, *junk): + """ Older funtion that can be a noop. """ return [] = - # Available servers the client can connect to def list(self, systemid=3DNone): - #"""Returns a list of available servers the client can connect to - #""" + """ Returns a list of available servers the client can connect to.= """ servers_list =3D [ { 'server' : 'xmlrpc.rhn.redhat.com', commit 6368d3279dadc26a314c11b231aedc8e4d3e7231 Author: Miroslav Such=C3=BD Date: Wed Jun 24 11:09:27 2009 +0200 change comments to docstrings diff --git a/backend/server/handlers/xmlrpc/queue.py b/backend/server/handl= ers/xmlrpc/queue.py index 402b9ad..21cfa90 100644 --- a/backend/server/handlers/xmlrpc/queue.py +++ b/backend/server/handlers/xmlrpc/queue.py @@ -32,12 +32,11 @@ from server.rhnServer import server_kickstart = import getMethod = -# -# XMLRPC queue functions that we will provide for the outside world -# class Queue(rhnHandler): - # Add a list of functions we are willing to server out + """ XMLRPC queue functions that we will provide for the outside world.= """ + def __init__(self): + """ Add a list of functions we are willing to server out. """ rhnHandler.__init__(self) self.functions.append('get') self.functions.append('length') @@ -51,9 +50,9 @@ class Queue(rhnHandler): }, } = - # Fetches old queued actions for the client version 1 def __getV1(self, action): - log_debug(3, self.server_id) + """ Fetches old queued actions for the client version 1. """ + log_debug(3, self.server_id) actionId =3D action['id'] method =3D action["method"] if method =3D=3D 'packages.update': @@ -70,9 +69,9 @@ class Queue(rhnHandler): # all good return {'id': actionId, 'version': 1, 'action': xml} = - # Fetches queued actions for the clients version 2+ def __getV2(self, action): - log_debug(3, self.server_id) + """ Fetches queued actions for the clients version 2+. """ + log_debug(3, self.server_id) # Get the root dir of this install rootDir =3D rhnFlags.get("RootDir") if not rootDir: @@ -102,16 +101,17 @@ class Queue(rhnHandler): 'version' : action['version'], } = - - # update the runnng kernel and the last boot values for this - # server from the status dictionary passed on queue checkin def __update_status(self, status): - # record last running kernel and uptime. only update - # last_boot if it has changed by more than five minutes. we - # don't know the timezone the server is in. or even if its - # clock is right, but we do know it can properly track seconds - # since it rebooted, and use our own clocks to keep proper - # track of the actual time + """ Update the runnng kernel and the last boot values for this + server from the status dictionary passed on queue checkin. + + Record last running kernel and uptime. Only update + last_boot if it has changed by more than five minutes. We + don't know the timezone the server is in. or even if its + clock is right, but we do know it can properly track seconds + since it rebooted, and use our own clocks to keep proper + track of the actual time. + """ = if status.has_key('uname'): kernelver =3D status['uname'][2] @@ -142,7 +142,7 @@ class Queue(rhnHandler): def __should_snapshot(self): log_debug(4, self.server_id, "determining whether to snapshot...") = - entitlements =3D self.server.check_entitlement() + entitlements =3D self.server.check_entitlement() if not entitlements.has_key("provisioning_entitled"): return 0 = @@ -217,7 +217,7 @@ class Queue(rhnHandler): else: self.update_checkin =3D 1 self.auth_system(system_id) - log_debug(1, self.server_id, version, + log_debug(1, self.server_id, version, "checkins %s" % ["disabled", "enabled"][self.update_chec= kin]) = if status: self.__update_status(status) @@ -321,30 +321,29 @@ class Queue(rhnHandler): = return ret = - # submit the results of a queue run def submit(self, system_id, action_id, result, message=3D"", data=3D{}= ): - #""" - # maps old and new rhn_check behavior to new database status codes - # - # The new API uses 4 slightly different status codes than the - # old client does. This function will "hopefully" sensibly - # map them. Old methodology: - # -rhn_check retrieves an action from the top of the action queu= e. - # -It attempts to execute the desired action and returns either - # (a) 0 -- presumed successful. - # (b) rhnFault object -- presumed failed - # (c) some other non-fault object -- *assumed* successful. - # -Regardless of result code, action is marked as "executed" - # - # We try to make a smarter status selection (i.e. failed||complete= d). - # - # For reference: - # New DB status codes: Old DB status codes: = - # 0: Queued 0: queued - # 1: Picked Up 1: picked up - # 2: Completed 2: executed - # 3: Failed 3: completed - #""" + """ Submit the results of a queue run. + Maps old and new rhn_check behavior to new database status cod= es + + The new API uses 4 slightly different status codes than the + old client does. This function will "hopefully" sensibly + map them. Old methodology: + -rhn_check retrieves an action from the top of the action q= ueue. + -It attempts to execute the desired action and returns eith= er + (a) 0 -- presumed successful. + (b) rhnFault object -- presumed failed + (c) some other non-fault object -- *assumed* successful. + -Regardless of result code, action is marked as "executed" + + We try to make a smarter status selection (i.e. failed||comple= ted). + + For reference: + New DB status codes: Old DB status codes: = + 0: Queued 0: queued + 1: Picked Up 1: picked up + 2: Completed 2: executed + 3: Failed 3: completed + """ if type(action_id) is not IntType: # Convert it to int try: @@ -428,11 +427,12 @@ class Queue(rhnHandler): rhnSQL.commit() return 0 = - # Convert whatever the client sends as a result code into a status in = the - # database format - # This is more complicated, since some of the client's result codes ha= ve - # to be marked as successes def status_for_action_type_code(self, action_type, rcode): + """ Convert whatever the client sends as a result code into a stat= us in the + database format + This is more complicated, since some of the client's result co= des have + to be marked as successes. + """ log_debug(4, action_type, rcode) if rcode =3D=3D 0: # Completed @@ -474,8 +474,8 @@ class Queue(rhnHandler): result =3D method(self.server_id, action_id, data=3Ddata) return result = - # return the queue length for a certain server def length(self, system_id): + """ Return the queue length for a certain server. """ # Authenticate the system certificate self.auth_system(system_id) log_debug(1, self.server_id) @@ -496,18 +496,17 @@ class Queue(rhnHandler): = ### PRIVATE methods = - # update the status of an action def __update_action(self, action_id, status, resultCode =3D None, message =3D ""): + """ Update the status of an action. """ log_debug(4, action_id, status, resultCode, message) rhnAction.update_server_action(server_id=3Dself.server_id, action_id=3Daction_id, status=3Dstatus, = result_code=3DresultCode, result_message=3Dmessage) return 0 = - = - # Old client errata retrieval def __errataUpdate(self, actionId): + """ Old client errata retrieval. """ log_debug(3, self.server_id, actionId) # get the names of the packages associated with each errata and # look them up in channels subscribed to by the server and select @@ -564,8 +563,8 @@ class Queue(rhnHandler): xml =3D xmlrpclib.dumps((packages,), methodname=3D'client.update_p= ackages') return xml = - # Old client package retrieval def __packageUpdate(self, actionId): + """ Old client package retrieval. """ log_debug(3, self.server_id, actionId) # The SQL query is a union of: # - packages with a specific EVR commit 5ad0a2b9844b3ab2bcd1635c17b80e3cc6680aaf Author: Miroslav Such=C3=BD Date: Wed Jun 24 11:01:57 2009 +0200 change comments to docstrings diff --git a/backend/server/handlers/xmlrpc/errata.py b/backend/server/hand= lers/xmlrpc/errata.py index 5a74109..f224891 100644 --- a/backend/server/handlers/xmlrpc/errata.py +++ b/backend/server/handlers/xmlrpc/errata.py @@ -23,8 +23,8 @@ from common import rhnFault, rhnFlags, log_debug, log_err= or from server.rhnLib import parseRPMName from server import rhnSQL, rhnHandler, rhnCapability = -# Errata class --- retrieve (via xmlrpc) package errata. class Errata(rhnHandler): + """ Errata class --- retrieve (via xmlrpc) package errata. """ def __init__(self): rhnHandler.__init__(self) # Exposed Errata functions: @@ -33,17 +33,15 @@ class Errata(rhnHandler): self.functions.append('getPackageErratum') # Clients v2+ self.functions.append('getErrataInfo') # clients v2+ = - # Clients v1- - # Get errata for a package given "n-v-r" format def GetByPackage(self, pkg, osRel): - #""" - #IN: pkg: "n-v-r" (old client call) - # or [n,v,r] - # osRel: OS release - #RET: a hash by errata that applies to this package - # (ie, newer packages are available). We also limit the scope - # for a particular osRel. - #""" + """ Clients v1- Get errata for a package given "n-v-r" format + IN: pkg: "n-v-r" (old client call) + or [n,v,r] + osRel: OS release + RET: a hash by errata that applies to this package + (ie, newer packages are available). We also limit the sco= pe + for a particular osRel. + """ if type(pkg) =3D=3D type(''): # Old client support. pkg =3D parseRPMName(pkg) log_debug(1, pkg, osRel) @@ -104,14 +102,13 @@ class Errata(rhnHandler): ret.append(row) return ret = - # Clients v2+ - # Get errata for a package given [n,v,r,e,a,...] format def getPackageErratum(self, system_id, pkg): - #""" - #Sing-along: You say erratum(sing), I say errata(pl)! :) - #IN: pkg: [n,v,r,e,s,a,ch,...] - #RET: a hash by errata that applies to this package - #""" + """ Clients v2+ - Get errata for a package given [n,v,r,e,a,...] f= ormat + + Sing-along: You say erratum(sing), I say errata(pl)! :) + IN: pkg: [n,v,r,e,s,a,ch,...] + RET: a hash by errata that applies to this package + """ log_debug(5, system_id, pkg) if type(pkg) !=3D type([]) or len(pkg) < 7: log_error("Got invalid package specification: %s" % str(pkg)) commit ebb44590aa1a3371004cc5c0847b2f9fe3109fc8 Author: Miroslav Such=C3=BD Date: Wed Jun 24 10:59:33 2009 +0200 change comments to docstrings diff --git a/backend/server/handlers/app/packages.py b/backend/server/handl= ers/app/packages.py index f982b5b..7747978 100644 --- a/backend/server/handlers/app/packages.py +++ b/backend/server/handlers/app/packages.py @@ -75,13 +75,12 @@ class Packages(RPC_Base): self.functions.append('getSourcePackageMD5sum') self.functions.append('getSourcePackageMD5sumBySession') = - ###This is so the client can tell if the satellite supports session to= kens or not def no_op(self): + """ This is so the client can tell if the satellite supports sessi= on tokens or not. """ return 1 = - ###uploadPackageInfo### - # upload a collection of binary packages def uploadPackageInfo(self, username, password, info): + """ Upload a collection of binary packages. """ log_debug(5, username, info) authobj =3D auth(username, password) return self._uploadPackageInfo(authobj, info) @@ -104,9 +103,8 @@ class Packages(RPC_Base): return uploadPackages(info, force=3Dforce, = caller=3D"server.app.uploadPackageInfo") = - ###uploadSourcePackageInfo### - # same stuff, but for source packages def uploadSourcePackageInfo(self, username, password, info): + """ Upload a collection of source packages. """ log_debug(5, username, info) authobj =3D auth(username, password) return self._uploadSourcePackageInfo(authobj, info) @@ -143,8 +141,7 @@ class Packages(RPC_Base): = = def listChannel(self, channelList, username, password): - """list packages of a specified channel - """ + """ List packages of a specified channel. """ log_debug(5, channelList, username) authobj =3D auth(username, password) return self._listChannel(authobj, channelList) @@ -158,11 +155,11 @@ class Packages(RPC_Base): authobj.authzChannels(channelList) return listChannels(channelList) = - = - #12/22/05 wregglej 173287 This is a new function that takes in the use= rname - #and password and returns a session string if they are correct. It rai= ses a - #rhnFault if the user/pass combo is not acceptable. def login(self, username, password): + """ This function that takes in the username + and password and returns a session string if they are correct.= It raises a + rhnFault if the user/pass combo is not acceptable. + """ = log_debug(5, username) user =3D rhnUser.search(username) if not user or not user.check_password(password): @@ -170,10 +167,8 @@ class Packages(RPC_Base): session =3D user.create_session() return session.get_session() = - - #12/22/05 wregglej 173287 Checks a session string to make sure it is a= uthentic - #expired. def check_session(self, session): + """ Checks a session string to make sure it is authentic expired. = """ try: user =3D rhnUser.session_reload(session) except (rhnSession.InvalidSessionError, rhnSession.ExpiredSessionE= rror): @@ -188,20 +183,20 @@ class Packages(RPC_Base): return 0 return 1 = - #12/22/05 wregglej 173287 rhnpush's --extended-test will call this fun= ction. def test_new_login(self, username, password, session=3DNone): + """ rhnpush's --extended-test will call this function. """ log_debug(5, "testing new login") return self.login(username, password) = - #12/22/05 wregglej 173287 rhnpush's --extended-test will call this fun= ction. def test_check_session(self, session): + """ rhnpush's --extended-test will call this function. """ log_debug(5, "testing check session") return self.check_session(session) = = ###listMissingSourcePackages### def listMissingSourcePackages(self, channelList, username, password): - #"list source packages for a list of channels" + """ List source packages for a list of channels. """ log_debug(5, channelList, username) authobj =3D auth(username, password) return self._listMissingSourcePackages(authobj, channelList) @@ -254,8 +249,7 @@ class Packages(RPC_Base): = = def uploadPackage(self, username, password, info): - """Uploads an RPM package - """ + """ Uploads an RPM package. """ log_debug(3) = channels =3D info.get('channels', []) @@ -300,8 +294,7 @@ class Packages(RPC_Base): = = def channelPackageSubscription(self, username, password, info): - """Uploads an RPM package - """ + """ Uploads an RPM package. """ log_debug(3) authobj =3D auth(username, password) return self._channelPackageSubscription(authobj, info) @@ -541,8 +534,7 @@ class Packages(RPC_Base): return row_list = = def getSourcePackageMD5sum(self, username, password, info): - #"""Uploads an RPM package - #""" + """ Uploads an RPM package """ log_debug(3) = pkg_infos =3D info.get('packages') @@ -584,9 +576,11 @@ class Packages(RPC_Base): = return self._getSourcePackageMD5sum(org_id, pkg_infos, info) = - #pkilambi:bug#177762 gives md5sum info of available source packages. - #also does an existance check on the filesystem. def _getSourcePackageMD5sum(self, org_id, pkg_infos, info): + """ Gives md5sum info of available source packages. + Also does an existance check on the filesystem. + """ + log_debug(3) = statement =3D """ @@ -637,8 +631,7 @@ class Packages(RPC_Base): = # Helper functions def _getSourcePackageInfo(self, source_rpm_id): - #"""get dictionary containing source package information. - #""" + """ Get dictionary containing source package information. """ log_debug(4, source_rpm_id) statement =3D """ select @@ -667,13 +660,13 @@ class Packages(RPC_Base): return row = def auth(login, password): - # Authorize this user + """ Authorize this user. """ authobj =3D UserAuth() authobj.auth(login, password) return authobj = -#wregglej 12/21/05 Authenticate based on a session def auth_session(session_string): + """ Authenticate based on a session. """ authobj =3D UserAuth() authobj.auth_session(session_string) return authobj commit c8d7b39a46888db6fe1c142f3d22df99a599e79d Author: Miroslav Such=C3=BD Date: Wed Jun 24 10:40:11 2009 +0200 change comments to docstrings diff --git a/backend/server/action/solarispkgs.py b/backend/server/action/s= olarispkgs.py index 3369018..9d3b239 100644 --- a/backend/server/action/solarispkgs.py +++ b/backend/server/action/solarispkgs.py @@ -123,11 +123,11 @@ patchClusterInstall =3D install patchClusterRemove =3D remove = def refresh_list(serverId, actionId): - #"""Call the equivalent of up2date -p. - # - # I.e. update the list of a client's installed packages known by - # Red Hat's DB. - #""" + """ Call the equivalent of up2date -p. + = + I.e. update the list of a client's installed packages known by + Red Hat's DB. + """ log_debug(3) return None = commit 9f9e787677b319062edeba0ac6239601beee2fa6 Author: Miroslav Such=C3=BD Date: Wed Jun 24 10:40:07 2009 +0200 change comments to docstrings diff --git a/backend/server/action/packages.py b/backend/server/action/pack= ages.py index 9d62fb4..523c8b0 100644 --- a/backend/server/action/packages.py +++ b/backend/server/action/packages.py @@ -116,11 +116,11 @@ def update(serverId, actionId): = = def refresh_list(serverId, actionId): - #"""Call the equivalent of up2date -p. - # - # I.e. update the list of a client's installed packages known by - # Red Hat's DB. - #""" + """ Call the equivalent of up2date -p. + = + I.e. update the list of a client's installed packages known by + Red Hat's DB. + """ log_debug(3) return None = commit fca52b7373cb4269cb21388e926775539c607982 Author: Miroslav Such=C3=BD Date: Wed Jun 24 10:38:34 2009 +0200 change comments to docstrings diff --git a/backend/satellite_tools/disk_dumper/dumper.py b/backend/satell= ite_tools/disk_dumper/dumper.py index 42bda4c..e1e00c6 100644 --- a/backend/satellite_tools/disk_dumper/dumper.py +++ b/backend/satellite_tools/disk_dumper/dumper.py @@ -303,7 +303,7 @@ class XML_Dumper: """) = def _cache_channel_packages_short(self, channel_id, key, last_modified= ): - # Caches the short package entries for channel_id + """ Caches the short package entries for channel_id """ # Create a temporary file temp_stream =3D tempfile.TemporaryFile() # Always compress the result @@ -333,9 +333,10 @@ class XML_Dumper: return self._normalize_compressed_stream(temp_stream) = def _normalize_compressed_stream(self, stream): - # Given a compressed stream, will either return the stream, or will - # decompress it and return it, depending on the compression level - # self.compress_level + """ Given a compressed stream, will either return the stream, or w= ill + decompress it and return it, depending on the compression level + self.compress_level + """ stream.seek(0, 0) if self.compress_level: # Output should be compressed; nothing else to to @@ -526,20 +527,20 @@ class XML_Dumper: return result = class SatelliteDumper(exportLib.SatelliteDumper): - # Overriding with our own version def set_attributes(self): + """ Overriding with our own version """ attributes =3D exportLib.SatelliteDumper.set_attributes(self) attributes['version'] =3D CFG.XML_DUMP_VERSION attributes['generation'] =3D CFG.SAT_CERT_GENERATION return attributes = - = -# A query iterator successively applies the list of params as execute() to= the -# statement that was passed in, and presents the union of the result sets = as a -# single result set. -# Params is a list of dictionaries that would fill the named bound variabl= es -# from the statement class QueryIterator: + """ A query iterator successively applies the list of params as execut= e() to the + statement that was passed in, and presents the union of the result= sets as a + single result set. + Params is a list of dictionaries that would fill the named bound v= ariables + from the statement. + """ def __init__(self, statement, params): self._statement =3D statement self._params =3D params @@ -581,12 +582,13 @@ class QueryIterator: return None apply(self._statement.execute, (), self._params[self._params_pos]) = -# This class will attempt to retrieve information, either from the databas= e or -# from a local cache -# -# Note that we expect at most one result set per database query - this can= be -# easily fixed if we need more class CachedQueryIterator: + """ This class will attempt to retrieve information, either from the d= atabase or + from a local cache. + + Note that we expect at most one result set per database query - th= is can be + easily fixed if we need more. + """ def __init__(self, statement, params, cache_get): self._statement =3D statement # XXX params has to be a list of hashes, containing at least a @@ -632,8 +634,9 @@ class CachedQueryIterator: apply(self._statement.execute, (), params) = def close(self): - # Make sure we remove references to these objects, or circular - # references can occur + """ Make sure we remove references to these objects, or circular + references can occur. + """ log_debug(3, "Closing the iterator") self._statement =3D None self._cache_get =3D None @@ -649,7 +652,7 @@ class CachedDumper(exportLib.BaseDumper): log_debug(1, "Use database cache", self.use_database_cache) = def _get_last_modified(self, params): - # To be overwritten + """ To be overwritten. """ return params['last_modified'] = def _get_key(self, params): @@ -676,7 +679,7 @@ class CachedDumper(exportLib.BaseDumper): compressed=3D1) = def _dump_subelement(self, data): - # To be overridden in subclasses + """ To be overridden in subclasses. """ pass = def dump_subelement(self, data): @@ -1097,13 +1100,14 @@ class KickstartableTreesDumper(CachedDumper, export= Lib.KickstartableTreesDumper) log_debug(6, data) return exportLib.KickstartableTreesDumper.dump_subelement(self, da= ta) = -# This looks complicated; it returns the (integer part of) -# obj_id, modulo factor -# The string is left padded with as many 0 chars as necessary to = -# match factor -# XXX This is copied from satellite_tools.diskImportLib.hashPackageID - = -# should figure out a way to share it -- misa def hash_object_id(obj_id, factor): + """ This looks complicated; it returns the (integer part of) + obj_id, modulo factor + The string is left padded with as many 0 chars as necessary to = + match factor + XXX This is copied from satellite_tools.diskImportLib.hashPackageI= D - = + should figure out a way to share it -- misa + """ # Make sure obj_id is a string obj_id =3D str(obj_id) format =3D int(math.ceil(math.log10(factor))) commit f268127d275bfe6669f41b64678be3f1b404f315 Author: Miroslav Such=C3=BD Date: Wed Jun 24 10:32:23 2009 +0200 change comments to docstrings diff --git a/backend/common/rhnApache.py b/backend/common/rhnApache.py index 77fe50a..c4cacb7 100644 --- a/backend/common/rhnApache.py +++ b/backend/common/rhnApache.py @@ -33,18 +33,15 @@ from rhnLog import log_debug from rhnLog import log_error from rhnTranslate import cat = - -# Shared rhnApache class: rhnApache classes in proxy and server inherit th= is -# class. - - class rhnApache: + """ Shared rhnApache class: rhnApache classes in proxy and server inhe= rit = + this class. = + = + Shared apache handler code: headerParserHandler, + handler (defined in class that inherits th= is), + cleanupHandler. + """ _lang_catalog =3D "common" - #""" - #Shared apache handler code: headerParserHandler, - # handler (defined in class that inherits t= his), - # cleanupHandler. - #""" = def __init__(self): self.lang =3D "C" @@ -127,7 +124,7 @@ class rhnApache: return apache.OK = def _set_proxy_info(self, req): - # RHN Proxy stuff: + """ RHN Proxy stuff. """ proxyVersion =3D 'X-RHN-Proxy-Version' if req.headers_in.has_key(proxyVersion): self.proxyVersion =3D req.headers_in[proxyVersion] @@ -141,7 +138,7 @@ class rhnApache: return apache.OK = def _set_lang(self, req): - # determine what language the client prefers + """ determine what language the client prefers """ if req.headers_in.has_key("Accept-Language"): # RFC 2616 #3.10: case insensitive lang =3D string.lower(req.headers_in["Accept-Language"]) @@ -241,10 +238,9 @@ class rhnApache: return string.join(cat.getlangs(), "; ") = def _setSessionToken(self, headers): - #""" - #Pushes token into rhnFlags. If doesn't exist, returns None. - #Pull session token out of the headers and into rhnFlags. - #""" + """ Pushes token into rhnFlags. If doesn't exist, returns None. + Pull session token out of the headers and into rhnFlags. + """ log_debug(3) token =3D UserDictCase() if headers.has_key('X-RHN-Server-Id'): commit 27f205f32c13a1d63e033b23f8bb6701e0609f96 Author: Miroslav Such=C3=BD Date: Wed Jun 24 10:23:09 2009 +0200 499723 - accept follow-redirects with value greater then 2 diff --git a/backend/common/rhnRepository.py b/backend/common/rhnRepository= .py index 17efe5a..fabb781 100644 --- a/backend/common/rhnRepository.py +++ b/backend/common/rhnRepository.py @@ -101,7 +101,8 @@ class Repository(RPC_Base): # Must be a client. We'll determine the redirect capability v= ia # the x-rhn-transport-capability header instead. transport_cap =3D rhnFlags.get('x-rhn-transport-capability') - redirectsSupported =3D transport_cap =3D=3D 'follow-redirects= =3D2' + transport_cap_list =3D transport_cap.split('=3D') + redirectsSupported =3D transport_cap_list[0] =3D=3D 'follow-re= directs' and transport_cap_list[1] >=3D 2 = if redirectsSupported: log_debug(3, "Client supports redirects.") commit bb617e87564acc038f40140e81965002d6943da3 Author: Miroslav Such=C3=BD Date: Wed Jun 24 08:34:35 2009 +0200 change comments to docstrings diff --git a/backend/common/rhnRepository.py b/backend/common/rhnRepository= .py index e9d1c2d..17efe5a 100644 --- a/backend/common/rhnRepository.py +++ b/backend/common/rhnRepository.py @@ -30,9 +30,10 @@ from rhnLib import rfc822time from rhnException import rhnException, rhnFault from RPC_Base import RPC_Base = -# Shared repository class, inherited by both the proxy and server specific -# Repository classes. class Repository(RPC_Base): + """ Shared repository class, inherited by both the proxy and server sp= ecific + Repository classes. + """ def __init__(self, channelName =3D None): log_debug(2, channelName) RPC_Base.__init__(self) @@ -52,28 +53,28 @@ class Repository(RPC_Base): self.channelName =3D None self.functions =3D None = - # Returns the path to a package. def getPackagePath(self, pkgFilename, redirect=3D0): - #"""OVERLOAD this in server and proxy rhnRepository. - # I.e.: they construct the path differently. - #""" + """Returns the path to a package. + OVERLOAD this in server and proxy rhnRepository. + I.e.: they construct the path differently. + """ raise rhnException("This function should be overloaded.") = def getPackagePathNVRA(self, nvra): - #"""OVERLOAD this in server and proxy rhnRepository. - # I.e.: they construct the path differently. - #""" + """OVERLOAD this in server and proxy rhnRepository. + I.e.: they construct the path differently. + """ raise rhnException("This function should be overloaded.") = - # Returns the path to a package. def getSourcePackagePath(self, pkgFilename): - #"""OVERLOAD this in server and proxy rhnRepository. - # I.e.: they construct the path differently. - #""" + """Returns the path to a package. + OVERLOAD this in server and proxy rhnRepository. + I.e.: they construct the path differently. + """ raise rhnException("This function should be overloaded.") = - # Get rpm package. = def getPackage(self, pkgFilename, *args): + """ Get rpm package. """ log_debug(3, pkgFilename) if args: pkg_spec =3D [pkgFilename] + list(args) @@ -103,16 +104,16 @@ class Repository(RPC_Base): redirectsSupported =3D transport_cap =3D=3D 'follow-redirects= =3D2' = if redirectsSupported: - log_debug(3, "Client supports redirects.") - filePath =3D self.getPackagePath(pkg_spec, 1) = - else: + log_debug(3, "Client supports redirects.") + filePath =3D self.getPackagePath(pkg_spec, 1) = + else: #older clients just return the hosted url and download the pac= kage - filePath =3D self.getPackagePath(pkg_spec) + filePath =3D self.getPackagePath(pkg_spec) = - return self._getFile(filePath) + return self._getFile(filePath) = - # Get srpm packrge. def getPackageSource(self, pkgFilename): + """ Get srpm packrge. """ log_debug(3, pkgFilename) # Sanity check: l =3D string.split(pkgFilename, '.') @@ -123,10 +124,11 @@ class Repository(RPC_Base): filePath =3D self.getSourcePackagePath(pkgFilename) return self._getFile(filePath) = - # Get rpm header. - # XXX: stock 8.0 clients could not compress headers, we need to either - # change the function name, or version the protocol def getPackageHeader(self, pkgFilename): + """ Get rpm header. + XXX: stock 8.0 clients could not compress headers, we need to = either + change the function name, or version the protocol + """ log_debug(3, pkgFilename) pkg =3D string.split(pkgFilename, '.') # Basic sanity checks: @@ -148,12 +150,11 @@ class Repository(RPC_Base): = # --- PRIVATE METHODS --- = - # Returns xmlrpclib file object to any file given a path to it. def _getFile(self, filePath): - #''' - #IN: filePath: path to any file. - #OUT: XMLed rpm or source rpm, or an xmlrpc file object. - #''' + """ Returns xmlrpclib file object to any file given a path to it. + IN: filePath: path to any file. + OUT: XMLed rpm or source rpm, or an xmlrpc file object. + """ log_debug(3, filePath) features =3D self._fileFeatures(filePath) filePath =3D features['path'] @@ -162,9 +163,10 @@ class Repository(RPC_Base): self._set_last_modified(lastModified) return rpclib.File(open(filePath, "rb"), length, name=3DfilePath) = - # Utility function to extract a header from an rpm. - # If stat_info was already passed, don't re-stat the file def _getHeaderFromFile(self, filePath, stat_info=3DNone): + """ Utility function to extract a header from an rpm. + If stat_info was already passed, don't re-stat the file + """ log_debug(3, filePath) if stat_info: s =3D stat_info @@ -218,8 +220,8 @@ class Repository(RPC_Base): transport[str(k)] =3D str(v) return transport = - # From a filepath, construct a dictionary of file features. def _fileFeatures(self, filePath): + """ From a filepath, construct a dictionary of file features. """ log_debug(3, filePath) if not filePath: raise rhnFault(17, "While looking for file: `%s'" commit bdaa80f9c64c969b328f039fab22b905728b568e Author: Miroslav Such=C3=BD Date: Tue Jun 23 15:43:29 2009 +0200 change comments to docstrings diff --git a/backend/common/rhnTB.py b/backend/common/rhnTB.py index 5608498..794607c 100644 --- a/backend/common/rhnTB.py +++ b/backend/common/rhnTB.py @@ -35,8 +35,8 @@ hostname =3D socket.gethostname() # avoid a huge flood of mail requests. QUIET_MAIL =3D None = -# Dump the environment. def print_env(fd =3D sys.stderr): + """ Dump the environment. """ dct =3D os.environ fd.write("\nEnvironment for PID=3D%d on exception:\n" % os.getpid()) el =3D dct.keys() @@ -45,9 +45,10 @@ def print_env(fd =3D sys.stderr): fd.write("%s =3D %s\n" % (k, dct[k])) = = -# Dump a listing of all local variables and their value for better debuggi= ng -# chance. def print_locals(fd =3D sys.stderr, tb =3D None): + """ Dump a listing of all local variables and their value for better d= ebugging + chance. + """ if tb is None: tb =3D sys.exc_info()[2] stack =3D [] @@ -82,9 +83,9 @@ def print_locals(fd =3D sys.stderr, tb =3D None): = = def print_req(req, fd =3D sys.stderr): - #""" get some debugging information about the current exception for se= nding - # out when we raise an exception - #""" + """ get some debugging information about the current exception for sen= ding + out when we raise an exception + """ = fd.write("Request object information:\n") fd.write("URI: %s\n" % req.unparsed_uri) @@ -100,9 +101,9 @@ def print_req(req, fd =3D sys.stderr): = def Traceback(method =3D None, req =3D None, mail =3D 1, ostream =3D sys.s= tderr, extra =3D None, severity=3D"notification", with_locals=3D0): - #""" Reports an traceback error and optionally sends mail about it. - # NOTE: extra =3D extra text information. - #""" + """ Reports an traceback error and optionally sends mail about it. + NOTE: extra =3D extra text information. + """ = global QUIET_MAIL = @@ -176,15 +177,16 @@ def Traceback(method =3D None, req =3D None, mail =3D= 1, ostream =3D sys.stderr, = = def fetchTraceback(method=3DNone, req=3DNone, extra=3DNone, with_locals=3D= 0): - #""" a cheat for snagging just the string value of a Traceback """ + """ a cheat for snagging just the string value of a Traceback """ exc =3D StringIO() Traceback(method=3Dmethod, req=3Dreq, mail=3D0, ostream=3Dexc, extra= =3Dextra, severity=3DNone, with_locals=3Dwith_locals) return exc.getvalue() = -#The SecurityList is a list of strings that are censored out of a debug em= ail. -#Right now it's only used for censoring traceback emails. class SecurityList: + """ The SecurityList is a list of strings that are censored out of a d= ebug email. + Right now it's only used for censoring traceback emails. + """ _flag_string =3D "security-list" def __init__(self): # We store the security list in the global flags. This way, we don= 't @@ -201,25 +203,25 @@ class SecurityList: def check(self, obj): return obj in self.sec = -#Returns the list of strings to be censored. def get_seclist(): + """ Returns the list of strings to be censored. """ return SecurityList().sec = -#Remove all instances of the strings in seclist.sec from strval def censor_string(strval): + """ Remove all instances of the strings in seclist.sec from strval """ censorlist =3D get_seclist() for c in censorlist: #Censor it with a fixed length string. This way the length of the = hidden string isn't revealed. strval =3D string.replace(strval, c, "") return strval = -#Adds a string to seclist.sec, but only if it's not already there. def add_to_seclist(obj): + """ Adds a string to seclist.sec, but only if it's not already there. = """ seclist =3D SecurityList() if not seclist.check(obj): seclist.add(obj) = -#Checks whether a string is in seclist.sec or not. Returns True or False. def check_with_seclist(obj): + """ Checks whether a string is in seclist.sec or not. Returns True or = False. """ seclist =3D SecurityList() return seclist.check(obj) = --===============6865561773933049493==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:48 2015 Content-Type: multipart/mixed; boundary="===============1855998704956312257==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - rel-eng/packages schema/spacewalk spacewalk/setup Date: Thu, 25 Jun 2009 12:13:12 +0000 Message-ID: <20090625121312.72A3C1201ED@lists.fedorahosted.org> --===============1855998704956312257== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/spacewalk-schema | 2 +- rel-eng/packages/spacewalk-setup | 2 +- schema/spacewalk/spacewalk-schema.spec | 9 ++++++++- spacewalk/setup/spacewalk-setup.spec | 16 +++++++++++++++- 4 files changed, 25 insertions(+), 4 deletions(-) New commits: commit b2c6487021e322401dc85cbc9268b38ccdf0f83e Author: Milan Zazrivec Date: Thu Jun 25 14:10:46 2009 +0200 Automatic commit of package [spacewalk-setup] release [0.6.9-1]. diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-= setup index 4512a72..87a7464 100644 --- a/rel-eng/packages/spacewalk-setup +++ b/rel-eng/packages/spacewalk-setup @@ -1 +1 @@ -0.6.8-1 spacewalk/setup/ +0.6.9-1 spacewalk/setup/ diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewa= lk-setup.spec index 1abf415..a7cf6c2 100644 --- a/spacewalk/setup/spacewalk-setup.spec +++ b/spacewalk/setup/spacewalk-setup.spec @@ -1,5 +1,5 @@ Name: spacewalk-setup -Version: 0.6.8 +Version: 0.6.9 Release: 1%{?dist} Summary: Initial setup tools for Red Hat Spacewalk = @@ -100,6 +100,20 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/pki/spacewalk/jabberd = %changelog +* Thu Jun 25 2009 Milan Zazrivec 0.6.9-1 +- no in-place editing of /etc/oratab under oracle user (mzazrivec(a)redhat= .com) +- remove extraneous backslash characters (mzazrivec(a)redhat.com) +- update records in /etc/oratab in db upgrade scripts (mzazrivec(a)redhat.= com) +- 507338 - Fixed a spacewalk setup glitch where we not checkking for a null + value.. (paji(a)redhat.com) +- support for db upgrade with custom user set (mzazrivec(a)redhat.com) +- set new embedded db oratab entry only if it does not exist + (mzazrivec(a)redhat.com) +- restart the satellite using shell script (mzazrivec(a)redhat.com) +- Do not start embedded db during upgrade (mzazrivec(a)redhat.com) +- 506405 - fixed cobbler-setup for non-interactive installs (paji(a)redhat= .com) +- 499889 - Modified cobbler-setup to turn on tftp and xinetd (paji(a)redha= t.com) + * Fri Jun 05 2009 jesus m. rodriguez 0.6.8-1 - no need to enable Monitoring + MonitoringScout explicitly (mzazrivec(a)r= edhat.com) - Fixes to support mod_jk >=3D 2.2.26. (dgoodwin(a)redhat.com) commit ea412a7c1af426d8cbe491dc1af504c3f45c07bc Author: Milan Zazrivec Date: Thu Jun 25 14:08:54 2009 +0200 Automatic commit of package [spacewalk-schema] release [0.6.10-1]. diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk= -schema index 31a1432..5515c1a 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -0.6.9-1 schema/spacewalk/ +0.6.10-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spac= ewalk-schema.spec index 3c79a3c..3a3957f 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: 0.6.9 +Version: 0.6.10 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz = @@ -52,6 +52,13 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-schema-upgrade* = %changelog +* Thu Jun 25 2009 Milan Zazrivec 0.6.10-1 +- 506272 - insert sub4v rows only if they do not exist +- 431673 - reworking rhnServerNeededView for performance fixes. + (mmccune(a)gmail.com) +- 492588 - Provide for shared child channels with non-shared parent channe= ls + (jortel(a)redhat.com) + * Fri Jun 05 2009 jesus m. rodriguez 0.6.9-1 - 503243 - Dropping the is_default column as we now determine the default = in the app code based on the compatible eus channel instead of jus the defa= ult. --===============1855998704956312257==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:48 2015 Content-Type: multipart/mixed; boundary="===============1737418084137083511==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-setup-0.6.9-1' Date: Thu, 25 Jun 2009 12:13:19 +0000 Message-ID: <20090625121319.45C1E120304@lists.fedorahosted.org> --===============1737418084137083511== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-setup-0.6.9-1' created by Milan Zazrivec at 2009-06-25 12:10 +0000 Tagging package [spacewalk-setup] version [0.6.9-1] in directory [spacewalk= /setup/]. Changes since spacewalk-schema-0.6.10-1: Milan Zazrivec (1): Automatic commit of package [spacewalk-setup] release [0.6.9-1]. --- rel-eng/packages/spacewalk-setup | 2 +- spacewalk/setup/spacewalk-setup.spec | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) --- --===============1737418084137083511==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:48 2015 Content-Type: multipart/mixed; boundary="===============3685881297318453795==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-schema-0.6.10-1' Date: Thu, 25 Jun 2009 12:13:19 +0000 Message-ID: <20090625121319.04DCF1201ED@lists.fedorahosted.org> --===============3685881297318453795== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-schema-0.6.10-1' created by Milan Zazrivec at 2009-06-25 12:08 +0000 Tagging package [spacewalk-schema] version [0.6.10-1] in directory [schema/= spacewalk/]. Changes since spacewalk-config-0.6.7-1: Milan Zazrivec (1): Automatic commit of package [spacewalk-schema] release [0.6.10-1]. Miroslav Such=C3=BD (15): change comments to docstrings change comments to docstrings 499723 - accept follow-redirects with value greater then 2 change comments to docstrings change comments to docstrings change comments to docstrings change comments to docstrings change comments to docstrings change comments to docstrings change comments to docstrings change comments to docstrings change comments to docstrings change comments to docstrings change comments to docstrings change comments to docstrings Partha Aji (1): Fix to make sure kernel param entries don;t get duplicated --- backend/common/rhnApache.py = | 28 - backend/common/rhnRepository.py = | 67 +-- backend/common/rhnTB.py = | 34 - backend/satellite_tools/disk_dumper/dumper.py = | 56 +- backend/server/action/packages.py = | 10 = backend/server/action/solarispkgs.py = | 10 = backend/server/handlers/app/packages.py = | 51 +- backend/server/handlers/xmlrpc/errata.py = | 33 - backend/server/handlers/xmlrpc/getMethod.py = | 11 = backend/server/handlers/xmlrpc/queue.py = | 101 ++--- backend/server/handlers/xmlrpc/up2date.py = | 198 +++++----- backend/server/rhnDependency.py = | 130 +++--- java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.ja= va | 8 = proxy/proxy/broker/rhnRepository.py = | 52 +- proxy/proxy/rhnShared.py = | 8 = rel-eng/packages/spacewalk-schema = | 2 = schema/spacewalk/spacewalk-schema.spec = | 9 = 17 files changed, 399 insertions(+), 409 deletions(-) --- --===============3685881297318453795==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:48 2015 Content-Type: multipart/mixed; boundary="===============0034105777232436192==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: client/tools Date: Thu, 25 Jun 2009 13:03:51 +0000 Message-ID: <20090625130351.CCC021201ED@lists.fedorahosted.org> --===============0034105777232436192== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/osad/osad.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cd5752bb5104f93c4db3ebe5424ef7ed8f53a856 Author: Milan Zazrivec Date: Thu Jun 25 15:01:57 2009 +0200 508064 - fix osad installation errors on client = rpm would print following error messages: warning: user mockbuild does not exist - using root warning: group mockbuild does not exist - using root diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index e746176..b9a6377 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -198,7 +198,7 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -r= vvi {} %{rhnroot}/osad/osad_config.py* %{rhnroot}/osad/rhn_log.py* %{rhnroot}/osad/rhnLockfile.py* -%attr(755,-,-) %{rhnroot}/osad/rhn_fcntl.py* +%attr(755,root,root) %{rhnroot}/osad/rhn_fcntl.py* %config(noreplace) %{_sysconfdir}/sysconfig/rhn/osad.conf %config(noreplace) %attr(600,root,root) %{_sysconfdir}/sysconfig/rhn/osad-= auth.conf %config(noreplace) %{client_caps_dir}/* --===============0034105777232436192==-- From mzazrive at fedoraproject.org Thu Aug 20 11:57:48 2015 Content-Type: multipart/mixed; boundary="===============2201585590229212488==" MIME-Version: 1.0 From: Milan Zazrivec To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - client/tools Date: Thu, 25 Jun 2009 13:04:30 +0000 Message-ID: <20090625130430.8FD981201ED@lists.fedorahosted.org> --===============2201585590229212488== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/osad/osad.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 765395589ca1dcae611a5ca4381ff4484d6b8102 Author: Milan Zazrivec Date: Thu Jun 25 15:01:57 2009 +0200 508064 - fix osad installation errors on client = rpm would print following error messages: warning: user mockbuild does not exist - using root warning: group mockbuild does not exist - using root diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index 3c85aed..ba7a2e7 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -198,7 +198,7 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -r= vvi {} %{rhnroot}/osad/osad_config.py* %{rhnroot}/osad/rhn_log.py* %{rhnroot}/osad/rhnLockfile.py* -%attr(755,-,-) %{rhnroot}/osad/rhn_fcntl.py* +%attr(755,root,root) %{rhnroot}/osad/rhn_fcntl.py* %config(noreplace) %{_sysconfdir}/sysconfig/rhn/osad.conf %config(noreplace) %attr(600,root,root) %{_sysconfdir}/sysconfig/rhn/osad-= auth.conf %config(noreplace) %{client_caps_dir}/* --===============2201585590229212488==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:48 2015 Content-Type: multipart/mixed; boundary="===============0106035786199371604==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'sha256-support' - 6 commits - client/tools proxy/proxy Date: Thu, 25 Jun 2009 13:12:10 +0000 Message-ID: <20090625131210.8AA7A1201ED@lists.fedorahosted.org> --===============0106035786199371604== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/rhnpush/uploadLib.py | 74 ++++- proxy/proxy/pm/uploadLib.py | 511 ---------------------------------= ----- proxy/proxy/spacewalk-proxy.spec | 1 = 3 files changed, 72 insertions(+), 514 deletions(-) New commits: commit 678041b845224a2ddf2db4e1a306843f179a3f7a Author: Miroslav Such=C3=BD Date: Thu Jun 25 14:44:22 2009 +0200 more agressive merge uploadLib.py - from client/tools/rhnpush to proxy/= proxy/pm diff --git a/client/tools/rhnpush/uploadLib.py b/client/tools/rhnpush/uploa= dLib.py index c87052a..fbcf63b 100644 --- a/client/tools/rhnpush/uploadLib.py +++ b/client/tools/rhnpush/uploadLib.py @@ -21,6 +21,7 @@ import string import fnmatch import getpass import rhnpush_cache +import struct = try: import hashlib diff --git a/proxy/proxy/pm/uploadLib.py b/proxy/proxy/pm/uploadLib.py index e9cd7b1..936aa18 100644 --- a/proxy/proxy/pm/uploadLib.py +++ b/proxy/proxy/pm/uploadLib.py @@ -17,24 +17,14 @@ # system imports import os import sys -import md5 import string import fnmatch import getpass -import struct - -from rhn import rpclib -Binary =3D rpclib.xmlrpclib.Binary -Output =3D rpclib.transports.Output = # RHN imports -from common import rhn_rpm +from rhnpush import rhn_mpm from rhnpush import uploadLib = -# Buffer size we use for copying -BUFFER_SIZE =3D 65536 -HEADERS_PER_CALL =3D 25 - class UploadClass(uploadLib.UploadClass): """ Functionality for an uploading tool """ = @@ -176,75 +166,15 @@ class UploadClass(uploadLib.UploadClass): # Per-package post actions self.processPackage(p, filename) = -def _processFile(filename, relativeDir=3DNone, source=3DNone, nosig=3DNone= ): - """ Processes a file - Returns a hash containing: - header - packageSize - md5sum - relativePath - nvrea - """ - - # Is this a file? - if not os.access(filename, os.R_OK): - raise UploadError("Could not stat the file %s" % filename) - if not os.path.isfile(filename): - raise UploadError("%s is not a file" % filename) - - # Size - size =3D os.path.getsize(filename) - # Open the file - f =3D open(filename, "r") - digest =3D computeMD5sum(None, f) - # Rewind the file - f.seek(0, 0) - # Read the header - h =3D get_header(None, f.fileno(), source) - (header_start, header_end) =3D get_header_byte_range(f); - f.close() - if h is None: - raise UploadError("%s is not a valid RPM file" % filename) - - if nosig is None and not h.is_signed(): - raise UploadError("ERROR: %s: unsigned rpm (use --nosig to force)" - % filename) - - # Get the name, version, release, epoch, arch - lh =3D [] - for k in ['name', 'version', 'release', 'epoch']: - lh.append(h[k]) - # Fix the epoch - if lh[3] is None: - lh[3] =3D "" - else: - lh[3] =3D str(lh[3]) = - if source: - lh.append('src') - else: - lh.append(h['arch']) - - # Build the header hash to be sent - hash =3D { 'header' : Binary(h.unload()), - 'md5sum' : digest, - 'packageSize' : size, - 'header_start' : header_start, - 'header_end' : header_end} - if relativeDir: - # Append the relative dir too - hash["relativePath"] =3D "%s/%s" % (relativeDir, - os.path.basename(filename)) - hash['nvrea'] =3D tuple(lh) - return hash = # returns a header from a package file on disk. def get_header(file, fildes=3DNone, source=3DNone): - # rhn_rpm.get_package_header will choose the right thing to do - open = the + # rhn_mpm.get_package_header will choose the right thing to do - open = the # file or use the provided open file descriptor) try: - h =3D rhn_rpm.get_package_header(filename=3Dfile, fd=3Dfildes) - except rhn_rpm.InvalidPackageError: + h =3D rhn_mpm.get_package_header(filename=3Dfile, fd=3Dfildes) + except rhn_mpm.InvalidPackageError: raise UploadError("Package is invalid") # Verify that this is indeed a binary/source. xor magic # xor doesn't work with None values, so compare the negated values - t= he @@ -252,55 +182,3 @@ def get_header(file, fildes=3DNone, source=3DNone): if (not source) ^ (not h.is_source): raise UploadError("Unexpected RPM package type") return h - -def get_header_byte_range(package_file): - """ - Return the start and end bytes of the rpm header object. - - For details of the rpm file format, see: - http://www.rpm.org/max-rpm/s1-rpm-file-format-rpm-file-format.html - """ - - lead_size =3D 96 - - # Move past the rpm lead - package_file.seek(lead_size) - - sig_size =3D get_header_struct_size(package_file) - - # Now we can find the start of the actual header. - header_start =3D lead_size + sig_size - - package_file.seek(header_start) - - header_size =3D get_header_struct_size(package_file) - - header_end =3D header_start + header_size - - return (header_start, header_end) - -def get_header_struct_size(package_file): - """ - Compute the size in bytes of the rpm header struct starting at the cur= rent - position in package_file. - """ - # Move past the header preamble - package_file.seek(8, 1) - - # Read the number of index entries - header_index =3D package_file.read(4) - (header_index_value, ) =3D struct.unpack('>I', header_index) - - # Read the the size of the header data store - header_store =3D package_file.read(4) - (header_store_value, ) =3D struct.unpack('>I', header_store) - - # The total size of the header. Each index entry is 16 bytes long. - header_size =3D 8 + 4 + 4 + header_index_value * 16 + header_store_val= ue - - # Headers end on an 8-byte boundary. Round out the extra data. - round_out =3D header_size % 8 - if round_out !=3D 0: - header_size =3D header_size + (8 - round_out) - - return header_size commit 073a73c725871394a86382960a35ba8f5a0fa98a Author: Miroslav Such=C3=BD Date: Thu Jun 25 14:33:01 2009 +0200 whitespace cleanup diff --git a/proxy/proxy/pm/uploadLib.py b/proxy/proxy/pm/uploadLib.py index 971d01b..e9cd7b1 100644 --- a/proxy/proxy/pm/uploadLib.py +++ b/proxy/proxy/pm/uploadLib.py @@ -14,7 +14,6 @@ # in this software or its documentation. # = - # system imports import os import sys @@ -36,14 +35,9 @@ from rhnpush import uploadLib BUFFER_SIZE =3D 65536 HEADERS_PER_CALL =3D 25 = - class UploadClass(uploadLib.UploadClass): """ Functionality for an uploading tool """ = - - - - def list(self): # set the URL self.setURL() @@ -80,9 +74,6 @@ class UploadClass(uploadLib.UploadClass): = return self.get_newest_binary_packages() = - = - - def copyonly(self): # Set the forcing factor self.setForce() @@ -185,8 +176,6 @@ class UploadClass(uploadLib.UploadClass): # Per-package post actions self.processPackage(p, filename) = - - def _processFile(filename, relativeDir=3DNone, source=3DNone, nosig=3DNone= ): """ Processes a file Returns a hash containing: @@ -249,12 +238,6 @@ def _processFile(filename, relativeDir=3DNone, source= =3DNone, nosig=3DNone): hash['nvrea'] =3D tuple(lh) return hash = - - - - - - # returns a header from a package file on disk. def get_header(file, fildes=3DNone, source=3DNone): # rhn_rpm.get_package_header will choose the right thing to do - open = the commit d01e5b18fefa6574a919a171cd7eaa801790bd78 Author: Miroslav Such=C3=BD Date: Thu Jun 25 14:31:34 2009 +0200 base UploadClass on uploadLib.UploadClass from rhnpush diff --git a/proxy/proxy/pm/uploadLib.py b/proxy/proxy/pm/uploadLib.py index 6243741..971d01b 100644 --- a/proxy/proxy/pm/uploadLib.py +++ b/proxy/proxy/pm/uploadLib.py @@ -37,7 +37,7 @@ BUFFER_SIZE =3D 65536 HEADERS_PER_CALL =3D 25 = = -class UploadClass: +class UploadClass(uploadLib.UploadClass): """ Functionality for an uploading tool """ = = commit 6e9a3f149e41a952f961574960bab1f7f86faad0 Author: Miroslav Such=C3=BD Date: Thu Jun 25 14:27:48 2009 +0200 merge uploadLib.py - from proxy/proxy/pm to client/tools/rhnpush diff --git a/client/tools/rhnpush/uploadLib.py b/client/tools/rhnpush/uploa= dLib.py index f420de3..c87052a 100644 --- a/client/tools/rhnpush/uploadLib.py +++ b/client/tools/rhnpush/uploadLib.py @@ -493,13 +493,14 @@ class UploadClass: = = def _processFile(filename, relativeDir=3DNone, source=3DNone, nosig=3DNone= ): - # Processes a file - # Returns a hash containing: - # header - # packageSize - # md5sum - # relativePath - # nvrea + """ Processes a file + Returns a hash containing: + header + packageSize + md5sum + relativePath + nvrea + """ = # Is this a file? if not os.access(filename, os.R_OK): @@ -516,10 +517,11 @@ def _processFile(filename, relativeDir=3DNone, source= =3DNone, nosig=3DNone): f.seek(0, 0) # Read the header h =3D get_header(None, f.fileno(), source) + (header_start, header_end) =3D get_header_byte_range(f); f.close() if h is None: raise UploadError("%s is not a valid RPM file" % filename) - = + if nosig is None and not h.is_signed(): raise UploadError("ERROR: %s: unsigned rpm (use --nosig to force)" % filename) @@ -542,7 +544,9 @@ def _processFile(filename, relativeDir=3DNone, source= =3DNone, nosig=3DNone): # Build the header hash to be sent hash =3D { 'header' : Binary(h.unload()), 'md5sum' : digest, - 'packageSize' : size} + 'packageSize' : size, + 'header_start' : header_start, + 'header_end' : header_end} if relativeDir: # Append the relative dir too hash["relativePath"] =3D "%s/%s" % (relativeDir, @@ -747,3 +751,54 @@ def get_header(file, fildes=3DNone, source=3DNone): def ReportError(*args): sys.stderr.write(string.join(map(str, args)) + "\n") = +def get_header_byte_range(package_file): + """ + Return the start and end bytes of the rpm header object. + + For details of the rpm file format, see: + http://www.rpm.org/max-rpm/s1-rpm-file-format-rpm-file-format.html + """ + + lead_size =3D 96 + + # Move past the rpm lead + package_file.seek(lead_size) + + sig_size =3D get_header_struct_size(package_file) + + # Now we can find the start of the actual header. + header_start =3D lead_size + sig_size + + package_file.seek(header_start) + + header_size =3D get_header_struct_size(package_file) + + header_end =3D header_start + header_size + + return (header_start, header_end) + +def get_header_struct_size(package_file): + """ + Compute the size in bytes of the rpm header struct starting at the cur= rent + position in package_file. + """ + # Move past the header preamble + package_file.seek(8, 1) + + # Read the number of index entries + header_index =3D package_file.read(4) + (header_index_value, ) =3D struct.unpack('>I', header_index) + + # Read the the size of the header data store + header_store =3D package_file.read(4) + (header_store_value, ) =3D struct.unpack('>I', header_store) + + # The total size of the header. Each index entry is 16 bytes long. + header_size =3D 8 + 4 + 4 + header_index_value * 16 + header_store_val= ue + + # Headers end on an 8-byte boundary. Round out the extra data. + round_out =3D header_size % 8 + if round_out !=3D 0: + header_size =3D header_size + (8 - round_out) + + return header_size diff --git a/proxy/proxy/pm/uploadLib.py b/proxy/proxy/pm/uploadLib.py index 39aec0c..6243741 100644 --- a/proxy/proxy/pm/uploadLib.py +++ b/proxy/proxy/pm/uploadLib.py @@ -270,7 +270,6 @@ def get_header(file, fildes=3DNone, source=3DNone): raise UploadError("Unexpected RPM package type") return h = - def get_header_byte_range(package_file): """ Return the start and end bytes of the rpm header object. commit 0b086709c2e47f405533ec3f6a8134a6e0af220b Author: Miroslav Such=C3=BD Date: Thu Jun 25 14:15:42 2009 +0200 merget uploadLib.py - from client/tools/rhnpush to proxy/proxy/pm diff --git a/proxy/proxy/pm/uploadLib.py b/proxy/proxy/pm/uploadLib.py index 515da0f..39aec0c 100644 --- a/proxy/proxy/pm/uploadLib.py +++ b/proxy/proxy/pm/uploadLib.py @@ -13,7 +13,7 @@ # granted to use or replicate Red Hat trademarks that are incorporated # in this software or its documentation. # -# $Id: uploadLib.py,v 1.39 2005/07/05 17:39:03 wregglej Exp $ + = # system imports import os @@ -30,127 +30,19 @@ Output =3D rpclib.transports.Output = # RHN imports from common import rhn_rpm - +from rhnpush import uploadLib = # Buffer size we use for copying BUFFER_SIZE =3D 65536 HEADERS_PER_CALL =3D 25 = = -# Exception class -class UploadError(Exception): - pass - - -class ServerFault(Exception): - def __init__(self, faultCode=3DNone, faultString=3D"", faultExplanatio= n=3D""): - Exception.__init__(self) - self.faultCode =3D faultCode - self.faultString =3D faultString - self.faultExplanation =3D faultExplanation +class UploadClass: + """ Functionality for an uploading tool """ = = -class UploadClass: = - """ Functionality for an uploading tool """ = - def __init__(self, options, files=3DNone): - #CmdlineClass.__init__(self, table, argsDescription, aliasing) - self.options =3D options - self.username =3D None - self.password =3D None - self.proxy =3D None - self.proxyUsername =3D None - self.proxyPassword =3D None - self.ca_chain =3D None - self.force =3D None - self.files =3D files or [] - - def warn(self, verbose, *args): - if self.options.verbose >=3D verbose: - apply(ReportError, args) - - def die(self, errcode, *args): - apply(ReportError, args) - sys.exit(errcode) - - def setURL(self): - # Redefine this in derived classes - self.url =3D None - - def setUsernamePassword(self): - # Use the stored values, if available - username =3D self.username or self.options.username - password =3D self.password or self.options.password - self.username, self.password =3D getUsernamePassword(username, pas= sword) - - def setProxyUsernamePassword(self): - self.proxyUsername =3D None - self.proxyPassword =3D None - - def setCAchain(self): - self.ca_chain =3D None - - def setProxy(self): - self.proxy =3D None - - def setForce(self): - self.force =3D None - - def setServer(self): - self.warn(1, "Connecting to %s" % self.url) - # set the proxy - self.setProxy() - # set the CA chain - self.setCAchain() - # set the proxy username and password - self.setProxyUsernamePassword() - self.server =3D getServer(self.url, self.proxy, self.proxyUsername, - self.proxyPassword, self.ca_chain) - # Compress the output, just to be fast - self.server.set_transport_flags( - transfer=3DOutput.TRANSFER_BINARY, - encoding=3DOutput.ENCODE_GZIP) - - def setChannels(self): - if not self.options.channel: - self.die(-1, "No channel was specified") - self.channels =3D self.options.channel - self.warn(1, "Channels: %s" % string.join(self.channels)) - - setNoChannels =3D setChannels - - def setOrg(self): - self.orgId =3D -1 - - def setCount(self): - if not self.options.count: - self.count =3D HEADERS_PER_CALL - else: - self.count =3D self.options.count - - def setRelativeDir(self): - self.relativeDir =3D None - - def directory(self): - # Set the args (pretend we read them from the command line) - self.warn(2, "Uploading files from directory", self.options.dir) - self.files =3D listdir(self.options.dir) - - def filter_excludes(self): - if not self.options.exclude: - return self - for f in self.files[:]: - bf =3D os.path.basename(f) - for pattern in self.options.exclude: - if fnmatch.fnmatch(bf, pattern): - self.warn(1, "Ignoring %s" % f) - self.files.remove(f) - return self - - def readStdin(self): - self.warn(1, "Reading package names from stdin") - self.files =3D readStdin() = def list(self): # set the URL @@ -189,107 +81,7 @@ class UploadClass: return self.get_newest_binary_packages() = = - def get_newest_binary_packages(self): - # Loop through the args and only keep the newest ones - localPackagesHash =3D {} - for filename in self.files: - nvrea =3D _processFile(filename, nosig=3D1)['nvrea'] - name =3D nvrea[0] - if not localPackagesHash.has_key(name): - localPackagesHash[name] =3D {nvrea : filename} - continue - - same_names_hash =3D localPackagesHash[name] - # Already saw this name - if same_names_hash.has_key(nvrea): - # Already seen this nvrea - continue - skip_rpm =3D 0 - for local_nvrea in same_names_hash.keys(): - ret =3D packageCompare(local_nvrea, nvrea) - if ret =3D=3D 0 and local_nvrea[4] =3D=3D nvrea[4]: - # Weird case, we've already compared the two - skip_rpm =3D 1 - break - - if ret > 0: - # nvrea is older than local_nvrea - skip_rpm =3D 1 - break - - if ret < 0: - # nvrea is newer than local_nvrea - del same_names_hash[local_nvrea] - - # Different arches - go on - - if skip_rpm: - # Older - continue - = - same_names_hash[nvrea] =3D filename = - # Now get the list from the server - pkglist =3D listChannel(self.server, self.username, self.password, - self.channels) - - for p in pkglist: - name =3D p[0] - if not localPackagesHash.has_key(name): - # Not in the local list - continue - same_names_hash =3D localPackagesHash[name] - remote_nvrea =3D tuple(p[:5]) - if same_names_hash.has_key(remote_nvrea): - # The same package is already uploaded - del same_names_hash[remote_nvrea] - continue - - for local_nvrea in same_names_hash.keys(): - ret =3D packageCompare(local_nvrea, remote_nvrea) - if ret < 0: - # The remote package is newer than the local one - del same_names_hash[local_nvrea] - continue - if ret =3D=3D 0 and local_nvrea[4] =3D=3D remote_nvrea[4]: - # Same arch - del same_names_hash[local_nvrea] - continue - # This means local is newer - - # Return the list of files to push - l =3D [] - for hash in localPackagesHash.values(): - for filename in hash.values(): - l.append(filename) - l.sort() - self.files =3D l - - def get_missing_source_packages(self): - localPackagesHash =3D {} - for filename in self.files: - localPackagesHash[os.path.basename(filename)] =3D filename - = - # Now get the list from the server - pkglist =3D listMissingSourcePackages(self.server, self.username, = - self.password, self.channels) - - to_push =3D [] - for pkg in pkglist: - pkg_name, pkg_channel =3D pkg[:2] - if not localPackagesHash.has_key(pkg_name): - # We don't have it - continue - to_push.append(localPackagesHash[pkg_name]) - - to_push.sort() - self.files =3D to_push - return self.files - - def test(self): - # Test only - for p in self.files: - print p = def copyonly(self): # Set the forcing factor @@ -393,8 +185,6 @@ class UploadClass: # Per-package post actions self.processPackage(p, filename) = - def processPackage(self, package, filename): - pass = = def _processFile(filename, relativeDir=3DNone, source=3DNone, nosig=3DNone= ): @@ -459,156 +249,10 @@ def _processFile(filename, relativeDir=3DNone, sourc= e=3DNone, nosig=3DNone): hash['nvrea'] =3D tuple(lh) return hash = -def _processBatch(batch, relativeDir, source, verbose, nosig=3DNone): - sentPackages =3D {} - headersList =3D [] - for filename in batch: - if verbose: - print "Uploading %s" % filename - hash =3D _processFile(filename, relativeDir=3DrelativeDir, source= =3Dsource, = - nosig=3Dnosig) - # Get nvrea - nvrea =3D hash['nvrea'] - del hash['nvrea'] - - sentPackages[nvrea] =3D filename - - # Append the header to the list of headers to be sent out - headersList.append(hash) - return sentPackages, headersList - -def computeMD5sum(filename=3DNone, f=3DNone): - if f is None: - fd =3D open(filename, "r") - else: - fd =3D f - fd.seek(0, 0) - md5sum =3D md5.new() - while 1: - buf =3D fd.read(BUFFER_SIZE) - if not buf: - break - md5sum.update(buf) - if not f: - fd.close() - return string.join(map(lambda x: "%02x" % ord(x), md5sum.digest()), '') - - -def readStdin(): - # Reads the standard input lines and returns a list - l =3D [] - while 1: - line =3D sys.stdin.readline() - if not line: - break - l.append(string.strip(line)) - return l - - -def getUsernamePassword(cmdlineUsername, cmdlinePassword): - # Returns a username and password (either by returning the ones passed= as - # args, or the user's input - if cmdlineUsername and cmdlinePassword: - return cmdlineUsername, cmdlinePassword - - username =3D cmdlineUsername - password =3D cmdlinePassword - - # Read the username, if not already specified - tty =3D open("/dev/tty", "r+") - while not username: - tty.write("Red Hat Network username: ") - try: - username =3D tty.readline() - except KeyboardInterrupt: - tty.write("\n") - sys.exit(0) - if username is None: - # EOF - tty.write("\n") - sys.exit(0) - username =3D string.strip(username) - if username: - break - - # Now read the password - try: - password =3D getpass.getpass("Red Hat Network password: ") - except KeyboardInterrupt: - tty.write("\n") - sys.exit(0) - tty.close() - return username, password - - -def listdir(directory): - directory =3D os.path.abspath(os.path.normpath(directory)) - if not os.access(directory, os.R_OK | os.X_OK): - raise UploadError("Cannot read from directory %s" % directory) - if not os.path.isdir(directory): - raise UploadError("%s not a directory" % directory) - # Build the package list - packagesList =3D [] - for f in os.listdir(directory): - packagesList.append("%s/%s" % (directory, f)) - return packagesList - - -def call(function, *params): - # Wrapper function - try: - ret =3D apply(function, params) - except rpclib.Fault, e: - x =3D parseXMLRPCfault(e) - if x.faultString: - print x.faultString - if x.faultExplanation: - print x.faultExplanation - sys.exit(-1) - except rpclib.ProtocolError, e: - print e.errmsg - sys.exit(-1) - - return ret - - -def parseXMLRPCfault(fault): - if not isinstance(fault, rpclib.Fault): - return None - faultCode =3D fault.faultCode - if faultCode and isinstance(faultCode, type(1)): - faultCode =3D -faultCode - return ServerFault(faultCode, "", fault.faultString) - - -def listChannel(server, username, password, channels): - return call(server.packages.listChannel, channels, username, password) - -def listMissingSourcePackages(server, username, password, channels): - return call(server.packages.listMissingSourcePackages, channels, - username, password) - -def getServer(uri, proxy=3DNone, username=3DNone, password=3DNone, ca_chai= n=3DNone): - s =3D rpclib.Server(uri, proxy=3Dproxy, username=3Dusername, password= =3Dpassword) - if ca_chain: - s.add_trusted_cert(ca_chain) - return s - - -# compare two package [n,v,r,e] tuples -def packageCompare(pkg1, pkg2): - if pkg1[0] !=3D pkg2[0]: - raise ValueError("You should only compare packages with the same n= ame") - packages =3D [] - for pkg in (pkg1, pkg2): - e =3D pkg[3] - if e =3D=3D "": - e =3D None - elif e is not None: - e =3D str(e) - evr =3D (e, str(pkg[1]), str(pkg[2])) - packages.append(evr) - return rhn_rpm.labelCompare(packages[0], packages[1]) + + + + = = # returns a header from a package file on disk. @@ -627,9 +271,6 @@ def get_header(file, fildes=3DNone, source=3DNone): return h = = -def ReportError(*args): - sys.stderr.write(string.join(map(str, args)) + "\n") - def get_header_byte_range(package_file): """ Return the start and end bytes of the rpm header object. commit b598f9a05b4f32b940be7bf70ff013b44fef8081 Author: Miroslav Such=C3=BD Date: Thu Jun 25 13:38:36 2009 +0200 require rhnpush to use its uploadLib.py diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy= .spec index 74e9180..0a7216b 100644 --- a/proxy/proxy/spacewalk-proxy.spec +++ b/proxy/proxy/spacewalk-proxy.spec @@ -117,6 +117,7 @@ Group: Applications/Internet Requires: spacewalk-backend Requires: rhnlib Requires: python-optik +Requires: rhnpush BuildRequires: /usr/bin/docbook2man Obsoletes: rhn_package_manager < 5.3.0 Obsoletes: rhns-proxy-package-manager < 5.3.0 --===============0106035786199371604==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:48 2015 Content-Type: multipart/mixed; boundary="===============2753950254254082782==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Thu, 25 Jun 2009 14:01:38 +0000 Message-ID: <20090625140138.49F0C1201ED@lists.fedorahosted.org> --===============2753950254254082782== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/user/UserFactory.java = | 42 +++++++--- java/code/src/com/redhat/rhn/frontend/xmlrpc/org/test/OrgHandlerTest.java = | 1 = java/code/src/com/redhat/rhn/manager/org/MigrationManager.java = | 6 + 3 files changed, 37 insertions(+), 12 deletions(-) New commits: commit 4ff1e355b5897dba14fa561ddd97cca72042881a Author: Devan Goodwin Date: Thu Jun 25 10:59:09 2009 -0300 Fix server migration when source org has > 1000 org admins. = Oracle was spitting back an error, conveniently swalled by a catch/log in our code (now removed). Modified to batch the query into chunks of 999 if necessary and assembled the results in application code. = This change fixes OrgHandlerTest.testMigrateSystem when run against a db with more than 1000 org admins. diff --git a/java/code/src/com/redhat/rhn/domain/user/UserFactory.java b/ja= va/code/src/com/redhat/rhn/domain/user/UserFactory.java index 151794e..fdb0843 100644 --- a/java/code/src/com/redhat/rhn/domain/user/UserFactory.java +++ b/java/code/src/com/redhat/rhn/domain/user/UserFactory.java @@ -42,6 +42,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Map; = @@ -207,22 +208,41 @@ public class UserFactory extends HibernateFactory { = = /** - * Get users by their ids + * Get users by their ids. + * + * If the incoming list has more than 1000 entries, we'll chop it up a= nd run several + * queries, re-assembling the results in application code. This is to = accommodate + * Oracle's ORA-01795 error "maximum number of expressions in a list i= s 1000". + * * @param ids the ids to lookup for * @return the list of com.redhat.rhn.domain.User objects found */ - public static List lookupByIds(Collection ids) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - Query query =3D session.getNamedQuery("User.findByIds") - .setParameterList("userIds", ids); - return query.list(); + public static List lookupByIds(Collection ids) { + if (ids.size() < 1000) { + return realLookupByIds(ids); } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); + + List results =3D new LinkedList(); + List blockOfIds =3D new LinkedList(); + for (Long uid : ids) { + blockOfIds.add(uid); + if (blockOfIds.size() =3D=3D 999) { + results.addAll(realLookupByIds(blockOfIds)); + blockOfIds =3D new LinkedList(); + } } - return null; + // Deal with the remainder: + if (blockOfIds.size() > 0) { + results.addAll(realLookupByIds(blockOfIds)); + } + return results; + } + + private static List realLookupByIds(Collection ids) { + Session session =3D HibernateFactory.getSession(); + Query query =3D session.getNamedQuery("User.findByIds") + .setParameterList("userIds", ids); + return query.list(); } = /** diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/test/OrgHandl= erTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/test/OrgHand= lerTest.java index d5ce945..64786bf 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/test/OrgHandlerTest.= java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/test/OrgHandlerTest.= java @@ -640,6 +640,7 @@ public class OrgHandlerTest extends BaseHandlerTestCase= { OrgFactory.save(newOrgAdmin.getOrg()); = Server server =3D ServerTestUtils.createTestSystem(admin); + assertNotNull(server.getOrg()); List servers =3D new LinkedList(); servers.add(new Integer(server.getId().intValue())); // Actual migration is tested internally, just make sure the API c= all doesn't diff --git a/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java= b/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java index 4d8eafa..146446b 100644 --- a/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java +++ b/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java @@ -186,7 +186,11 @@ public class MigrationManager extends BaseManager { * @param server Server to be migrated. */ public static void updateAdminRelationships(Org fromOrg, Org toOrg, Se= rver server) { - = + // TODO: In some scenarios this appears to be somewhat slow, for a= n org with + // around a thousand org admins and a dozen or so servers, this ca= n take about a + // minute to run. Probably a much more efficient way to do this. (= i.e. delete + // from rhnUserServerPerms where server_id =3D blah. Add a huge nu= mber of servers to + // the mix and it could take quite some time. for (User admin : fromOrg.getActiveOrgAdmins()) { admin.removeServer(server); UserFactory.save(admin); --===============2753950254254082782==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:48 2015 Content-Type: multipart/mixed; boundary="===============2700850898306943857==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Thu, 25 Jun 2009 14:02:18 +0000 Message-ID: <20090625140218.326D41201ED@lists.fedorahosted.org> --===============2700850898306943857== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/user/UserFactory.java = | 42 +++++++--- java/code/src/com/redhat/rhn/frontend/xmlrpc/org/test/OrgHandlerTest.java = | 1 = java/code/src/com/redhat/rhn/manager/org/MigrationManager.java = | 6 + 3 files changed, 37 insertions(+), 12 deletions(-) New commits: commit 01c158453a3de333c42775fbcdbf946f8ba5b947 Author: Devan Goodwin Date: Thu Jun 25 10:59:09 2009 -0300 Fix server migration when source org has > 1000 org admins. = Oracle was spitting back an error, conveniently swalled by a catch/log in our code (now removed). Modified to batch the query into chunks of 999 if necessary and assembled the results in application code. = This change fixes OrgHandlerTest.testMigrateSystem when run against a db with more than 1000 org admins. diff --git a/java/code/src/com/redhat/rhn/domain/user/UserFactory.java b/ja= va/code/src/com/redhat/rhn/domain/user/UserFactory.java index 151794e..fdb0843 100644 --- a/java/code/src/com/redhat/rhn/domain/user/UserFactory.java +++ b/java/code/src/com/redhat/rhn/domain/user/UserFactory.java @@ -42,6 +42,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Map; = @@ -207,22 +208,41 @@ public class UserFactory extends HibernateFactory { = = /** - * Get users by their ids + * Get users by their ids. + * + * If the incoming list has more than 1000 entries, we'll chop it up a= nd run several + * queries, re-assembling the results in application code. This is to = accommodate + * Oracle's ORA-01795 error "maximum number of expressions in a list i= s 1000". + * * @param ids the ids to lookup for * @return the list of com.redhat.rhn.domain.User objects found */ - public static List lookupByIds(Collection ids) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - Query query =3D session.getNamedQuery("User.findByIds") - .setParameterList("userIds", ids); - return query.list(); + public static List lookupByIds(Collection ids) { + if (ids.size() < 1000) { + return realLookupByIds(ids); } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); + + List results =3D new LinkedList(); + List blockOfIds =3D new LinkedList(); + for (Long uid : ids) { + blockOfIds.add(uid); + if (blockOfIds.size() =3D=3D 999) { + results.addAll(realLookupByIds(blockOfIds)); + blockOfIds =3D new LinkedList(); + } } - return null; + // Deal with the remainder: + if (blockOfIds.size() > 0) { + results.addAll(realLookupByIds(blockOfIds)); + } + return results; + } + + private static List realLookupByIds(Collection ids) { + Session session =3D HibernateFactory.getSession(); + Query query =3D session.getNamedQuery("User.findByIds") + .setParameterList("userIds", ids); + return query.list(); } = /** diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/test/OrgHandl= erTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/test/OrgHand= lerTest.java index d5ce945..64786bf 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/test/OrgHandlerTest.= java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/test/OrgHandlerTest.= java @@ -640,6 +640,7 @@ public class OrgHandlerTest extends BaseHandlerTestCase= { OrgFactory.save(newOrgAdmin.getOrg()); = Server server =3D ServerTestUtils.createTestSystem(admin); + assertNotNull(server.getOrg()); List servers =3D new LinkedList(); servers.add(new Integer(server.getId().intValue())); // Actual migration is tested internally, just make sure the API c= all doesn't diff --git a/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java= b/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java index 4d8eafa..146446b 100644 --- a/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java +++ b/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java @@ -186,7 +186,11 @@ public class MigrationManager extends BaseManager { * @param server Server to be migrated. */ public static void updateAdminRelationships(Org fromOrg, Org toOrg, Se= rver server) { - = + // TODO: In some scenarios this appears to be somewhat slow, for a= n org with + // around a thousand org admins and a dozen or so servers, this ca= n take about a + // minute to run. Probably a much more efficient way to do this. (= i.e. delete + // from rhnUserServerPerms where server_id =3D blah. Add a huge nu= mber of servers to + // the mix and it could take quite some time. for (User admin : fromOrg.getActiveOrgAdmins()) { admin.removeServer(server); UserFactory.save(admin); --===============2700850898306943857==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:48 2015 Content-Type: multipart/mixed; boundary="===============8573851003949504705==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - spacewalk/config Date: Thu, 25 Jun 2009 14:08:28 +0000 Message-ID: <20090625140828.1502F1201ED@lists.fedorahosted.org> --===============8573851003949504705== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf | 4 ++++ spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit da1433774f023376f4b0eb624564b8effb654bcf Author: Devan Goodwin Date: Thu Jun 25 11:03:37 2009 -0300 Fix mod_jk failure to load. = mod_jk should only be used on RHEL 4, but on Fedora it was trying to be loaded anyhow. This is due to the fact that if mod_version is not loaded at all, the IfVersion tag that protects the mod_jk load is ignored and we load it anyhow. Found that we already load mod_version in zz-spacewalk-www.conf, but this is parsed much later. Moved the mod_version load to 00-spacewalk-mod_jk.conf. diff --git a/spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf b/s= pacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf index ed802af..6ed2090 100644 --- a/spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf +++ b/spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf @@ -1,3 +1,7 @@ + +LoadModule version_module modules/mod_version.so + + LoadModule jk_module modules/mod_jk.so diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spac= ewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf index 930ec30..5f58ea7 100644 --- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf +++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf @@ -61,10 +61,6 @@ AddType text/pxt .pxt Satisfy All = - -LoadModule version_module modules/mod_version.so - - =3D 2.1> LoadModule proxy_ajp_module modules/mod_proxy_ajp.so --===============8573851003949504705==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:48 2015 Content-Type: multipart/mixed; boundary="===============0745888800665711402==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: spacewalk/config Date: Thu, 25 Jun 2009 14:08:54 +0000 Message-ID: <20090625140854.5E03A120285@lists.fedorahosted.org> --===============0745888800665711402== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf | 4 ++++ spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 96465f00e39faca9ebc8a34cec4f98ebeac6a608 Author: Devan Goodwin Date: Thu Jun 25 11:03:37 2009 -0300 Fix mod_jk failure to load. = mod_jk should only be used on RHEL 4, but on Fedora it was trying to be loaded anyhow. This is due to the fact that if mod_version is not loaded at all, the IfVersion tag that protects the mod_jk load is ignored and we load it anyhow. Found that we already load mod_version in zz-spacewalk-www.conf, but this is parsed much later. Moved the mod_version load to 00-spacewalk-mod_jk.conf. diff --git a/spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf b/s= pacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf index ed802af..6ed2090 100644 --- a/spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf +++ b/spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf @@ -1,3 +1,7 @@ + +LoadModule version_module modules/mod_version.so + + LoadModule jk_module modules/mod_jk.so diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spac= ewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf index 930ec30..5f58ea7 100644 --- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf +++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf @@ -61,10 +61,6 @@ AddType text/pxt .pxt Satisfy All = - -LoadModule version_module modules/mod_version.so - - =3D 2.1> LoadModule proxy_ajp_module modules/mod_proxy_ajp.so --===============0745888800665711402==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:48 2015 Content-Type: multipart/mixed; boundary="===============6160339716148674954==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-backend-0.6.12-1' Date: Thu, 25 Jun 2009 14:58:01 +0000 Message-ID: <20090625145801.86D4A120285@lists.fedorahosted.org> --===============6160339716148674954== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-backend-0.6.12-1' created by John Matthews at 2009-06-25 14:52 +0000 Tagging package [spacewalk-backend] version [0.6.12-1] in directory [backen= d/]. Changes since spacewalk-setup-0.6.9-1: Devan Goodwin (2): Fix server migration when source org has > 1000 org admins. Fix mod_jk failure to load. John Matthews (1): Automatic commit of package [spacewalk-backend] release [0.6.12-1]. Milan Zazrivec (1): 508064 - fix osad installation errors on client --- backend/spacewalk-backend.spec = | 58 +++++++++- client/tools/osad/osad.spec = | 2 = java/code/src/com/redhat/rhn/domain/user/UserFactory.java = | 42 +++++-- java/code/src/com/redhat/rhn/frontend/xmlrpc/org/test/OrgHandlerTest.java = | 1 = java/code/src/com/redhat/rhn/manager/org/MigrationManager.java = | 6 - rel-eng/packages/spacewalk-backend = | 2 = spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf = | 4 = spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf = | 4 = 8 files changed, 100 insertions(+), 19 deletions(-) --- --===============6160339716148674954==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:48 2015 Content-Type: multipart/mixed; boundary="===============7871606608333697605==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-backend-0.6.13-1' Date: Thu, 25 Jun 2009 14:58:02 +0000 Message-ID: <20090625145802.296821202FF@lists.fedorahosted.org> --===============7871606608333697605== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-backend-0.6.13-1' created by John Matthews at 2009-06-25 14:52 +0000 Tagging package [spacewalk-backend] version [0.6.13-1] in directory [backen= d/]. Changes since spacewalk-backend-0.6.12-1: John Matthews (1): Automatic commit of package [spacewalk-backend] release [0.6.13-1]. --- backend/spacewalk-backend.spec | 4 ++-- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) --- --===============7871606608333697605==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:49 2015 Content-Type: multipart/mixed; boundary="===============6392534714188662211==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - backend/spacewalk-backend.spec rel-eng/packages Date: Thu, 25 Jun 2009 14:57:58 +0000 Message-ID: <20090625145758.B700B1201ED@lists.fedorahosted.org> --===============6392534714188662211== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/spacewalk-backend.spec | 58 ++++++++++++++++++++++++++++++++= ++++- rel-eng/packages/spacewalk-backend | 2 - 2 files changed, 58 insertions(+), 2 deletions(-) New commits: commit 7cc7272605a1dc0dbc58e9135fba4f23eea7b0f3 Author: John Matthews Date: Thu Jun 25 10:52:38 2009 -0400 Automatic commit of package [spacewalk-backend] release [0.6.13-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index c79cddc..363b0e6 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -7,7 +7,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/p= roxies Group: Applications/Internet License: GPLv2 -Version: 0.6.12 +Version: 0.6.13 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz @@ -568,7 +568,7 @@ rm -f %{rhnconf}/rhnSecret.py* = # $Id$ %changelog -* Thu Jun 25 2009 John Matthews 0.6.12-1 +* Thu Jun 25 2009 John Matthews 0.6.13-1 - change comments to docstrings (msuchy(a)redhat.com) - change comments to docstrings (msuchy(a)redhat.com) - change comments to docstrings (msuchy(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewal= k-backend index 08b83df..fc0fa73 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -0.6.12-1 backend/ +0.6.13-1 backend/ commit d10cf68f0d7d348423d47f1f5d5c7520c9aaf7d2 Author: John Matthews Date: Thu Jun 25 10:52:36 2009 -0400 Automatic commit of package [spacewalk-backend] release [0.6.12-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index f6f334c..c79cddc 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -7,7 +7,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/p= roxies Group: Applications/Internet License: GPLv2 -Version: 0.6.11 +Version: 0.6.12 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz @@ -568,6 +568,62 @@ rm -f %{rhnconf}/rhnSecret.py* = # $Id$ %changelog +* Thu Jun 25 2009 John Matthews 0.6.12-1 +- change comments to docstrings (msuchy(a)redhat.com) +- change comments to docstrings (msuchy(a)redhat.com) +- change comments to docstrings (msuchy(a)redhat.com) +- change comments to docstrings (msuchy(a)redhat.com) +- change comments to docstrings (msuchy(a)redhat.com) +- change comments to docstrings (msuchy(a)redhat.com) +- change comments to docstrings (msuchy(a)redhat.com) +- change comments to docstrings (msuchy(a)redhat.com) +- change comments to docstrings (msuchy(a)redhat.com) +- change comments to docstrings (msuchy(a)redhat.com) +- 499723 - accept follow-redirects with value greater then 2 + (msuchy(a)redhat.com) +- change comments to docstrings (msuchy(a)redhat.com) +- change comments to docstrings (msuchy(a)redhat.com) +- 507867 - Schedule repo gen once the channel package associations is comp= lete + (pkilambi(a)redhat.com) +- 505680 - channel_product_id is computed based on the name, product and + version so it will not match the cache as cache is always None. Also dont + update the channel_product_id uless the id is different from whats being + updated (pkilambi(a)redhat.com) +- Update HACKING file for backend test instructions. (dgoodwin(a)redhat.co= m) +- Integrate some PostgreSQL rhnSQL driver unit tests. (dgoodwin(a)redhat.c= om) +- First cut of a unit test framework for Python backend. (dgoodwin(a)redha= t.com) +- 507593 - fixing eus registration tracebacks (pkilambi(a)redhat.com) +- Adding repodata details for a given channel to channelDetails page. + (pkilambi(a)redhat.com) +- Revert "503090 - Exclude rhnlib from kickstart profile sync." + (dgoodwin(a)redhat.com) +- remove short package dependency on rpms. User might wanna skip the rpms = and + still import metadata. (pkilambi(a)redhat.com) +- 422611 - Warn that satrm.py is not a supported script. (dgoodwin(a)redha= t.com) +- fixing the unsubscriptable object error when package is not yet in rhnPa= ckage + table (pkilambi(a)redhat.com) +- 506264 - This commit includes: (pkilambi(a)redhat.com) +- 505680 - When satsync tries to do an import it compares whats in cache t= o db + and tries to import only new content, but since the last_modified date a= lways + differ we end up updating the rhnChannel table even when there is nothin= g to + sync. Adding last_modified to ignore keys list so that we dont decide the + diff based on this field. We still continue to compare the rest of the + fields. (pkilambi(a)redhat.com) +- 495790 - force uploading a package ends up with duplicate entries in + rhnPackage table. This is because we use md5sum along with name, evr, pa= ckage + arch and org as a primary key while deciding whether to perform an inser= t or + an update. Since the solaris packages had same nvrea and org and differe= nt + md5 sums it was doing an insert instead of update on the existing row. F= ixed + the schema wrapper to only use md5sum as a primary key if nvrea feature = is + enabled. Also fixed the package uniquifies to use md5sum only for nvrea. + (pkilambi(a)redhat.com) +- Catch the systemExit and preserve the error code. Also fixing the traceb= ack + issue when db is not accessible (pkilambi(a)redhat.com) +- removing bugzilla handler specific tests (pkilambi(a)redhat.com) +- 502581 - splitting the data to smaller chunks to please cx_oracle to avo= id + throwing array too big errors (pkilambi(a)redhat.com) +- 503090 - Exclude rhnlib from kickstart profile sync. (dgoodwin(a)redhat.= com) + * Fri Jun 05 2009 jesus m. rodriguez 0.6.11-1 - fixing duplicate entries in repogen tables and other clean aup (pkilambi(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewal= k-backend index f1b09da..08b83df 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -0.6.11-1 backend/ +0.6.12-1 backend/ --===============6392534714188662211==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:49 2015 Content-Type: multipart/mixed; boundary="===============4488314596432284989==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: backend/common Date: Thu, 25 Jun 2009 15:14:27 +0000 Message-ID: <20090625151427.787EA1201ED@lists.fedorahosted.org> --===============4488314596432284989== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/common/rhnRepository.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2d5fd4346ea458a8d5371387106e32fb533c038b Author: Pradeep Kilambi Date: Thu Jun 25 11:14:20 2009 -0400 fixing indent error diff --git a/backend/common/rhnRepository.py b/backend/common/rhnRepository= .py index fabb781..85e0408 100644 --- a/backend/common/rhnRepository.py +++ b/backend/common/rhnRepository.py @@ -106,7 +106,7 @@ class Repository(RPC_Base): = if redirectsSupported: log_debug(3, "Client supports redirects.") - filePath =3D self.getPackagePath(pkg_spec, 1) = + filePath =3D self.getPackagePath(pkg_spec, 1) = else: #older clients just return the hosted url and download the pac= kage filePath =3D self.getPackagePath(pkg_spec) --===============4488314596432284989==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:49 2015 Content-Type: multipart/mixed; boundary="===============1650879641082624914==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: backend/spacewalk-backend.spec rel-eng/packages Date: Thu, 25 Jun 2009 15:15:12 +0000 Message-ID: <20090625151512.525501201ED@lists.fedorahosted.org> --===============1650879641082624914== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/spacewalk-backend.spec | 4 ++-- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 26846e62da3dc5c277e78f8b89a96de63eee9ef7 Author: John Matthews Date: Thu Jun 25 11:09:58 2009 -0400 Automatic commit of package [spacewalk-backend] release [0.6.14-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 363b0e6..350d207 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -7,7 +7,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/p= roxies Group: Applications/Internet License: GPLv2 -Version: 0.6.13 +Version: 0.6.14 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz @@ -568,7 +568,7 @@ rm -f %{rhnconf}/rhnSecret.py* = # $Id$ %changelog -* Thu Jun 25 2009 John Matthews 0.6.13-1 +* Thu Jun 25 2009 John Matthews 0.6.14-1 - change comments to docstrings (msuchy(a)redhat.com) - change comments to docstrings (msuchy(a)redhat.com) - change comments to docstrings (msuchy(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewal= k-backend index fc0fa73..f4be8cc 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -0.6.13-1 backend/ +0.6.14-1 backend/ --===============1650879641082624914==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:49 2015 Content-Type: multipart/mixed; boundary="===============7058929241617328695==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-backend-0.6.14-1' Date: Thu, 25 Jun 2009 15:15:14 +0000 Message-ID: <20090625151514.7F1EF120285@lists.fedorahosted.org> --===============7058929241617328695== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-backend-0.6.14-1' created by John Matthews at 2009-06-25 15:09 +0000 Tagging package [spacewalk-backend] version [0.6.14-1] in directory [backen= d/]. Changes since spacewalk-backend-0.6.13-1: John Matthews (1): Automatic commit of package [spacewalk-backend] release [0.6.14-1]. Pradeep Kilambi (1): fixing indent error --- backend/common/rhnRepository.py | 2 +- backend/spacewalk-backend.spec | 4 ++-- rel-eng/packages/spacewalk-backend | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) --- --===============7058929241617328695==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:49 2015 Content-Type: multipart/mixed; boundary="===============4986531976618515755==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: rel-eng/packages schema/spacewalk Date: Thu, 25 Jun 2009 15:22:11 +0000 Message-ID: <20090625152211.740AF1201ED@lists.fedorahosted.org> --===============4986531976618515755== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit b2b5c1e02e182e79672115bbb9ac823fbcbb22ed Author: John Matthews Date: Thu Jun 25 11:16:57 2009 -0400 Automatic commit of package [spacewalk-schema] release [0.6.11-1]. diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk= -schema index 5515c1a..35a7328 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -0.6.10-1 schema/spacewalk/ +0.6.11-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spac= ewalk-schema.spec index 3a3957f..31adf3b 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: 0.6.10 +Version: 0.6.11 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz = @@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-schema-upgrade* = %changelog +* Thu Jun 25 2009 John Matthews 0.6.11-1 +- rebuild = + * Thu Jun 25 2009 Milan Zazrivec 0.6.10-1 - 506272 - insert sub4v rows only if they do not exist - 431673 - reworking rhnServerNeededView for performance fixes. --===============4986531976618515755==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:49 2015 Content-Type: multipart/mixed; boundary="===============4166590537367627268==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-schema-0.6.11-1' Date: Thu, 25 Jun 2009 15:22:13 +0000 Message-ID: <20090625152213.CABB6120304@lists.fedorahosted.org> --===============4166590537367627268== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-schema-0.6.11-1' created by John Matthews at 2009-06-25 15:16 +0000 Tagging package [spacewalk-schema] version [0.6.11-1] in directory [schema/= spacewalk/]. Changes since spacewalk-backend-0.6.14-1: John Matthews (1): Automatic commit of package [spacewalk-schema] release [0.6.11-1]. --- rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) --- --===============4166590537367627268==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:49 2015 Content-Type: multipart/mixed; boundary="===============3442720233862654258==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Thu, 25 Jun 2009 15:41:14 +0000 Message-ID: <20090625154114.B8D861201ED@lists.fedorahosted.org> --===============3442720233862654258== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/action/ActionFactory.java = | 32 - java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java = | 13 = java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java = | 179 ++----- java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java = | 21 = java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterFactor= y.java | 16 = java/code/src/com/redhat/rhn/domain/org/OrgImpl.java = | 22 = java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java = | 14 = java/code/src/com/redhat/rhn/domain/role/RoleFactory.java = | 39 - java/code/src/com/redhat/rhn/domain/satellite/CertificateFactory.java = | 15 = java/code/src/com/redhat/rhn/domain/satellite/SatelliteFactory.java = | 11 = java/code/src/com/redhat/rhn/domain/server/ServerFactory.java = | 56 -- java/code/src/com/redhat/rhn/domain/session/WebSessionFactory.java = | 28 - java/code/src/com/redhat/rhn/domain/task/TaskFactory.java = | 37 - java/code/src/com/redhat/rhn/domain/user/UserFactory.java = | 236 +++------- 14 files changed, 216 insertions(+), 503 deletions(-) New commits: commit 418c807411eaad10462e9746c2b5d512583d9b8b Author: Devan Goodwin Date: Thu Jun 25 12:39:14 2009 -0300 Remove catch/log return null of HibernateExceptions. = Dangerous thing to do, can result in getting back null or no results, when infact you expect results, and the only indication that something went wrong is a single line error message in the logs. HibernateException indicates something is wrong, should not be hidden. diff --git a/java/code/src/com/redhat/rhn/domain/action/ActionFactory.java = b/java/code/src/com/redhat/rhn/domain/action/ActionFactory.java index 1cda1ae..e5a94e2 100644 --- a/java/code/src/com/redhat/rhn/domain/action/ActionFactory.java +++ b/java/code/src/com/redhat/rhn/domain/action/ActionFactory.java @@ -461,17 +461,9 @@ public class ActionFactory extends HibernateFactory { * @return the Action found */ public static Action lookupById(Long id) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - Action a =3D (Action)session.get(Action.class, id); - return a; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - throw new HibernateRuntimeException( - "HibernateException while trying to lookup Action", he); - } + Session session =3D HibernateFactory.getSession(); + Action a =3D (Action)session.get(Action.class, id); + return a; } = /** @@ -525,19 +517,11 @@ public class ActionFactory extends HibernateFactory { */ public static ConfigRevisionAction = lookupConfigRevisionAction(Long id) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - ConfigRevisionAction c =3D (ConfigRevisionAction) session. - get(ConfigRevisionAction.c= lass, - id); - return c; - } = - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString(), he); - = - } - return null; + + Session session =3D HibernateFactory.getSession(); + ConfigRevisionAction c =3D (ConfigRevisionAction) session. + get(ConfigRevisionAction.class, id); + return c; } = /** diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.jav= a b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java index 4837cf1..06d5248 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java +++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java @@ -70,16 +70,9 @@ public class ChannelFactory extends HibernateFactory { * @return the Channel found */ public static Channel lookupById(Long id) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - Channel c =3D (Channel) session.get(Channel.class, id); - return c; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session =3D HibernateFactory.getSession(); + Channel c =3D (Channel) session.get(Channel.class, id); + return c; } = /** diff --git a/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactor= y.java b/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.ja= va index 00592d6..4eabe31 100644 --- a/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java +++ b/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java @@ -26,7 +26,6 @@ import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; = import org.apache.log4j.Logger; -import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.criterion.Restrictions; = @@ -318,16 +317,9 @@ public class ConfigurationFactory extends HibernateFac= tory { * @return the ConfigChannel found or null if not found. */ public static ConfigChannel lookupConfigChannelById(Long id) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - ConfigChannel c =3D (ConfigChannel)session.get(ConfigChannel.c= lass, id); - return c; - } = - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session =3D HibernateFactory.getSession(); + ConfigChannel c =3D (ConfigChannel)session.get(ConfigChannel.class= , id); + return c; } = /** @@ -341,37 +333,24 @@ public class ConfigurationFactory extends HibernateFa= ctory { public static ConfigChannel lookupConfigChannelByLabel(String label, Org org, ConfigChannelTyp= e cct) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - ConfigChannel c =3D (ConfigChannel) session.createCriteria(Con= figChannel.class). - add(Restrictions.eq("org", org)). - add(Restrictions.eq("label", label)). - add(Restrictions.eq("configChannelType", cct)). - uniqueResult(); - return c; - } = - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session =3D HibernateFactory.getSession(); + ConfigChannel c =3D (ConfigChannel) session.createCriteria(ConfigC= hannel.class). + add(Restrictions.eq("org", org)). + add(Restrictions.eq("label", label)). + add(Restrictions.eq("configChannelType", cct)). + uniqueResult(); + return c; } = + /** * Lookup a ConfigFile by its id * @param id The identifier for the ConfigFile * @return the ConfigFile found or null if not found. */ public static ConfigFile lookupConfigFileById(Long id) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - ConfigFile c =3D (ConfigFile)session.get(ConfigFile.class, id); - return c; - } = - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session =3D HibernateFactory.getSession(); + ConfigFile c =3D (ConfigFile)session.get(ConfigFile.class, id); + return c; } = /** @@ -381,24 +360,16 @@ public class ConfigurationFactory extends HibernateFa= ctory { * @return the ConfigFile found or null if not found. */ public static ConfigFile lookupConfigFileByChannelAndName(Long channel= , Long name) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - return (ConfigFile) = - session.getNamedQuery("ConfigFile.findByChannelAndName") - .setLong("channel_id", channel.longValue()) - .setLong("name_id", name.longValue()) - .setLong("state_id", ConfigFileState.normal(). - getId().longValue(= )) - //Retrieve from cache if there - .setCacheable(true) - .uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - - return null; + Session session =3D HibernateFactory.getSession(); + return (ConfigFile) + session.getNamedQuery("ConfigFile.findByChannelAndName") + .setLong("channel_id", channel.longValue()) + .setLong("name_id", name.longValue()) + .setLong("state_id", ConfigFileState.normal(). + getId().longValue()) + //Retrieve from cache if there + .setCacheable(true) + .uniqueResult(); } = /** @@ -407,16 +378,9 @@ public class ConfigurationFactory extends HibernateFac= tory { * @return The sought for ConfigRevision or null if not found. */ public static ConfigRevision lookupConfigRevisionById(Long id) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - ConfigRevision a =3D (ConfigRevision)session.get(ConfigRevisio= n.class, id); - return a; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session =3D HibernateFactory.getSession(); + ConfigRevision a =3D (ConfigRevision)session.get(ConfigRevision.cl= ass, id); + return a; } = /** @@ -425,16 +389,9 @@ public class ConfigurationFactory extends HibernateFac= tory { * @return The sought for ConfigInfo or null if not found. */ public static ConfigInfo lookupConfigInfoById(Long id) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - ConfigInfo c =3D (ConfigInfo)session.get(ConfigInfo.class, id); - return c; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session =3D HibernateFactory.getSession(); + ConfigInfo c =3D (ConfigInfo)session.get(ConfigInfo.class, id); + return c; } = /** @@ -443,16 +400,9 @@ public class ConfigurationFactory extends HibernateFac= tory { * @return The sought for ConfigFileName or null if not found. */ public static ConfigFileName lookupConfigFileNameById(Long id) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - ConfigFileName c =3D (ConfigFileName)session.get(ConfigFileNam= e.class, id); - return c; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session =3D HibernateFactory.getSession(); + ConfigFileName c =3D (ConfigFileName)session.get(ConfigFileName.cl= ass, id); + return c; } = = @@ -465,21 +415,13 @@ public class ConfigurationFactory extends HibernateFa= ctory { * @return A sought for ConfigChannelType or null */ static ConfigChannelType lookupConfigChannelTypeByLabel(String label)= { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - return (ConfigChannelType) = - session.getNamedQuery("ConfigChannelType.findByLabel") - .setString("label", label) - //Retrieve from cache if there - .setCacheable(true) - .uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - - return null; + Session session =3D HibernateFactory.getSession(); + return (ConfigChannelType) + session.getNamedQuery("ConfigChannelType.findByLabel") + .setString("label", label) + //Retrieve from cache if there + .setCacheable(true) + .uniqueResult(); } = /** @@ -491,20 +433,12 @@ public class ConfigurationFactory extends HibernateFa= ctory { * @return A sought for ConfigFileState or null */ static ConfigFileState lookupConfigFileStateByLabel(String label) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - return (ConfigFileState)session.getNamedQuery("ConfigFileState= .findByLabel") - .setString("label", label) - //Retrieve from cache if there - .setCacheable(true) - .uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - - return null; + Session session =3D HibernateFactory.getSession(); + return (ConfigFileState)session.getNamedQuery("ConfigFileState.fin= dByLabel") + .setString("label", label) + //Retrieve from cache if there + .setCacheable(true) + .uniqueResult(); } = /** @@ -513,21 +447,14 @@ public class ConfigurationFactory extends HibernateFa= ctory { * @return config filetype object */ static ConfigFileType lookupConfigFileTypeByLabel(String label) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - return (ConfigFileType)session.getNamedQuery("ConfigFileType.f= indByLabel") - .setString("label", label) - //Retrieve from cache if there - .setCacheable(true) - .uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - - return null; + Session session =3D HibernateFactory.getSession(); + return (ConfigFileType)session.getNamedQuery("ConfigFileType.findB= yLabel") + .setString("label", label) + //Retrieve from cache if there + .setCacheable(true) + .uniqueResult(); } + /** * Return a ConfigInfo for the username, groupname, and * file mode given. If no corresponding entry exists yet in the databa= se, one will be diff --git a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java = b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java index 22e57c2..d3962d6 100644 --- a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java +++ b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java @@ -601,22 +601,15 @@ public class ErrataFactory extends HibernateFactory { * @return the Errata found */ public static Errata lookupById(Long id) { - Session session =3D null; - try { - //Look for published Errata first - session =3D HibernateFactory.getSession(); - Errata errata =3D (Errata) session.get(PublishedErrata.class, = id); + //Look for published Errata first + Session session =3D HibernateFactory.getSession(); + Errata errata =3D (Errata) session.get(PublishedErrata.class, id); = - //If we nothing was found, look for it in the Unpublished Erra= ta table... - if (errata =3D=3D null) { - errata =3D (Errata) session.get(UnpublishedErrata.class, i= d); - } - return errata; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); + //If we nothing was found, look for it in the Unpublished Errata t= able... + if (errata =3D=3D null) { + errata =3D (Errata) session.get(UnpublishedErrata.class, id); } - return null; + return errata; } = /** diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatC= lusterFactory.java b/java/code/src/com/redhat/rhn/domain/monitoring/satclus= ter/SatClusterFactory.java index b64edc8..337681c 100644 --- a/java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterF= actory.java +++ b/java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterF= actory.java @@ -22,7 +22,6 @@ import java.util.List; = import org.apache.commons.lang.RandomStringUtils; import org.apache.log4j.Logger; -import org.hibernate.HibernateException; import org.hibernate.Session; = import com.redhat.rhn.common.hibernate.HibernateFactory; @@ -50,17 +49,10 @@ public class SatClusterFactory extends HibernateFactory= { } = private static PhysicalLocation lookupPhysicalLocation(Long id) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - PhysicalLocation u =3D (PhysicalLocation) - session.get(PhysicalLocation.class, id); - return u; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session =3D HibernateFactory.getSession(); + PhysicalLocation u =3D (PhysicalLocation) + session.get(PhysicalLocation.class, id); + return u; } = /** diff --git a/java/code/src/com/redhat/rhn/domain/org/OrgImpl.java b/java/co= de/src/com/redhat/rhn/domain/org/OrgImpl.java index 48cbd7c..ed26a7c 100644 --- a/java/code/src/com/redhat/rhn/domain/org/OrgImpl.java +++ b/java/code/src/com/redhat/rhn/domain/org/OrgImpl.java @@ -29,7 +29,6 @@ import java.util.Set; = import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.log4j.Logger; -import org.hibernate.HibernateException; import org.hibernate.Session; = import com.redhat.rhn.common.db.datasource.CallableMode; @@ -444,22 +443,15 @@ public class OrgImpl extends BaseDomainHelper impleme= nts Org { = /** {@inheritDoc} */ public int numActiveOrgAdmins() { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - List list =3D session.getNamedQuery("Org.numOfOrgAdmins") - .setParameter("org_id", this.getId()) - // Retrieve from cache if there - .list(); - if (list !=3D null) { - return list.size(); - } - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); + Session session =3D HibernateFactory.getSession(); + List list =3D session.getNamedQuery("Org.numOfOrgAdmins") + .setParameter("org_id", this.getId()) + // Retrieve from cache if there + .list(); + if (list !=3D null) { + return list.size(); } return 0; - } = /** diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFacto= ry.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.= java index 25e375f..9eaa9bd 100644 --- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java +++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java @@ -19,7 +19,6 @@ import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.hibernate.HibernateFactory; = import org.apache.log4j.Logger; -import org.hibernate.HibernateException; import org.hibernate.Session; = import java.sql.Types; @@ -86,16 +85,9 @@ public class PackageEvrFactory { * @return the PackageEvr found */ public static PackageEvr lookupPackageEvrById(Long id) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - return (PackageEvr) session.getNamedQuery("PackageEvr.findById= ").setString( - "id", id.toString()).uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception (PackageEvr): " + he.toString()= ); - } - return null; + Session session =3D HibernateFactory.getSession(); + return (PackageEvr) session.getNamedQuery("PackageEvr.findById").s= etString( + "id", id.toString()).uniqueResult(); } = } diff --git a/java/code/src/com/redhat/rhn/domain/role/RoleFactory.java b/ja= va/code/src/com/redhat/rhn/domain/role/RoleFactory.java index b2cf5eb..fc2a403 100644 --- a/java/code/src/com/redhat/rhn/domain/role/RoleFactory.java +++ b/java/code/src/com/redhat/rhn/domain/role/RoleFactory.java @@ -17,7 +17,6 @@ package com.redhat.rhn.domain.role; import com.redhat.rhn.common.hibernate.HibernateFactory; = import org.apache.log4j.Logger; -import org.hibernate.HibernateException; import org.hibernate.Session; = /** @@ -54,19 +53,12 @@ public class RoleFactory extends HibernateFactory { * @return the Role with the given id. */ public static Role lookupById(Long id) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - return (Role) session.getNamedQuery("Role.findById") - .setString("id", id.toString()) - //Retrieve from cache if there - .setCacheable(true) - .uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session =3D HibernateFactory.getSession(); + return (Role) session.getNamedQuery("Role.findById") + .setString("id", id.toString()) + //Retrieve from cache if there + .setCacheable(true) + .uniqueResult(); } = /** @@ -75,19 +67,12 @@ public class RoleFactory extends HibernateFactory { * @return statetype whose name matches the given name. */ public static Role lookupByLabel(String name) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - return (Role) session.getNamedQuery("Role.findByLabel") - .setString("label", name) - //Retrieve from cache if there - .setCacheable(true) - .uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session =3D HibernateFactory.getSession(); + return (Role) session.getNamedQuery("Role.findByLabel") + .setString("label", name) + //Retrieve from cache if there + .setCacheable(true) + .uniqueResult(); } = /** diff --git a/java/code/src/com/redhat/rhn/domain/satellite/CertificateFacto= ry.java b/java/code/src/com/redhat/rhn/domain/satellite/CertificateFactory.= java index 9e52ce4..b73c259 100644 --- a/java/code/src/com/redhat/rhn/domain/satellite/CertificateFactory.java +++ b/java/code/src/com/redhat/rhn/domain/satellite/CertificateFactory.java @@ -17,7 +17,6 @@ package com.redhat.rhn.domain.satellite; import com.redhat.rhn.common.hibernate.HibernateFactory; = import org.apache.log4j.Logger; -import org.hibernate.HibernateException; = /** * SatelliteFactory @@ -44,16 +43,10 @@ public class CertificateFactory extends HibernateFactor= y { * @return the newest versiono of the satellite's certificate */ public static SatelliteCertificate lookupNewestCertificate() { - try { - return (SatelliteCertificate) singleton.lookupObjectByNamedQue= ry( - "SatelliteCertificate.lookupNewestCertificate", - null, - false); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + return (SatelliteCertificate) singleton.lookupObjectByNamedQuery( + "SatelliteCertificate.lookupNewestCertificate", + null, + false); } = } diff --git a/java/code/src/com/redhat/rhn/domain/satellite/SatelliteFactory= .java b/java/code/src/com/redhat/rhn/domain/satellite/SatelliteFactory.java index 6fa05fe..ee0da4f 100644 --- a/java/code/src/com/redhat/rhn/domain/satellite/SatelliteFactory.java +++ b/java/code/src/com/redhat/rhn/domain/satellite/SatelliteFactory.java @@ -17,7 +17,6 @@ package com.redhat.rhn.domain.satellite; import com.redhat.rhn.common.hibernate.HibernateFactory; = import org.apache.log4j.Logger; -import org.hibernate.HibernateException; = /** * SatelliteFactory @@ -44,13 +43,7 @@ public class SatelliteFactory extends HibernateFactory { * @return the newest version of the satellite's certificate */ public static SatelliteCertificate lookupNewestCertificate() { - try { - return (SatelliteCertificate) singleton.lookupObjectByNamedQue= ry( - "SatelliteCertificate.lookupNewestCertificate", null, f= alse); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + return (SatelliteCertificate) singleton.lookupObjectByNamedQuery( + "SatelliteCertificate.lookupNewestCertificate", null, false= ); } } diff --git a/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java = b/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java index 36c8ac6..2ac9d88 100644 --- a/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java +++ b/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java @@ -31,7 +31,6 @@ import com.redhat.rhn.manager.system.UpdateBaseChannelCom= mand; = import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; -import org.hibernate.HibernateException; import org.hibernate.Session; = import java.sql.Types; @@ -69,19 +68,12 @@ public class ServerFactory extends HibernateFactory { return null; } = - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - return (CustomDataValue) session.getNamedQuery( - "CustomDataValue.findByServerAndKey").setEntity("serve= r", - server).setEntity("key", key) - // Retrieve from cache if there - .setCacheable(true).uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session =3D HibernateFactory.getSession(); + return (CustomDataValue) session.getNamedQuery( + "CustomDataValue.findByServerAndKey").setEntity("server", + server).setEntity("key", key) + // Retrieve from cache if there + .setCacheable(true).uniqueResult(); } = /** @@ -325,19 +317,11 @@ public class ServerFactory extends HibernateFactory { * @return The ServerArch */ public static ServerArch lookupServerArchByLabel(String label) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - return (ServerArch) session.getNamedQuery("ServerArch.findByLa= bel") - .setString("label", label) - // Retrieve from cache if there - .setCacheable(true).uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - - return null; + Session session =3D HibernateFactory.getSession(); + return (ServerArch) session.getNamedQuery("ServerArch.findByLabel") + .setString("label", label) + // Retrieve from cache if there + .setCacheable(true).uniqueResult(); } = /** @@ -346,19 +330,11 @@ public class ServerFactory extends HibernateFactory { * @return The CPUArch */ public static CPUArch lookupCPUArchByName(String name) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - return (CPUArch) session.getNamedQuery("CPUArch.findByName") - .setString("name", name) - // Retrieve from cache if there - .setCacheable(true).uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - - return null; + Session session =3D HibernateFactory.getSession(); + return (CPUArch) session.getNamedQuery("CPUArch.findByName") + .setString("name", name) + // Retrieve from cache if there + .setCacheable(true).uniqueResult(); } = /** diff --git a/java/code/src/com/redhat/rhn/domain/session/WebSessionFactory.= java b/java/code/src/com/redhat/rhn/domain/session/WebSessionFactory.java index b8774b5..c90a31f 100644 --- a/java/code/src/com/redhat/rhn/domain/session/WebSessionFactory.java +++ b/java/code/src/com/redhat/rhn/domain/session/WebSessionFactory.java @@ -18,7 +18,6 @@ import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.domain.user.User; = import org.apache.log4j.Logger; -import org.hibernate.HibernateException; import org.hibernate.Query; import org.hibernate.Session; = @@ -60,18 +59,8 @@ public class WebSessionFactory extends HibernateFactory { * @return the Session found */ public static WebSession lookupById(Long id) { - - Session session =3D null; - = - try { - session =3D HibernateFactory.getSession(); - return (WebSession)session.get(WebSessionImpl.class, id); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - - return null; + Session session =3D HibernateFactory.getSession(); + return (WebSession)session.get(WebSessionImpl.class, id); } = /** @@ -98,15 +87,10 @@ public class WebSessionFactory extends HibernateFactory= { * @param user the user whose sessions are to be purged. */ public static void purgeUserSessions(User user) { - try { - Session session =3D HibernateFactory.getSession(); - Query query =3D session.getNamedQuery("WebSession.deleteByUser= Id"); - query.setParameter("user_id", user.getId()); - query.executeUpdate(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } + Session session =3D HibernateFactory.getSession(); + Query query =3D session.getNamedQuery("WebSession.deleteByUserId"); + query.setParameter("user_id", user.getId()); + query.executeUpdate(); } } = diff --git a/java/code/src/com/redhat/rhn/domain/task/TaskFactory.java b/ja= va/code/src/com/redhat/rhn/domain/task/TaskFactory.java index 57cd66f..70c71f1 100644 --- a/java/code/src/com/redhat/rhn/domain/task/TaskFactory.java +++ b/java/code/src/com/redhat/rhn/domain/task/TaskFactory.java @@ -19,7 +19,6 @@ import com.redhat.rhn.domain.org.Org; = import org.apache.log4j.Logger; import org.hibernate.Criteria; -import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.criterion.CriteriaSpecification; import org.hibernate.criterion.Order; @@ -82,19 +81,12 @@ public class TaskFactory extends HibernateFactory { * @return Returns the task that matches all three parameters or null. */ public static Task lookup(Org org, String name, Long data) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - return (Task) session.getNamedQuery("Task.lookup") - .setString("name", name) - .setLong("data", data.longValue()) - .setEntity("org", org) - .uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session =3D HibernateFactory.getSession(); + return (Task) session.getNamedQuery("Task.lookup") + .setString("name", name) + .setLong("data", data.longValue()) + .setEntity("org", org) + .uniqueResult(); } = /** @@ -103,18 +95,11 @@ public class TaskFactory extends HibernateFactory { * @return Returns a list of task objects */ public static List getTaskListByChannel(Org org) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - return session.getNamedQuery("Task.lookupByOrgAndName") - .setEntity("org", org) - .setString("name", "update_errata_cache_by_chann= el") - .list(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session =3D HibernateFactory.getSession(); + return session.getNamedQuery("Task.lookupByOrgAndName") + .setEntity("org", org) + .setString("name", "update_errata_cache_by_channel") + .list(); } = /** diff --git a/java/code/src/com/redhat/rhn/domain/user/UserFactory.java b/ja= va/code/src/com/redhat/rhn/domain/user/UserFactory.java index fdb0843..0d8b965 100644 --- a/java/code/src/com/redhat/rhn/domain/user/UserFactory.java +++ b/java/code/src/com/redhat/rhn/domain/user/UserFactory.java @@ -31,7 +31,6 @@ import com.redhat.rhn.manager.session.SessionManager; = import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; -import org.hibernate.HibernateException; import org.hibernate.Query; import org.hibernate.Session; = @@ -83,20 +82,13 @@ public class UserFactory extends HibernateFactory { * @return Returns the appropriate state (or null). */ private static State loadState(String label) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - State state =3D (State) session.getNamedQuery("UserState.looku= pByLabel") - .setParameter("label", label) - //Retrieve from cache if there - .setCacheable(true) - .uniqueResult(); - return state; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session =3D HibernateFactory.getSession(); + State state =3D (State) session.getNamedQuery("UserState.lookupByL= abel") + .setParameter("label", label) + //Retrieve from cache if there + .setCacheable(true) + .uniqueResult(); + return state; } = /** @@ -106,25 +98,19 @@ public class UserFactory extends HibernateFactory { * @return the responsible user (first org admin) of the org. */ public static User findResponsibleUser(Long orgId, Role r) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - Iterator itr =3D session.getNamedQuery("User.findResponsibleUs= er") - .setParameter("org_id", orgId) - .setParameter("type_id", r.ge= tId()) - //Retrieve from cache if there - .list().iterator(); - if (itr.hasNext()) { - // only care about the first one - Object[] row =3D (Object[])itr.next(); - User u =3D createUser(); - u.setId((Long) row[0]); - u.setLogin((String)row[1]); - return u; - } - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); + Session session =3D HibernateFactory.getSession(); + Iterator itr =3D session.getNamedQuery("User.findResponsibleUser") + .setParameter("org_id", orgId) + .setParameter("type_id", r.getId(= )) + //Retrieve from cache if there + .list().iterator(); + if (itr.hasNext()) { + // only care about the first one + Object[] row =3D (Object[])itr.next(); + User u =3D createUser(); + u.setId((Long) row[0]); + u.setLogin((String)row[1]); + return u; } return null; } @@ -136,21 +122,15 @@ public class UserFactory extends HibernateFactory { */ public static User findRandomOrgAdmin(Org orgIn) { Role r =3D RoleFactory.ORG_ADMIN; - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - Iterator itr =3D session.getNamedQuery("User.findRandomOrgAdmi= n") - .setParameter("org_id", orgIn= .getId()) - .setParameter("type_id", r.ge= tId()) - //Retrieve from cache if there - .list().iterator(); - if (itr.hasNext()) { - // only care about the first one - return UserFactory.lookupById((Long)itr.next()); = = - } - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); + Session session =3D HibernateFactory.getSession(); + Iterator itr =3D session.getNamedQuery("User.findRandomOrgAdmin") + .setParameter("org_id", orgIn.get= Id()) + .setParameter("type_id", r.getId(= )) + //Retrieve from cache if there + .list().iterator(); + if (itr.hasNext()) { + // only care about the first one + return UserFactory.lookupById((Long)itr.next()); } return null; } @@ -194,16 +174,9 @@ public class UserFactory extends HibernateFactory { * @return the user found */ public static User lookupById(Long id) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - User u =3D (User)session.get(LegacyRhnUserImpl.class, id); - return u; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session =3D HibernateFactory.getSession(); + User u =3D (User)session.get(LegacyRhnUserImpl.class, id); + return u; } = = @@ -520,19 +493,12 @@ public class UserFactory extends HibernateFactory { * @return TimeZone the requested time zone */ public static RhnTimeZone getTimeZone(int id) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - return (RhnTimeZone) session.getNamedQuery("RhnTimeZone.loadTi= meZoneById") - .setInteger("tid", id) - //Retrieve from cache if there - .setCacheable(true) - .uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session =3D HibernateFactory.getSession(); + return (RhnTimeZone) session.getNamedQuery("RhnTimeZone.loadTimeZo= neById") + .setInteger("tid", id) + //Retrieve from cache if there + .setCacheable(true) + .uniqueResult(); } = /** @@ -541,20 +507,13 @@ public class UserFactory extends HibernateFactory { * @return TimeZone the requested time zone */ public static RhnTimeZone getTimeZone(String olsonName) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - return (RhnTimeZone) session - .getNamedQuery("RhnTimeZone.loadTimeZ= oneByOlsonName") - .setString("ton", olsonName) - //Retrieve from cache if there - .setCacheable(true) - .uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session =3D HibernateFactory.getSession(); + return (RhnTimeZone) session + .getNamedQuery("RhnTimeZone.loadTimeZoneB= yOlsonName") + .setString("ton", olsonName) + //Retrieve from cache if there + .setCacheable(true) + .uniqueResult(); } = /** @@ -574,14 +533,8 @@ public class UserFactory extends HibernateFactory { //whereas the database is not. if (timeZoneList =3D=3D null) { List timeZones =3D null; //temporary holding place until sorted - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - timeZones =3D session.getNamedQuery("RhnTimeZone.loadAll")= .list(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } + Session session =3D HibernateFactory.getSession(); + timeZones =3D session.getNamedQuery("RhnTimeZone.loadAll").lis= t(); = //Now sort the timezones. American timezones come first as the= y are 'preferred' //All other timezones are sorted and placed after American one= s. @@ -688,17 +641,9 @@ public class UserFactory extends HibernateFactory { public UserServerPreference lookupServerPreferenceByUserServerAndName(= User user, = Server server, = String name) { - Session session =3D null; - try { - UserServerPreferenceId id =3D new UserServerPreferenceId(user,= server, name); - session =3D HibernateFactory.getSession(); - return (UserServerPreference) session.get(UserServerPreference= .class, id); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - = - return null; + UserServerPreferenceId id =3D new UserServerPreferenceId(user, ser= ver, name); + Session session =3D HibernateFactory.getSession(); + return (UserServerPreference) session.get(UserServerPreference.cla= ss, id); } = /** @@ -713,37 +658,30 @@ public class UserFactory extends HibernateFactory { Server server, String preferenceName, boolean value) { - Session session =3D null; - try { - UserServerPreferenceId id =3D new UserServerPreferenceId(user, = - server, = - preferenc= eName); - session =3D HibernateFactory.getSession(); - UserServerPreference usp =3D (UserServerPreference) = - session.get(UserServerPreference.cl= ass, id); - = - /* Here, we delete the preference's entry if it should be true. - * We would hopefully be ok setting the value to "1," but I'm = emulating - * the Perl side here just to be safe - */ - if (value) { - if (usp !=3D null) { - session.delete(usp); - } - } - else { - if (usp =3D=3D null) { - id =3D new UserServerPreferenceId(user, server, prefer= enceName); - usp =3D new UserServerPreference(); - usp.setId(id); - usp.setValue("0"); - session.save(usp); - } + Session session =3D HibernateFactory.getSession(); + UserServerPreferenceId id =3D new UserServerPreferenceId(user, + server, + preferenceNam= e); + UserServerPreference usp =3D (UserServerPreference) + session.get(UserServerPreference.class,= id); + + /* Here, we delete the preference's entry if it should be true. + * We would hopefully be ok setting the value to "1," but I'm emul= ating + * the Perl side here just to be safe + */ + if (value) { + if (usp !=3D null) { + session.delete(usp); } - = } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); + else { + if (usp =3D=3D null) { + id =3D new UserServerPreferenceId(user, server, preference= Name); + usp =3D new UserServerPreference(); + usp.setId(id); + usp.setValue("0"); + session.save(usp); + } } } = @@ -754,17 +692,10 @@ public class UserFactory extends HibernateFactory { * @return list of users. */ public List findAllUsers(Org inOrg) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - Map params =3D new HashMap(); - params.put("org_id", inOrg.getId()); - return (List)listObjectsByNamedQuery("User.findAllUsersB= yOrg", params); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session =3D HibernateFactory.getSession(); + Map params =3D new HashMap(); + params.put("org_id", inOrg.getId()); + return (List)listObjectsByNamedQuery("User.findAllUsersByOrg= ", params); } = /** @@ -774,17 +705,10 @@ public class UserFactory extends HibernateFactory { * @return list of users. */ public List findAllOrgAdmins(Org inOrg) { - Session session =3D null; - try { - session =3D HibernateFactory.getSession(); - Map params =3D new HashMap(); - params.put("org_id", inOrg.getId()); - return (List)listObjectsByNamedQuery("User.findAllOrgAdm= ins", params); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session =3D HibernateFactory.getSession(); + Map params =3D new HashMap(); + params.put("org_id", inOrg.getId()); + return (List)listObjectsByNamedQuery("User.findAllOrgAdmins"= , params); } = } --===============3442720233862654258==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:49 2015 Content-Type: multipart/mixed; boundary="===============0593649629019786853==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-java-0.6.27-1' Date: Thu, 25 Jun 2009 15:47:39 +0000 Message-ID: <20090625154739.C92E0120285@lists.fedorahosted.org> --===============0593649629019786853== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-java-0.6.27-1' created by John Matthews at 2009-06-25 15:42 +0000 Tagging package [spacewalk-java] version [0.6.27-1] in directory [java/]. Changes since spacewalk-schema-0.6.11-1: Devan Goodwin (1): Remove catch/log return null of HibernateExceptions. John Matthews (1): Automatic commit of package [spacewalk-java] release [0.6.27-1]. --- java/code/src/com/redhat/rhn/domain/action/ActionFactory.java = | 32 - java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java = | 13 = java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java = | 179 ++----- java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java = | 21 = java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterFactor= y.java | 16 = java/code/src/com/redhat/rhn/domain/org/OrgImpl.java = | 22 = java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java = | 14 = java/code/src/com/redhat/rhn/domain/role/RoleFactory.java = | 39 - java/code/src/com/redhat/rhn/domain/satellite/CertificateFactory.java = | 15 = java/code/src/com/redhat/rhn/domain/satellite/SatelliteFactory.java = | 11 = java/code/src/com/redhat/rhn/domain/server/ServerFactory.java = | 56 -- java/code/src/com/redhat/rhn/domain/session/WebSessionFactory.java = | 28 - java/code/src/com/redhat/rhn/domain/task/TaskFactory.java = | 37 - java/code/src/com/redhat/rhn/domain/user/UserFactory.java = | 236 +++------- java/spacewalk-java.spec = | 91 +++ rel-eng/packages/spacewalk-java = | 2 = 16 files changed, 307 insertions(+), 505 deletions(-) --- --===============0593649629019786853==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:49 2015 Content-Type: multipart/mixed; boundary="===============8054911430114851162==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: java/spacewalk-java.spec rel-eng/packages Date: Thu, 25 Jun 2009 15:47:37 +0000 Message-ID: <20090625154737.4E4AE1201ED@lists.fedorahosted.org> --===============8054911430114851162== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/spacewalk-java.spec | 91 +++++++++++++++++++++++++++++++++++= ++++- rel-eng/packages/spacewalk-java | 2 = 2 files changed, 91 insertions(+), 2 deletions(-) New commits: commit 8288ee2dd4f507bc9dd9d49f94807f4c724beae7 Author: John Matthews Date: Thu Jun 25 11:42:17 2009 -0400 Automatic commit of package [spacewalk-java] release [0.6.27-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 4e41ef7..e6b5a8e 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -11,7 +11,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 0.6.26 +Version: 0.6.27 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{versi= on}.tar.gz = @@ -250,6 +250,95 @@ fi %attr(644, root, root) %{_datadir}/rhn/lib/rhn.jar = %changelog +* Thu Jun 25 2009 John Matthews 0.6.27-1 +- Remove catch/log return null of HibernateExceptions. (dgoodwin(a)redhat.= com) +- Fix server migration when source org has > 1000 org admins. + (dgoodwin(a)redhat.com) +- Fix to make sure kernel param entries don;t get duplicated (paji(a)redha= t.com) +- 492206 - Fixed kickstart template error (paji(a)redhat.com) +- 507533 - added catch around unhandled exception for pkg in mutiple chann= els + (shughes(a)redhat.com) +- 507862 - Fixed an ise that occured when config deploy was selected on a + profile (paji(a)redhat.com) +- 507863 - fixing issue where enabling remote commands would not be saved + (jsherril(a)redhat.com) +- 507888 - Set the default virt mem value to 512 instead of 256 + (paji(a)redhat.com) +- hopeflly fixing unit test (jsherril(a)redhat.com) +- Fixed a unit test (paji(a)redhat.com) +- 506702 - Converted probe details page to use the new list to get the cor= rect + csv (paji(a)redhat.com) +- Fixed a nitpick that memory didnt sya memMb (paji(a)redhat.com) +- 507097 - Fixed guest provisioning virt settings (paji(a)redhat.com) +- Adding repodata details for a given channel to channelDetails page. + (pkilambi(a)redhat.com) +- 506816 - fixing issue where virt hosts that begin to use sat 5.3 could n= ot + install spacewalk-koan (jsherril(a)redhat.com) +- 506693 - removed more contact.pxt references (shughes(a)redhat.com) +- 507046 & 507048 - Fixed a couple of cobbler issues (paji(a)redhat.com) +- Added a fix to master to ignore profiles that have not yet been synced to + cobbler.. (paji(a)redhat.com) +- Fix for html:errors and html:messages to be consitently viewed in the UI + (paji(a)redhat.com) +- 506726 - do not allow links for null org channel management + (shughes(a)redhat.com) +- 506705 - removed invalid rhn require tag (shughes(a)redhat.com) +- 506693 - remove contact.pxt link from 404 message (shughes(a)redhat.com) +- 506509 - Fixed an ssm query.. Accidental typo.. (paji(a)redhat.com) +- 506509 - Fixed ISE on Config Deploy pages (paji(a)redhat.com) +- Checkstyle fix. (dgoodwin(a)redhat.com) +- 506608 - fixing issue where source packages could not be downloaded from= the + package details page (jsherril(a)redhat.com) +- Fix monitoring action unit tests. (dgoodwin(a)redhat.com) +- Attempt to fix ChannelManagerTest.testListErrata. (dgoodwin(a)redhat.com) +- 506342 - fix system count for consumed channel sharing (shughes(a)redhat= .com) +- 506341 - fix system count for provided shared channels (shughes(a)redhat= .com) +- 495406 - Changed package arch lookup for ACLs to use arch labels instead= of + hibernate objects. (jason.dobies(a)redhat.com) +- 506489 - remove the link associated with the org name present in the UI + header (bbuckingham(a)redhat.com) +- Adding missed EusReleaseComparator file. (dgoodwin(a)redhat.com) +- 506492, 506139 - PackageSearch default quick search to searching all arc= hes & + fix no result if systems aren't registered (jmatthew(a)redhat.com) +- 506296 - Repair EUS logic after removal of is_default column. + (dgoodwin(a)redhat.com) +- 506144 - apidoc - packages.search - adding missing files to return value + (bbuckingham(a)redhat.com) +- fix unit test cases (shughes(a)redhat.com) +- removed a duplicate string resources entry (paji(a)redhat.com) +- Fix some of the failing EUS unit tests. (dgoodwin(a)redhat.com) +- 505616 - Fixing the eus logic that gets the latest and the default eus + channels to not depend on is_default column. Thanks to jsherril for his = help + on this. (pkilambi(a)redhat.com) +- Fixed a set of unit tests which owere looking for ActtionMessagess inste= ad of + ActionErrors (paji(a)redhat.com) +- Unit test fix (paji(a)redhat.com) +- Fixed unit test: was looking for errors as part of action messages + (jason.dobies(a)redhat.com) +- Remove hibernate mappings for rhnReleaseChannelMap is_default column. + (dgoodwin(a)redhat.com) +- unit test fix (jsherril(a)redhat.com) +- unit test fix (jsherril(a)redhat.com) +- 431673 - reworking rhnServerNeededView for performance fixes. + (mmccune(a)gmail.com) +- 505170 - api - proxy.deactivateProxy - was generating internal exception + (bbuckingham(a)redhat.com) +- 505327 - fixing url parse for advanced kickstart options (shughes(a)redh= at.com) +- 498650 - HTML escape monitoring data before displaying. (dgoodwin(a)redh= at.com) +- Revert "498650 - html escape of monitoring data before displaying on the + WEBUI" (dgoodwin(a)redhat.com) +- 498650 - html escape of monitoring data before displaying on the WEBUI + (tlestach(a)redhat.com) +- 492206 - Fixed cobbler error url to point to KS file download page which= has + better info on cheetah stacktrace (paji(a)redhat.com) +- 505188 - fixing issues causing rhel2.1 provisioning to not work + (jsherril(a)redhat.com) +- 490960 - ErrataSearch, fix for multiorg channel permissions + (jmatthew(a)redhat.com) +- fix to shwo the correct error message css (paji(a)redhat.com) +- 504804 - Need to stuff the relevant flag back into the request so it's u= sed + in the package name URLs. (jason.dobies(a)redhat.com) + * Wed Jun 10 2009 jesus m. rodriguez 0.6.26-1 - 504806 - Added missing channel_filter attribute that was being lost duri= ng pagination. (jason.dobies(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-j= ava index 19a8cd5..747ed8f 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -0.6.26-1 java/ +0.6.27-1 java/ --===============8054911430114851162==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:49 2015 Content-Type: multipart/mixed; boundary="===============6384360620902796776==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: rel-eng/packages search-server/spacewalk-search.spec Date: Thu, 25 Jun 2009 16:06:48 +0000 Message-ID: <20090625160648.20DD11201ED@lists.fedorahosted.org> --===============6384360620902796776== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/spacewalk-search | 2 +- search-server/spacewalk-search.spec | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) New commits: commit c5ceeda0c00ed34b5dbd636a5584563a26145cca Author: John Matthews Date: Thu Jun 25 12:01:35 2009 -0400 Automatic commit of package [spacewalk-search] release [0.6.11-1]. diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk= -search index bcd06f8..dba4dec 100644 --- a/rel-eng/packages/spacewalk-search +++ b/rel-eng/packages/spacewalk-search @@ -1 +1 @@ -0.6.10-1 search-server/ +0.6.11-1 search-server/ diff --git a/search-server/spacewalk-search.spec b/search-server/spacewalk-= search.spec index be152c2..66f5303 100644 --- a/search-server/spacewalk-search.spec +++ b/search-server/spacewalk-search.spec @@ -4,7 +4,7 @@ Name: spacewalk-search Summary: Spacewalk Full Text Search Server Group: Applications/Internet License: GPLv2 -Version: 0.6.10 +Version: 0.6.11 Release: 1%{?dist} # This src.rpm is cannonical upstream # You can obtain it using this set of commands @@ -112,6 +112,12 @@ fi %{_sysconfdir}/logrotate.d/rhn-search = %changelog +* Thu Jun 25 2009 John Matthews 0.6.11-1 +- 487014 - SystemSearch remove score requirement to redirect to SDC on 1 r= esult + (jmatthew(a)redhat.com) +- DocumentationSearch fixing returned links so they are relative and updat= e for + segment dir (jmatthew(a)redhat.com) + * Mon Jun 01 2009 jesus m. rodriguez 0.6.10-1 - added java debugger options for local dev config (jesusr(a)redhat.com) - store pid file locally. (jesusr(a)redhat.com) --===============6384360620902796776==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:49 2015 Content-Type: multipart/mixed; boundary="===============7989869875560290809==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-search-0.6.11-1' Date: Thu, 25 Jun 2009 16:06:50 +0000 Message-ID: <20090625160650.932091201ED@lists.fedorahosted.org> --===============7989869875560290809== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-search-0.6.11-1' created by John Matthews at 2009-06-25 16:01 +0000 Tagging package [spacewalk-search] version [0.6.11-1] in directory [search-= server/]. Changes since spacewalk-java-0.6.27-1: John Matthews (1): Automatic commit of package [spacewalk-search] release [0.6.11-1]. --- rel-eng/packages/spacewalk-search | 2 +- search-server/spacewalk-search.spec | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) --- --===============7989869875560290809==-- From shughes at fedoraproject.org Thu Aug 20 11:57:49 2015 Content-Type: multipart/mixed; boundary="===============2643863860546467471==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Thu, 25 Jun 2009 16:24:14 +0000 Message-ID: <20090625162414.9D82A1201ED@lists.fedorahosted.org> --===============2643863860546467471== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAct= ion.java | 6 ++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xm= l | 6 ++++++ java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidChannelNameException.j= ava | 1 + java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java = | 10 ++++++++++ 4 files changed, 23 insertions(+) New commits: commit 98ea9e8c85404b79b8a7abb71eeb0621e2e8ae3d Author: Shannon Hughes Date: Thu Jun 25 12:15:43 2009 -0400 456985 - fix ise on channel creation diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/Ed= itChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel= /manage/EditChannelAction.java index 0845b9f..5ea102d 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChann= elAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChann= elAction.java @@ -469,6 +469,12 @@ public class EditChannelAction extends RhnAction imple= ments Listable { CreateChannelCommand.CHANNEL_NAME_MIN_LENGTH)); break; = + case TOO_LONG: + errors.add(ActionMessages.GLOBAL_MESSAGE, + new ActionMessage("edit.channel.invalidchannelname= .maxlength", + CreateChannelCommand.CHANNEL_NAME_MAX_LENGTH)); + break; + case NAME_IN_USE: errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("edit.channel.invalidchannelname= .nameinuse", diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResou= rce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringRe= source_en_US.xml index 12d363a..8db5c8a 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml @@ -8139,6 +8139,12 @@ Follow this url to see the full list of inactive sys= tems: /channels/manage/Edit + + Channel name can not exceed {0} characters long + + /channels/manage/Edit + + The channel name '{0}' is already in use, please enter a = different name diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidChannelNam= eException.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidChann= elNameException.java index a1d1b07..33242d1 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidChannelNameExcept= ion.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidChannelNameExcept= ion.java @@ -103,6 +103,7 @@ public class InvalidChannelNameException extends FaultE= xception { public enum Reason { REGEX_FAILS, TOO_SHORT, + TOO_LONG, IS_MISSING, NAME_IN_USE, RHN_CHANNEL_BAD_PERMISSIONS diff --git a/java/code/src/com/redhat/rhn/manager/channel/CreateChannelComm= and.java b/java/code/src/com/redhat/rhn/manager/channel/CreateChannelComman= d.java index 8ee65e9..9dddd81 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java +++ b/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java @@ -36,6 +36,7 @@ import java.util.regex.Pattern; public class CreateChannelCommand { = public static final int CHANNEL_NAME_MIN_LENGTH =3D 6; + public static final int CHANNEL_NAME_MAX_LENGTH =3D 64; public static final int CHANNEL_LABEL_MIN_LENGTH =3D 6; = protected static final String CHANNEL_NAME_REGEX =3D @@ -346,6 +347,15 @@ public class CreateChannelCommand { minLength.toString()); } = + if (cname.length() > CHANNEL_NAME_MAX_LENGTH) { + System.out.println("YIIIIIIIIIIIKES"); + Integer maxLength =3D new Integer(CreateChannelCommand.CHANNEL= _NAME_MAX_LENGTH); + throw new InvalidChannelNameException(cname, + InvalidChannelNameException.Reason.TOO_LONG, + "edit.channel.invalidchannelname.maxlength", + maxLength.toString()); + } + // the perl code used to ignore case with a /i at the end of // the regex, so we toLowerCase() the channel name to make it // work the same. --===============2643863860546467471==-- From shughes at fedoraproject.org Thu Aug 20 11:57:49 2015 Content-Type: multipart/mixed; boundary="===============8505164339196462201==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Thu, 25 Jun 2009 16:27:02 +0000 Message-ID: <20090625162702.6F4391201ED@lists.fedorahosted.org> --===============8505164339196462201== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAct= ion.java | 6 ++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xm= l | 6 ++++++ java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidChannelNameException.j= ava | 1 + java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java = | 10 ++++++++++ 4 files changed, 23 insertions(+) New commits: commit 631cfdeef9de27aa92d017181b33f3638e91d1ba Author: Shannon Hughes Date: Thu Jun 25 12:15:43 2009 -0400 456985 - fix ise on channel creation diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/Ed= itChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel= /manage/EditChannelAction.java index 0845b9f..5ea102d 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChann= elAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChann= elAction.java @@ -469,6 +469,12 @@ public class EditChannelAction extends RhnAction imple= ments Listable { CreateChannelCommand.CHANNEL_NAME_MIN_LENGTH)); break; = + case TOO_LONG: + errors.add(ActionMessages.GLOBAL_MESSAGE, + new ActionMessage("edit.channel.invalidchannelname= .maxlength", + CreateChannelCommand.CHANNEL_NAME_MAX_LENGTH)); + break; + case NAME_IN_USE: errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("edit.channel.invalidchannelname= .nameinuse", diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResou= rce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringRe= source_en_US.xml index 12d363a..8db5c8a 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml @@ -8139,6 +8139,12 @@ Follow this url to see the full list of inactive sys= tems: /channels/manage/Edit + + Channel name can not exceed {0} characters long + + /channels/manage/Edit + + The channel name '{0}' is already in use, please enter a = different name diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidChannelNam= eException.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidChann= elNameException.java index a1d1b07..33242d1 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidChannelNameExcept= ion.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidChannelNameExcept= ion.java @@ -103,6 +103,7 @@ public class InvalidChannelNameException extends FaultE= xception { public enum Reason { REGEX_FAILS, TOO_SHORT, + TOO_LONG, IS_MISSING, NAME_IN_USE, RHN_CHANNEL_BAD_PERMISSIONS diff --git a/java/code/src/com/redhat/rhn/manager/channel/CreateChannelComm= and.java b/java/code/src/com/redhat/rhn/manager/channel/CreateChannelComman= d.java index 8ee65e9..9dddd81 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java +++ b/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java @@ -36,6 +36,7 @@ import java.util.regex.Pattern; public class CreateChannelCommand { = public static final int CHANNEL_NAME_MIN_LENGTH =3D 6; + public static final int CHANNEL_NAME_MAX_LENGTH =3D 64; public static final int CHANNEL_LABEL_MIN_LENGTH =3D 6; = protected static final String CHANNEL_NAME_REGEX =3D @@ -346,6 +347,15 @@ public class CreateChannelCommand { minLength.toString()); } = + if (cname.length() > CHANNEL_NAME_MAX_LENGTH) { + System.out.println("YIIIIIIIIIIIKES"); + Integer maxLength =3D new Integer(CreateChannelCommand.CHANNEL= _NAME_MAX_LENGTH); + throw new InvalidChannelNameException(cname, + InvalidChannelNameException.Reason.TOO_LONG, + "edit.channel.invalidchannelname.maxlength", + maxLength.toString()); + } + // the perl code used to ignore case with a /i at the end of // the regex, so we toLowerCase() the channel name to make it // work the same. --===============8505164339196462201==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:49 2015 Content-Type: multipart/mixed; boundary="===============5740899877017866941==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: backend/server Date: Thu, 25 Jun 2009 18:06:36 +0000 Message-ID: <20090625180636.D83E31201ED@lists.fedorahosted.org> --===============5740899877017866941== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/rhnChannel.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 73c2bdc684d5c19ed6a0a1ac381efc9e7f4a06c6 Author: Pradeep Kilambi Date: Thu Jun 25 14:06:27 2009 -0400 508104 - Fixing the registration with eus channel to return receiving_u= pdates in the query. diff --git a/backend/server/rhnChannel.py b/backend/server/rhnChannel.py index 8193d11..e0a28f2 100644 --- a/backend/server/rhnChannel.py +++ b/backend/server/rhnChannel.py @@ -1088,7 +1088,8 @@ def base_eus_channel_for_ver_rel_arch(version, releas= e, server_arch, select c.id, c.label, c.name, - rcm.release + rcm.release, + c.receiving_updates from rhnChannelPermissions cp, rhnChannel c, --===============5740899877017866941==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:49 2015 Content-Type: multipart/mixed; boundary="===============2277301574029505399==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - backend/server Date: Thu, 25 Jun 2009 18:09:47 +0000 Message-ID: <20090625180947.7D5741201ED@lists.fedorahosted.org> --===============2277301574029505399== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/rhnChannel.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit f3ab6321d95d4dd907aa07f3bbb447457d9e3149 Author: Pradeep Kilambi Date: Thu Jun 25 14:06:27 2009 -0400 508104 - Fixing the registration with eus channel to return receiving_u= pdates in the query. diff --git a/backend/server/rhnChannel.py b/backend/server/rhnChannel.py index 8193d11..e0a28f2 100644 --- a/backend/server/rhnChannel.py +++ b/backend/server/rhnChannel.py @@ -1088,7 +1088,8 @@ def base_eus_channel_for_ver_rel_arch(version, releas= e, server_arch, select c.id, c.label, c.name, - rcm.release + rcm.release, + c.receiving_updates from rhnChannelPermissions cp, rhnChannel c, --===============2277301574029505399==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:49 2015 Content-Type: multipart/mixed; boundary="===============2023214701367210119==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: rel-eng/packages web/spacewalk-web.spec Date: Thu, 25 Jun 2009 19:16:38 +0000 Message-ID: <20090625191638.7D6081201ED@lists.fedorahosted.org> --===============2023214701367210119== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) New commits: commit cbb6f61ed81f61fbd0710c279d1a4d8ebfb80910 Author: John Matthews Date: Thu Jun 25 15:11:24 2009 -0400 Automatic commit of package [spacewalk-web] release [0.6.9-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index 9d57df0..eadcbde 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -0.6.8-1 web/ +0.6.9-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index 2c6d85d..97782ed 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -2,7 +2,7 @@ Name: spacewalk-web Summary: Spacewalk Web site packages Group: Applications/Internet License: GPLv2 -Version: 0.6.8 +Version: 0.6.9 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{ve= rsion}.tar.gz @@ -317,6 +317,19 @@ rm -rf $RPM_BUILD_ROOT = # $Id$ %changelog +* Thu Jun 25 2009 John Matthews 0.6.9-1 +- 506154 - Added "wrap" option to textarea widget. Set to off for remote + command script editing page. (jason.dobies(a)redhat.com) +- 501933 - Changed the script rendering to wrap in a readonly textarea. + (jason.dobies(a)redhat.com) +- 505315 - checking in missing file from previous commit (jsherril(a)redha= t.com) +- 505315 - fixing issue where cobbler provisioning couldnt occur through a= 5.3 + proxy if installed through the webui (jsherril(a)redhat.com) +- 502259 - fixing issue where systems would not show up on applicable syst= ems + page of patches (jsherril(a)redhat.com) +- 504327 - fixing acl for chcecking needed install tab (shughes(a)redhat.c= om) +- 503187 - set MaxRequestsPerChild to 200 (WebUI installer) (msuchy(a)redh= at.com) + * Fri Jun 05 2009 jesus m. rodriguez 0.6.8-1 - 197294 - add hardware report support for CAPTURE cards (shughes(a)redhat= .com) - 500709 - html error code page support for sessionless bots (shughes(a)re= dhat.com) --===============2023214701367210119==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:49 2015 Content-Type: multipart/mixed; boundary="===============8477501799162382333==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-web-0.6.9-1' Date: Thu, 25 Jun 2009 19:16:40 +0000 Message-ID: <20090625191640.D26951202FF@lists.fedorahosted.org> --===============8477501799162382333== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-web-0.6.9-1' created by John Matthews at 2009-06-25 19:11 +0000 Tagging package [spacewalk-web] version [0.6.9-1] in directory [web/]. Changes since spacewalk-search-0.6.11-1: John Matthews (1): Automatic commit of package [spacewalk-web] release [0.6.9-1]. Pradeep Kilambi (1): 508104 - Fixing the registration with eus channel to return receiving= _updates in the query. Shannon Hughes (1): 456985 - fix ise on channel creation --- backend/server/rhnChannel.py = | 3 +- java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAct= ion.java | 6 ++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xm= l | 6 ++++ java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidChannelNameException.j= ava | 1 = java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java = | 10 ++++++ rel-eng/packages/spacewalk-web = | 2 - web/spacewalk-web.spec = | 15 +++++++++- 7 files changed, 40 insertions(+), 3 deletions(-) --- --===============8477501799162382333==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:49 2015 Content-Type: multipart/mixed; boundary="===============3656266136757166243==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-config-0.6.8-1' Date: Thu, 25 Jun 2009 19:17:48 +0000 Message-ID: <20090625191748.4C1551202FF@lists.fedorahosted.org> --===============3656266136757166243== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-config-0.6.8-1' created by John Matthews at 2009-06-25 19:12 +0000 Tagging package [spacewalk-config] version [0.6.8-1] in directory [spacewal= k/config/]. Changes since spacewalk-web-0.6.9-1: John Matthews (1): Automatic commit of package [spacewalk-config] release [0.6.8-1]. --- rel-eng/packages/spacewalk-config | 2 +- spacewalk/config/spacewalk-config.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) --- --===============3656266136757166243==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:49 2015 Content-Type: multipart/mixed; boundary="===============3289748248304525967==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: rel-eng/packages spacewalk/config Date: Thu, 25 Jun 2009 19:17:46 +0000 Message-ID: <20090625191746.2C7BA1201ED@lists.fedorahosted.org> --===============3289748248304525967== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable rel-eng/packages/spacewalk-config | 2 +- spacewalk/config/spacewalk-config.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit e5c5582e1230937a2865d6fe1fdf08c8ff1bacf1 Author: John Matthews Date: Thu Jun 25 15:12:34 2009 -0400 Automatic commit of package [spacewalk-config] release [0.6.8-1]. diff --git a/rel-eng/packages/spacewalk-config b/rel-eng/packages/spacewalk= -config index 2f739b8..e483978 100644 --- a/rel-eng/packages/spacewalk-config +++ b/rel-eng/packages/spacewalk-config @@ -1 +1 @@ -0.6.7-1 spacewalk/config/ +0.6.8-1 spacewalk/config/ diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spac= ewalk-config.spec index 0e42c3b..d40cbd6 100644 --- a/spacewalk/config/spacewalk-config.spec +++ b/spacewalk/config/spacewalk-config.spec @@ -2,7 +2,7 @@ = Name: spacewalk-config Summary: Spacewalk Configuration -Version: 0.6.7 +Version: 0.6.8 Release: 1%{?dist} URL: http://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz @@ -114,6 +114,9 @@ fi = = %changelog +* Thu Jun 25 2009 John Matthews 0.6.8-1 +- Fix mod_jk failure to load. (dgoodwin(a)redhat.com) + * Wed Jun 24 2009 John Matthews 0.6.7-1 - 507679 - Added custom server.xml to force UTF8 encoding of GET parameter= s in tomcat = --===============3289748248304525967==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:50 2015 Content-Type: multipart/mixed; boundary="===============0678074339292141288==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: branding/spacewalk-branding.spec rel-eng/packages Date: Thu, 25 Jun 2009 19:22:15 +0000 Message-ID: <20090625192215.CA4A21201ED@lists.fedorahosted.org> --===============0678074339292141288== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable branding/spacewalk-branding.spec | 9 ++++++++- rel-eng/packages/spacewalk-branding | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) New commits: commit 098ee22db9277fe6e67ff876570b3bd276623d30 Author: John Matthews Date: Thu Jun 25 15:17:03 2009 -0400 Automatic commit of package [spacewalk-branding] release [0.6.6-1]. diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding= .spec index 50dd3fd..f4bb8bb 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -1,5 +1,5 @@ Name: spacewalk-branding -Version: 0.6.5 +Version: 0.6.6 Release: 1%{?dist} Summary: Spacewalk branding data = @@ -68,6 +68,13 @@ rm -rf %{buildroot} = = %changelog +* Thu Jun 25 2009 John Matthews 0.6.6-1 +- 506489 - remove the link associated with the org name present in the UI + header (bbuckingham(a)redhat.com) +- 505101 - update css so that links are underlined when hovering + (bbuckingham(a)redhat.com) +- fix to shwo the correct error message css (paji(a)redhat.com) + * Wed May 27 2009 jesus m. rodriguez 0.6.5-1 - 500806 - limit a:hover to links only, changed to a:link:hover (jesusr(a)= redhat.com) = diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewa= lk-branding index 8f85162..ed657c3 100644 --- a/rel-eng/packages/spacewalk-branding +++ b/rel-eng/packages/spacewalk-branding @@ -1 +1 @@ -0.6.5-1 branding/ +0.6.6-1 branding/ --===============0678074339292141288==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:50 2015 Content-Type: multipart/mixed; boundary="===============5178928725296784523==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-branding-0.6.6-1' Date: Thu, 25 Jun 2009 19:22:19 +0000 Message-ID: <20090625192219.A26D7120309@lists.fedorahosted.org> --===============5178928725296784523== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-branding-0.6.6-1' created by John Matthews at 2009-06-25 19:17 +0000 Tagging package [spacewalk-branding] version [0.6.6-1] in directory [brandi= ng/]. Changes since spacewalk-config-0.6.8-1: John Matthews (1): Automatic commit of package [spacewalk-branding] release [0.6.6-1]. --- branding/spacewalk-branding.spec | 9 ++++++++- rel-eng/packages/spacewalk-branding | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) --- --===============5178928725296784523==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:50 2015 Content-Type: multipart/mixed; boundary="===============6267894508599711628==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/SatConfig-cluster-1.54.6-1' Date: Thu, 25 Jun 2009 19:57:48 +0000 Message-ID: <20090625195748.41AA41202FF@lists.fedorahosted.org> --===============6267894508599711628== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'SatConfig-cluster-1.54.6-1' created by John Matthews at 2009-06-25 19:52 +0000 Tagging package [SatConfig-cluster] version [1.54.6-1] in directory [monito= ring/SatConfig/cluster/]. Changes since spacewalk-branding-0.6.6-1: John Matthews (1): Automatic commit of package [SatConfig-cluster] release [1.54.6-1]. --- monitoring/SatConfig/cluster/SatConfig-cluster.spec | 6 +++++- rel-eng/packages/SatConfig-cluster | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) --- --===============6267894508599711628==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:50 2015 Content-Type: multipart/mixed; boundary="===============6990690337077298953==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: monitoring/SatConfig rel-eng/packages Date: Thu, 25 Jun 2009 19:57:45 +0000 Message-ID: <20090625195745.B08D91201ED@lists.fedorahosted.org> --===============6990690337077298953== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable monitoring/SatConfig/cluster/SatConfig-cluster.spec | 6 +++++- rel-eng/packages/SatConfig-cluster | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 63259e39c86e8d15b078252ba3def56eb714c827 Author: John Matthews Date: Thu Jun 25 15:52:32 2009 -0400 Automatic commit of package [SatConfig-cluster] release [1.54.6-1]. diff --git a/monitoring/SatConfig/cluster/SatConfig-cluster.spec b/monitori= ng/SatConfig/cluster/SatConfig-cluster.spec index 06730d8..c81e30b 100644 --- a/monitoring/SatConfig/cluster/SatConfig-cluster.spec +++ b/monitoring/SatConfig/cluster/SatConfig-cluster.spec @@ -1,6 +1,6 @@ %define sysv_dir %{_sysconfdir}/rc.d/np.d Name: SatConfig-cluster -Version: 1.54.5 +Version: 1.54.6 Release: 1%{?dist} Summary: Satellite Configuration System - cluster information URL: https://fedorahosted.org/spacewalk @@ -57,6 +57,10 @@ install -m 644 SatCluster.pm $RPM_BUILD_ROOT%{perl_vendo= rlib}/NOCpulse/ rm -rf $RPM_BUILD_ROOT = %changelog +* Thu Jun 25 2009 John Matthews 1.54.6-1 +- 490783 - preventing to read a config file, that must not exist + (tlestach(a)redhat.com) + * Thu Apr 23 2009 jesus m. rodriguez 1.54.5-1 - change Source0 to point to fedorahosted.org (msuchy(a)redhat.com) = diff --git a/rel-eng/packages/SatConfig-cluster b/rel-eng/packages/SatConfi= g-cluster index 7df6213..d310162 100644 --- a/rel-eng/packages/SatConfig-cluster +++ b/rel-eng/packages/SatConfig-cluster @@ -1 +1 @@ -1.54.5-1 monitoring/SatConfig/cluster/ +1.54.6-1 monitoring/SatConfig/cluster/ --===============6990690337077298953==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:50 2015 Content-Type: multipart/mixed; boundary="===============8739274583426077848==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/SputLite-0.48.11-1' Date: Thu, 25 Jun 2009 19:59:20 +0000 Message-ID: <20090625195920.CECD51202FF@lists.fedorahosted.org> --===============8739274583426077848== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'SputLite-0.48.11-1' created by John Matthews a= t 2009-06-25 19:54 +0000 Tagging package [SputLite] version [0.48.11-1] in directory [monitoring/Spu= tLite/]. Changes since SatConfig-cluster-1.54.6-1: John Matthews (1): Automatic commit of package [SputLite] release [0.48.11-1]. --- monitoring/SputLite/SputLite.spec | 5 ++++- rel-eng/packages/SputLite | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) --- --===============8739274583426077848==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:50 2015 Content-Type: multipart/mixed; boundary="===============2330966419027264613==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: monitoring/SputLite rel-eng/packages Date: Thu, 25 Jun 2009 19:59:18 +0000 Message-ID: <20090625195918.7760F1201ED@lists.fedorahosted.org> --===============2330966419027264613== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable monitoring/SputLite/SputLite.spec | 5 ++++- rel-eng/packages/SputLite | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 8e75e3243e49b311c58a42690581bc3e446df27b Author: John Matthews Date: Thu Jun 25 15:54:04 2009 -0400 Automatic commit of package [SputLite] release [0.48.11-1]. diff --git a/monitoring/SputLite/SputLite.spec b/monitoring/SputLite/SputLi= te.spec index fe920dc..67cb384 100644 --- a/monitoring/SputLite/SputLite.spec +++ b/monitoring/SputLite/SputLite.spec @@ -5,7 +5,7 @@ %define vardir /var/lib/nocpulse Name: SputLite Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{ve= rsion}.tar.gz -Version: 0.48.10 +Version: 0.48.11 Release: 1%{?dist} Summary: Command queue processor (Sputnik Lite) URL: https://fedorahosted.org/spacewalk @@ -100,6 +100,9 @@ fi rm -rf $RPM_BUILD_ROOT = %changelog +* Thu Jun 25 2009 John Matthews 0.48.11-1 +- Don't move execute_commands.log to /var/log/nocpulse (mzazrivec(a)redhat= .com) + * Mon May 11 2009 Milan Zazrivec 0.48.10-1 - 498257 - migrate existing files into new nocpulse homedir = diff --git a/rel-eng/packages/SputLite b/rel-eng/packages/SputLite index c6bf7a2..ec1b4da 100644 --- a/rel-eng/packages/SputLite +++ b/rel-eng/packages/SputLite @@ -1 +1 @@ -0.48.10-1 monitoring/SputLite/ +0.48.11-1 monitoring/SputLite/ --===============2330966419027264613==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:50 2015 Content-Type: multipart/mixed; boundary="===============7647949550446446840==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: client/rhel rel-eng/packages Date: Thu, 25 Jun 2009 20:01:24 +0000 Message-ID: <20090625200124.331201201ED@lists.fedorahosted.org> --===============7647949550446446840== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 8 +++++++- rel-eng/packages/yum-rhn-plugin | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) New commits: commit 0d144650ded5dd72dd297336d0f693bca240004f Author: John Matthews Date: Thu Jun 25 15:56:03 2009 -0400 Automatic commit of package [yum-rhn-plugin] release [0.5.6-1]. diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/y= um-rhn-plugin/yum-rhn-plugin.spec index dcc986c..a4e6556 100644 --- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec +++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec @@ -1,7 +1,7 @@ Summary: RHN support for yum Name: yum-rhn-plugin Source: %{name}-%{version}.tar.gz -Version: 0.5.5 +Version: 0.5.6 Release: 1%{?dist} License: GPLv2 Group: System Environment/Base @@ -59,6 +59,12 @@ make -f Makefile.yum-rhn-plugin install VERSION=3D%{vers= ion}-%{release} PREFIX=3D$RP = = %changelog +* Thu Jun 25 2009 John Matthews 0.5.6-1 +- yum operations are not getting redirected as the GET requested is formed= at + the plugin level and not through rhnlib. (pkilambi(a)redhat.com) +- 467866 - Raise a more cleaner message if clients end up getting badStatu= sLine + error due to 502 proxy errors (pkilambi(a)redhat.com) + * Thu May 21 2009 jesus m. rodriguez 0.5.5-1 - merging additional spec changes and minor edits from svn (pkilambi(a)red= hat.com) - 467866 - catch the BadStatusLine and let use know that the server is diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plu= gin index 482c9e0..1544f8d 100644 --- a/rel-eng/packages/yum-rhn-plugin +++ b/rel-eng/packages/yum-rhn-plugin @@ -1 +1 @@ -0.5.5-1 client/rhel/yum-rhn-plugin/ +0.5.6-1 client/rhel/yum-rhn-plugin/ --===============7647949550446446840==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:50 2015 Content-Type: multipart/mixed; boundary="===============9059267208370577980==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/yum-rhn-plugin-0.5.6-1' Date: Thu, 25 Jun 2009 20:01:26 +0000 Message-ID: <20090625200126.C552E1201ED@lists.fedorahosted.org> --===============9059267208370577980== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'yum-rhn-plugin-0.5.6-1' created by John Matthews at 2009-06-25 19:56 +0000 Tagging package [yum-rhn-plugin] version [0.5.6-1] in directory [client/rhe= l/yum-rhn-plugin/]. Changes since SputLite-0.48.11-1: John Matthews (1): Automatic commit of package [yum-rhn-plugin] release [0.5.6-1]. --- client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 8 +++++++- rel-eng/packages/yum-rhn-plugin | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) --- --===============9059267208370577980==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:50 2015 Content-Type: multipart/mixed; boundary="===============4060234917217883946==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/rhn-client-tools-0.4.28-1' Date: Thu, 25 Jun 2009 20:02:29 +0000 Message-ID: <20090625200229.BC1301202FF@lists.fedorahosted.org> --===============4060234917217883946== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'rhn-client-tools-0.4.28-1' created by John Matthews at 2009-06-25 19:57 +0000 Tagging package [rhn-client-tools] version [0.4.28-1] in directory [client/= rhel/rhn-client-tools/]. Changes since yum-rhn-plugin-0.5.6-1: John Matthews (1): Automatic commit of package [rhn-client-tools] release [0.4.28-1]. --- client/rhel/rhn-client-tools/rhn-client-tools.spec | 18 ++++++++++++++++= +- rel-eng/packages/rhn-client-tools | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) --- --===============4060234917217883946==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:50 2015 Content-Type: multipart/mixed; boundary="===============2585310858471812873==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: client/rhel rel-eng/packages Date: Thu, 25 Jun 2009 20:02:27 +0000 Message-ID: <20090625200227.895DA1201ED@lists.fedorahosted.org> --===============2585310858471812873== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/rhel/rhn-client-tools/rhn-client-tools.spec | 18 ++++++++++++++++= +- rel-eng/packages/rhn-client-tools | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) New commits: commit 6b351ad5556d0b64390317e350adac7b851a7bf9 Author: John Matthews Date: Thu Jun 25 15:57:15 2009 -0400 Automatic commit of package [rhn-client-tools] release [0.4.28-1]. diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rh= el/rhn-client-tools/rhn-client-tools.spec index 53f9279..5dc8c60 100644 --- a/client/rhel/rhn-client-tools/rhn-client-tools.spec +++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec @@ -4,7 +4,7 @@ Group: System Environment/Base Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz URL: https://fedorahosted.org/spacewalk Name: rhn-client-tools -Version: 0.4.27 +Version: 0.4.28 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -204,6 +204,22 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/rhn_register.desktop = %changelog +* Thu Jun 25 2009 John Matthews 0.4.28-1 +- 503090 - Fix missing packages reported during rhnreg_ks. + (dgoodwin(a)redhat.com) +- 467866 - Raise a more cleaner message if clients end up getting badStatu= sLine + error due to 502 proxy errors (pkilambi(a)redhat.com) +- 504292 - fix the registration gui and tui to honor the ssl cert paths + specified in the config. Set the paths to default locations only if the = user + hasn't explicitly defined it. (pkilambi(a)redhat.com) +- 504296 - removing debug statements from hardware probing + (pkilambi(a)redhat.com) +- Support infinite available entitlements in TUI registration + (jbowes(a)redhat.com) +- account for virt_uuid is None case (pkilambi(a)redhat.com) +- Send smbios data to remaining_subscriptions during registration + (jbowes(a)redhat.com) + * Fri Jun 5 2009 Pradeep Kilambi - Resolves: #504296 = diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-clien= t-tools index 45c8eb1..ef7f6d9 100644 --- a/rel-eng/packages/rhn-client-tools +++ b/rel-eng/packages/rhn-client-tools @@ -1 +1 @@ -0.4.27-1 client/rhel/rhn-client-tools/ +0.4.28-1 client/rhel/rhn-client-tools/ --===============2585310858471812873==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:50 2015 Content-Type: multipart/mixed; boundary="===============3927750173256299808==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/osad-5.9.15-1' Date: Thu, 25 Jun 2009 20:04:44 +0000 Message-ID: <20090625200444.441DE1202FF@lists.fedorahosted.org> --===============3927750173256299808== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'osad-5.9.15-1' created by John Matthews at 200= 9-06-25 19:59 +0000 Tagging package [osad] version [5.9.15-1] in directory [client/tools/osad/]. Changes since rhn-client-tools-0.4.28-1: John Matthews (1): Automatic commit of package [osad] release [5.9.15-1]. --- client/tools/osad/osad.spec | 5 ++++- rel-eng/packages/osad | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) --- --===============3927750173256299808==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:50 2015 Content-Type: multipart/mixed; boundary="===============7807897574886376167==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: client/tools rel-eng/packages Date: Thu, 25 Jun 2009 20:04:41 +0000 Message-ID: <20090625200441.F221C1201ED@lists.fedorahosted.org> --===============7807897574886376167== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/osad/osad.spec | 5 ++++- rel-eng/packages/osad | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 91b30ed7b3897e831a6c28916f80dac575055f66 Author: John Matthews Date: Thu Jun 25 15:59:28 2009 -0400 Automatic commit of package [osad] release [5.9.15-1]. diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index b9a6377..e165bda 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -9,7 +9,7 @@ Group: System Environment/Daemons License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz -Version: 5.9.14 +Version: 5.9.15 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -236,6 +236,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -r= vvi {} = # $Id$ %changelog +* Thu Jun 25 2009 John Matthews 5.9.15-1 +- 508064 - fix osad installation errors on client (mzazrivec(a)redhat.com) + * Thu Jun 18 2009 Jan Pazdziora 5.9.14-1 - 505606 - Require at least selinux-policy 2.4.6-114 = diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad index 253e469..98af1c7 100644 --- a/rel-eng/packages/osad +++ b/rel-eng/packages/osad @@ -1 +1 @@ -5.9.14-1 client/tools/osad/ +5.9.15-1 client/tools/osad/ --===============7807897574886376167==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:50 2015 Content-Type: multipart/mixed; boundary="===============3162026166921118796==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-koan-0.1.15-1' Date: Thu, 25 Jun 2009 20:08:48 +0000 Message-ID: <20090625200848.AC2391202FF@lists.fedorahosted.org> --===============3162026166921118796== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-koan-0.1.15-1' created by John Matthews at 2009-06-25 20:03 +0000 Tagging package [spacewalk-koan] version [0.1.15-1] in directory [client/to= ols/spacewalk-koan/]. Changes since osad-5.9.15-1: John Matthews (1): Automatic commit of package [spacewalk-koan] release [0.1.15-1]. --- client/tools/spacewalk-koan/spacewalk-koan.spec | 12 +++++++++++- rel-eng/packages/spacewalk-koan | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) --- --===============3162026166921118796==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:50 2015 Content-Type: multipart/mixed; boundary="===============3926429004197604060==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: client/tools rel-eng/packages Date: Thu, 25 Jun 2009 20:08:46 +0000 Message-ID: <20090625200846.204461201ED@lists.fedorahosted.org> --===============3926429004197604060== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/spacewalk-koan/spacewalk-koan.spec | 12 +++++++++++- rel-eng/packages/spacewalk-koan | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) New commits: commit 1a824379f9096447ce5478bea7d7b9c82f003fae Author: John Matthews Date: Thu Jun 25 16:03:33 2009 -0400 Automatic commit of package [spacewalk-koan] release [0.1.15-1]. diff --git a/client/tools/spacewalk-koan/spacewalk-koan.spec b/client/tools= /spacewalk-koan/spacewalk-koan.spec index a959484..b036399 100644 --- a/client/tools/spacewalk-koan/spacewalk-koan.spec +++ b/client/tools/spacewalk-koan/spacewalk-koan.spec @@ -3,7 +3,7 @@ Name: spacewalk-koan Group: System Environment/Kernel License: GPLv2 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz -Version: 0.1.14 +Version: 0.1.15 Release: 1%{?dist} BuildArch : noarch URL: https://fedorahosted.org/spacewalk @@ -49,6 +49,16 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/rhn/actions/ = %changelog +* Thu Jun 25 2009 John Matthews 0.1.15-1 +- fixing spacewalk-koan spec file to build for 2.1 properly + (jsherril(a)redhat.com) +- 497571 - switching to python 1.5 requires since we have to support 2.1 + (mmccune(a)gmail.com) +- 497571 - switch from True/False to 0/1 to support rhel 2.1 and + (mmccune(a)gmail.com) +- 503996 - Added some information on the error message to the status retur= ned + to the server. (jason.dobies(a)redhat.com) + * Thu May 21 2009 jesus m. rodriguez 0.1.14-1 - 497424 - Slight redesign of the KS Virt UI to deal with duplicate virt p= aths (paji(a)redhat.com) = diff --git a/rel-eng/packages/spacewalk-koan b/rel-eng/packages/spacewalk-k= oan index b13db85..02f7d1f 100644 --- a/rel-eng/packages/spacewalk-koan +++ b/rel-eng/packages/spacewalk-koan @@ -1 +1 @@ -0.1.14-1 client/tools/spacewalk-koan/ +0.1.15-1 client/tools/spacewalk-koan/ --===============3926429004197604060==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:50 2015 Content-Type: multipart/mixed; boundary="===============5844705299867434528==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/smartpm-0.3-1' Date: Thu, 25 Jun 2009 20:15:05 +0000 Message-ID: <20090625201505.23DA01202FF@lists.fedorahosted.org> --===============5844705299867434528== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'smartpm-0.3-1' created by John Matthews at 200= 9-06-25 20:09 +0000 Tagging package [smartpm] version [0.3-1] in directory [client/solaris/smar= tpm/]. Changes since spacewalk-koan-0.1.15-1: John Matthews (1): Automatic commit of package [smartpm] release [0.3-1]. --- client/solaris/smartpm/smartpm.spec | 8 +++++++- rel-eng/packages/smartpm | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) --- --===============5844705299867434528==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:50 2015 Content-Type: multipart/mixed; boundary="===============5978964929174125861==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: client/solaris rel-eng/packages Date: Thu, 25 Jun 2009 20:15:02 +0000 Message-ID: <20090625201502.B29941201ED@lists.fedorahosted.org> --===============5978964929174125861== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/solaris/smartpm/smartpm.spec | 8 +++++++- rel-eng/packages/smartpm | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) New commits: commit 1ed0fce29b70421f2e090fd97c4eb6b004fc030a Author: John Matthews Date: Thu Jun 25 16:09:47 2009 -0400 Automatic commit of package [smartpm] release [0.3-1]. diff --git a/client/solaris/smartpm/smartpm.spec b/client/solaris/smartpm/s= martpm.spec index 615ad2c..78bcc20 100644 --- a/client/solaris/smartpm/smartpm.spec +++ b/client/solaris/smartpm/smartpm.spec @@ -9,7 +9,7 @@ Summary: Next generation package handling tool Name: smartpm Source0: smartpm-%{version}.tar.gz -Version: 0.2 +Version: 0.3 Release: 1 License: GPLv2 Group: Applications/System @@ -59,6 +59,12 @@ env %{__python} setup.py build %{python_sitearch}/rhn/actions/solarispkgs.py* = %changelog +* Thu Jun 25 2009 John Matthews 0.3-1 +- 498079 - the -u option has to be specified before the file name, in call= to + unzip. (jpazdziora(a)redhat.com) +- 498079 - when unzip fails, show the actual error message and the target + directory. (jpazdziora(a)redhat.com) + * Mon Mar 23 2009 Devan Goodwin 0.2-1 - Rebuild from Spacewalk git. = diff --git a/rel-eng/packages/smartpm b/rel-eng/packages/smartpm index 45ef377..a059bca 100644 --- a/rel-eng/packages/smartpm +++ b/rel-eng/packages/smartpm @@ -1 +1 @@ -0.2-1 client/solaris/smartpm/ +0.3-1 client/solaris/smartpm/ --===============5978964929174125861==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:50 2015 Content-Type: multipart/mixed; boundary="===============2113091485041086198==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: client/rhel rel-eng/packages Date: Thu, 25 Jun 2009 20:16:38 +0000 Message-ID: <20090625201638.E834F1201ED@lists.fedorahosted.org> --===============2113091485041086198== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/rhel/rhnsd/rhnsd.spec | 7 ++++++- rel-eng/packages/rhnsd | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) New commits: commit 916cc858b7e29f354143b94f87bfce98f2e5696c Author: John Matthews Date: Thu Jun 25 16:11:27 2009 -0400 Automatic commit of package [rhnsd] release [4.5.10-1]. diff --git a/client/rhel/rhnsd/rhnsd.spec b/client/rhel/rhnsd/rhnsd.spec index d3bab98..d18b3b9 100644 --- a/client/rhel/rhnsd/rhnsd.spec +++ b/client/rhel/rhnsd/rhnsd.spec @@ -4,7 +4,7 @@ Group: System Environment/Base Source0: %{name}-%{version}.tar.gz Url: http://rhn.redhat.com Name: rhnsd -Version: 4.5.9 +Version: 4.5.10 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) = @@ -58,6 +58,11 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man8/rhnsd.8* = %changelog +* Thu Jun 25 2009 John Matthews 4.5.10-1 +- 243699: fixing the error code when unknown command is used with rhnsd in= it + (pkilambi(a)redhat.com) +- updateing translations for rhnsd (pkilambi(a)redhat.com) + * Wed Jun 3 2009 Pradeep Kilambi 4.7.0-3 - Resolves: #243699 -fixing error code for unknown command to rhnsd init = script = diff --git a/rel-eng/packages/rhnsd b/rel-eng/packages/rhnsd index a1d3fda..9e96a69 100644 --- a/rel-eng/packages/rhnsd +++ b/rel-eng/packages/rhnsd @@ -1 +1 @@ -4.5.9-1 client/rhel/rhnsd/ +4.5.10-1 client/rhel/rhnsd/ --===============2113091485041086198==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:50 2015 Content-Type: multipart/mixed; boundary="===============5441988040192115711==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/rhnsd-4.5.10-1' Date: Thu, 25 Jun 2009 20:16:41 +0000 Message-ID: <20090625201641.4BC9F1201ED@lists.fedorahosted.org> --===============5441988040192115711== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'rhnsd-4.5.10-1' created by John Matthews at 20= 09-06-25 20:11 +0000 Tagging package [rhnsd] version [4.5.10-1] in directory [client/rhel/rhnsd/= ]. Changes since smartpm-0.3-1: John Matthews (1): Automatic commit of package [rhnsd] release [4.5.10-1]. --- client/rhel/rhnsd/rhnsd.spec | 7 ++++++- rel-eng/packages/rhnsd | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) --- --===============5441988040192115711==-- From shughes at fedoraproject.org Thu Aug 20 11:57:50 2015 Content-Type: multipart/mixed; boundary="===============0758055149440143323==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Thu, 25 Jun 2009 20:34:38 +0000 Message-ID: <20090625203438.B40F81201ED@lists.fedorahosted.org> --===============0758055149440143323== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java | = 1 - 1 file changed, 1 deletion(-) New commits: commit b2b5ffafbd58a24896f07d0f73df3ad43de33136 Author: Shannon Hughes Date: Thu Jun 25 16:26:05 2009 -0400 oops, remove debug message diff --git a/java/code/src/com/redhat/rhn/manager/channel/CreateChannelComm= and.java b/java/code/src/com/redhat/rhn/manager/channel/CreateChannelComman= d.java index 9dddd81..0b94bfe 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java +++ b/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java @@ -348,7 +348,6 @@ public class CreateChannelCommand { } = if (cname.length() > CHANNEL_NAME_MAX_LENGTH) { - System.out.println("YIIIIIIIIIIIKES"); Integer maxLength =3D new Integer(CreateChannelCommand.CHANNEL= _NAME_MAX_LENGTH); throw new InvalidChannelNameException(cname, InvalidChannelNameException.Reason.TOO_LONG, --===============0758055149440143323==-- From shughes at fedoraproject.org Thu Aug 20 11:57:50 2015 Content-Type: multipart/mixed; boundary="===============7820886821744457939==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Thu, 25 Jun 2009 20:35:56 +0000 Message-ID: <20090625203556.85EAB1201ED@lists.fedorahosted.org> --===============7820886821744457939== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java | = 1 - 1 file changed, 1 deletion(-) New commits: commit 2b95b3eda50b6f0bfc81054b77de91710ce72a0c Author: Shannon Hughes Date: Thu Jun 25 16:26:05 2009 -0400 oops, remove debug message diff --git a/java/code/src/com/redhat/rhn/manager/channel/CreateChannelComm= and.java b/java/code/src/com/redhat/rhn/manager/channel/CreateChannelComman= d.java index 9dddd81..0b94bfe 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java +++ b/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java @@ -348,7 +348,6 @@ public class CreateChannelCommand { } = if (cname.length() > CHANNEL_NAME_MAX_LENGTH) { - System.out.println("YIIIIIIIIIIIKES"); Integer maxLength =3D new Integer(CreateChannelCommand.CHANNEL= _NAME_MAX_LENGTH); throw new InvalidChannelNameException(cname, InvalidChannelNameException.Reason.TOO_LONG, --===============7820886821744457939==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:50 2015 Content-Type: multipart/mixed; boundary="===============1491362130275870012==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/rhnpush-5.4.2-1' Date: Thu, 25 Jun 2009 20:50:38 +0000 Message-ID: <20090625205038.84CAF1202FF@lists.fedorahosted.org> --===============1491362130275870012== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'rhnpush-5.4.2-1' created by John Matthews at 2= 009-06-25 20:45 +0000 Tagging package [rhnpush] version [5.4.2-1] in directory [client/tools/rhnp= ush/]. Changes since rhnsd-4.5.10-1: John Matthews (1): Automatic commit of package [rhnpush] release [5.4.2-1]. Shannon Hughes (1): oops, remove debug message --- client/tools/rhnpush/rhnpush.spec | = 8 +++++++- java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java | = 1 - rel-eng/packages/rhnpush | = 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) --- --===============1491362130275870012==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:50 2015 Content-Type: multipart/mixed; boundary="===============1619635039159155333==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: client/tools rel-eng/packages Date: Thu, 25 Jun 2009 20:50:36 +0000 Message-ID: <20090625205036.4CCCD1201ED@lists.fedorahosted.org> --===============1619635039159155333== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/rhnpush/rhnpush.spec | 8 +++++++- rel-eng/packages/rhnpush | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) New commits: commit 7d0ba942b2146681dea752be77d2cba89ff96688 Author: John Matthews Date: Thu Jun 25 16:45:24 2009 -0400 Automatic commit of package [rhnpush] release [5.4.2-1]. diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpu= sh.spec index baa83b0..9a9f6e9 100644 --- a/client/tools/rhnpush/rhnpush.spec +++ b/client/tools/rhnpush/rhnpush.spec @@ -5,7 +5,7 @@ Summary: Common programs needed to be installed on th= e RHN servers/proxies Group: Applications/System License: GPLv2 URL: http://fedorahosted.org/spacewalk -Version: 5.4.1 +Version: 5.4.2 Release: 1%{?dist} Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{v= ersion}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} = -n) @@ -49,6 +49,12 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/solaris2mpm.8* = %changelog +* Thu Jun 25 2009 John Matthews 5.4.2-1 +- merging missed chances from previous commit (pkilambi(a)redhat.com) +- removing unused modules and some clean up (pkilambi(a)redhat.com) +- fixing rhnpush to work on fedora-11 clients. Replaced the deprecated + checksum modules and use hashlib instead. (pkilambi(a)redhat.com) + * Wed Apr 08 2009 Jan Pazdziora 5.4.1-1 - 488157 - turn sparcv9 into sparc = diff --git a/rel-eng/packages/rhnpush b/rel-eng/packages/rhnpush index 43f65d2..48880cc 100644 --- a/rel-eng/packages/rhnpush +++ b/rel-eng/packages/rhnpush @@ -1 +1 @@ -5.4.1-1 client/tools/rhnpush/ +5.4.2-1 client/tools/rhnpush/ --===============1619635039159155333==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:50 2015 Content-Type: multipart/mixed; boundary="===============5961623399821953389==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-proxy-0.6.5-1' Date: Thu, 25 Jun 2009 20:56:47 +0000 Message-ID: <20090625205647.674441202FF@lists.fedorahosted.org> --===============5961623399821953389== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-proxy-0.6.5-1' created by John Matthews at 2009-06-25 20:51 +0000 Tagging package [spacewalk-proxy] version [0.6.5-1] in directory [proxy/pro= xy/]. Changes since rhnpush-5.4.2-1: John Matthews (1): Automatic commit of package [spacewalk-proxy] release [0.6.5-1]. --- proxy/proxy/spacewalk-proxy.spec | 6 +++++- rel-eng/packages/spacewalk-proxy | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) --- --===============5961623399821953389==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:51 2015 Content-Type: multipart/mixed; boundary="===============6309291744493162167==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: proxy/proxy rel-eng/packages Date: Thu, 25 Jun 2009 20:56:45 +0000 Message-ID: <20090625205645.2A2191201ED@lists.fedorahosted.org> --===============6309291744493162167== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/proxy/spacewalk-proxy.spec | 6 +++++- rel-eng/packages/spacewalk-proxy | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit bf09a84c1cbd8102b344f6c1c813cf5b2b7f54a2 Author: John Matthews Date: Thu Jun 25 16:51:33 2009 -0400 Automatic commit of package [spacewalk-proxy] release [0.6.5-1]. diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy= .spec index 74e9180..65f9545 100644 --- a/proxy/proxy/spacewalk-proxy.spec +++ b/proxy/proxy/spacewalk-proxy.spec @@ -4,7 +4,7 @@ Group: Applications/Internet License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz -Version: 0.6.4 +Version: 0.6.5 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) = BuildRequires: python @@ -288,6 +288,10 @@ fi = = %changelog +* Thu Jun 25 2009 John Matthews 0.6.5-1 +- change comments to docstrings (msuchy(a)redhat.com) +- change comments to docstrings (msuchy(a)redhat.com) + * Mon Jun 15 2009 Miroslav Suchy 0.6.4-1 - 503187 - close tag = diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-= proxy index 29725a0..c208048 100644 --- a/rel-eng/packages/spacewalk-proxy +++ b/rel-eng/packages/spacewalk-proxy @@ -1 +1 @@ -0.6.4-1 proxy/proxy/ +0.6.5-1 proxy/proxy/ --===============6309291744493162167==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:51 2015 Content-Type: multipart/mixed; boundary="===============1846318512607444358==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Thu, 25 Jun 2009 21:12:18 +0000 Message-ID: <20090625211218.EF3C41201ED@lists.fedorahosted.org> --===============1846318512607444358== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageSerializer.= java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit 253ecb57ad6e9d8923ac6f054886125b0b18c51a Author: Brad Buckingham Date: Thu Jun 25 17:11:48 2009 -0400 507959 - api - channel.software.mergePackages null pointer fix = The serializer used by this API was not checking to see if the provider= was null before accessing it thereby generating a null pointer exception... diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/Packag= eSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/= PackageSerializer.java index f21c4a0..66c8ad5 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageSerial= izer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageSerial= izer.java @@ -76,9 +76,12 @@ public class PackageSerializer implements XmlRpcCustomSe= rializer { = String provider =3D LocalizationService.getInstance().getMessage( "channel.jsp.gpgunknown"); - for (PackageKey key : pack.getPackageKeys()) { - if (key.getType().equals(PackageFactory.PACKAGE_KEY_TYPE_GPG))= { + if (pack.getPackageKeys() !=3D null) { + for (PackageKey key : pack.getPackageKeys()) { + if (key.getType().equals(PackageFactory.PACKAGE_KEY_TYPE_G= PG) && + key.getProvider() !=3D null) { provider =3D key.getProvider().getName(); + } } } helper.add("provider", provider); = --===============1846318512607444358==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:51 2015 Content-Type: multipart/mixed; boundary="===============8736844319939760368==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Thu, 25 Jun 2009 21:14:19 +0000 Message-ID: <20090625211419.E9CBC1201ED@lists.fedorahosted.org> --===============8736844319939760368== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageSerializer.= java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit f8708682cef7102a144c7975d6bdedc160ef4a77 Author: Brad Buckingham Date: Thu Jun 25 17:11:48 2009 -0400 507959 - api - channel.software.mergePackages null pointer fix = The serializer used by this API was not checking to see if the provider= was null before accessing it thereby generating a null pointer exception... diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/Packag= eSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/= PackageSerializer.java index f21c4a0..66c8ad5 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageSerial= izer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageSerial= izer.java @@ -76,9 +76,12 @@ public class PackageSerializer implements XmlRpcCustomSe= rializer { = String provider =3D LocalizationService.getInstance().getMessage( "channel.jsp.gpgunknown"); - for (PackageKey key : pack.getPackageKeys()) { - if (key.getType().equals(PackageFactory.PACKAGE_KEY_TYPE_GPG))= { + if (pack.getPackageKeys() !=3D null) { + for (PackageKey key : pack.getPackageKeys()) { + if (key.getType().equals(PackageFactory.PACKAGE_KEY_TYPE_G= PG) && + key.getProvider() !=3D null) { provider =3D key.getProvider().getName(); + } } } helper.add("provider", provider); = --===============8736844319939760368==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:51 2015 Content-Type: multipart/mixed; boundary="===============4839790484917677030==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: monitoring/nocpulse-common rel-eng/packages Date: Thu, 25 Jun 2009 21:24:09 +0000 Message-ID: <20090625212409.346D31201ED@lists.fedorahosted.org> --===============4839790484917677030== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable monitoring/nocpulse-common/nocpulse-common.spec | 6 +++++- rel-eng/packages/nocpulse-common | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 3c68ee8cf2a526176ace81f0ea24ee7d9a04b9a5 Author: John Matthews Date: Thu Jun 25 17:18:56 2009 -0400 Automatic commit of package [nocpulse-common] release [2.1.16-1]. diff --git a/monitoring/nocpulse-common/nocpulse-common.spec b/monitoring/n= ocpulse-common/nocpulse-common.spec index d279b9f..7309672 100644 --- a/monitoring/nocpulse-common/nocpulse-common.spec +++ b/monitoring/nocpulse-common/nocpulse-common.spec @@ -1,5 +1,5 @@ Name: nocpulse-common -Version: 2.1.15 +Version: 2.1.16 Release: 1%{?dist} Summary: NOCpulse common License: GPLv2 @@ -136,6 +136,10 @@ fi rm -rf $RPM_BUILD_ROOT = %changelog +* Thu Jun 25 2009 John Matthews 2.1.16-1 +- don't print error when files to be moved don't exist (mzazrivec(a)redhat= .com) +- Don't to migrate log files from /home/nocpulse/var (mzazrivec(a)redhat.c= om) + * Tue Jun 16 2009 Miroslav Such=C3=BD 2.1.15-1 - fix problem when nocpulse user do not exist = diff --git a/rel-eng/packages/nocpulse-common b/rel-eng/packages/nocpulse-c= ommon index e1088df..e4049bd 100644 --- a/rel-eng/packages/nocpulse-common +++ b/rel-eng/packages/nocpulse-common @@ -1 +1 @@ -2.1.15-1 monitoring/nocpulse-common/ +2.1.16-1 monitoring/nocpulse-common/ --===============4839790484917677030==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:51 2015 Content-Type: multipart/mixed; boundary="===============2964367265479245332==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/nocpulse-common-2.1.16-1' Date: Thu, 25 Jun 2009 21:24:11 +0000 Message-ID: <20090625212411.D1CB812030A@lists.fedorahosted.org> --===============2964367265479245332== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'nocpulse-common-2.1.16-1' created by John Matthews at 2009-06-25 21:18 +0000 Tagging package [nocpulse-common] version [2.1.16-1] in directory [monitori= ng/nocpulse-common/]. Changes since spacewalk-proxy-0.6.5-1: Brad Buckingham (1): 507959 - api - channel.software.mergePackages null pointer fix John Matthews (1): Automatic commit of package [nocpulse-common] release [2.1.16-1]. --- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageSerializer.= java | 7 +++++-- monitoring/nocpulse-common/nocpulse-common.spec = | 6 +++++- rel-eng/packages/nocpulse-common = | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) --- --===============2964367265479245332==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:51 2015 Content-Type: multipart/mixed; boundary="===============3432518475758425355==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/oracle-server-scripts-10.2.0-30' Date: Thu, 25 Jun 2009 21:27:50 +0000 Message-ID: <20090625212750.165E71202FF@lists.fedorahosted.org> --===============3432518475758425355== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'oracle-server-scripts-10.2.0-30' created by John Matthews at 2009-06-25 21:22 +0000 Tagging package [oracle-server-scripts] version [10.2.0-30] in directory [p= rojects/oracle-server-scripts/]. Changes since nocpulse-common-2.1.16-1: John Matthews (1): Automatic commit of package [oracle-server-scripts] minor release [10= .2.0-30]. --- projects/oracle-server-scripts/oracle-server-scripts.spec | 8 +++++++- rel-eng/packages/oracle-server-scripts | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) --- --===============3432518475758425355==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:51 2015 Content-Type: multipart/mixed; boundary="===============7856622431126633810==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: projects/oracle-server-scripts rel-eng/packages Date: Thu, 25 Jun 2009 21:27:47 +0000 Message-ID: <20090625212747.C11781201ED@lists.fedorahosted.org> --===============7856622431126633810== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable projects/oracle-server-scripts/oracle-server-scripts.spec | 8 +++++++- rel-eng/packages/oracle-server-scripts | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) New commits: commit 5b99fc9aa454a8a0d811b13f6bc6ee2ca3b8472c Author: John Matthews Date: Thu Jun 25 17:22:36 2009 -0400 Automatic commit of package [oracle-server-scripts] minor release [10.2= .0-30]. diff --git a/projects/oracle-server-scripts/oracle-server-scripts.spec b/pr= ojects/oracle-server-scripts/oracle-server-scripts.spec index 5b7b8c0..0daf81f 100644 --- a/projects/oracle-server-scripts/oracle-server-scripts.spec +++ b/projects/oracle-server-scripts/oracle-server-scripts.spec @@ -9,7 +9,7 @@ Summary: Oracle 10g Database Server Enterprise Edition scripts Name: oracle-server-scripts Version: 10.2.0 -Release: 29%{?dist} +Release: 30%{?dist} Source0: oracle-home.sh Source1: init-params.ora Source2: create-db.sh @@ -99,6 +99,12 @@ exit 0 %{oracle_scripts} = %changelog +* Thu Jun 25 2009 John Matthews 10.2.0-30 +- handle existing embedded entries in /etc/oratab during install + (mzazrivec(a)redhat.com) +- create embedded db entry only if it does not exist (mzazrivec(a)redhat.c= om) +- We use 10.2.0.4 embedded db now (mzazrivec(a)redhat.com) + * Tue Jun 02 2009 Milan Zazrivec 10.2.0-29 - script for 10.2.0.3 to 10.2.0.4 10g upgrade * Thu May 21 2009 jesus m. rodriguez 10.2.0-28 diff --git a/rel-eng/packages/oracle-server-scripts b/rel-eng/packages/orac= le-server-scripts index 5d0334a..b06d5f9 100644 --- a/rel-eng/packages/oracle-server-scripts +++ b/rel-eng/packages/oracle-server-scripts @@ -1 +1 @@ -10.2.0-29 projects/oracle-server-scripts/ +10.2.0-30 projects/oracle-server-scripts/ --===============7856622431126633810==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:51 2015 Content-Type: multipart/mixed; boundary="===============2355633506951406617==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-backend-0.6.15-1' Date: Thu, 25 Jun 2009 21:28:58 +0000 Message-ID: <20090625212858.7E56E1202FF@lists.fedorahosted.org> --===============2355633506951406617== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-backend-0.6.15-1' created by John Matthews at 2009-06-25 21:23 +0000 Tagging package [spacewalk-backend] version [0.6.15-1] in directory [backen= d/]. Changes since oracle-server-scripts-10.2.0-30: John Matthews (1): Automatic commit of package [spacewalk-backend] release [0.6.15-1]. --- backend/spacewalk-backend.spec | 4 ++-- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) --- --===============2355633506951406617==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:51 2015 Content-Type: multipart/mixed; boundary="===============6601539469262263347==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: backend/spacewalk-backend.spec rel-eng/packages Date: Thu, 25 Jun 2009 21:28:55 +0000 Message-ID: <20090625212855.DE3F11201ED@lists.fedorahosted.org> --===============6601539469262263347== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/spacewalk-backend.spec | 4 ++-- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit f92688ae0aef79d5682ee26b128bad2b3d5aa2da Author: John Matthews Date: Thu Jun 25 17:23:43 2009 -0400 Automatic commit of package [spacewalk-backend] release [0.6.15-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 350d207..d9dea5e 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -7,7 +7,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/p= roxies Group: Applications/Internet License: GPLv2 -Version: 0.6.14 +Version: 0.6.15 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz @@ -568,7 +568,7 @@ rm -f %{rhnconf}/rhnSecret.py* = # $Id$ %changelog -* Thu Jun 25 2009 John Matthews 0.6.14-1 +* Thu Jun 25 2009 John Matthews 0.6.15-1 - change comments to docstrings (msuchy(a)redhat.com) - change comments to docstrings (msuchy(a)redhat.com) - change comments to docstrings (msuchy(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewal= k-backend index f4be8cc..65f3b59 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -0.6.14-1 backend/ +0.6.15-1 backend/ --===============6601539469262263347==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:51 2015 Content-Type: multipart/mixed; boundary="===============0844503794626361763==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-java-0.6.28-1' Date: Thu, 25 Jun 2009 21:29:54 +0000 Message-ID: <20090625212954.D19151202FF@lists.fedorahosted.org> --===============0844503794626361763== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-java-0.6.28-1' created by John Matthews at 2009-06-25 21:24 +0000 Tagging package [spacewalk-java] version [0.6.28-1] in directory [java/]. Changes since spacewalk-backend-0.6.15-1: John Matthews (1): Automatic commit of package [spacewalk-java] release [0.6.28-1]. --- java/spacewalk-java.spec | 4 ++-- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) --- --===============0844503794626361763==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:51 2015 Content-Type: multipart/mixed; boundary="===============7545333156272845940==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: java/spacewalk-java.spec rel-eng/packages Date: Thu, 25 Jun 2009 21:29:52 +0000 Message-ID: <20090625212952.B87C21201ED@lists.fedorahosted.org> --===============7545333156272845940== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/spacewalk-java.spec | 4 ++-- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit ed5206ad376404e53d883e1717ce079b6b59c5a4 Author: John Matthews Date: Thu Jun 25 17:24:37 2009 -0400 Automatic commit of package [spacewalk-java] release [0.6.28-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index e6b5a8e..488976a 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -11,7 +11,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 0.6.27 +Version: 0.6.28 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{versi= on}.tar.gz = @@ -250,7 +250,7 @@ fi %attr(644, root, root) %{_datadir}/rhn/lib/rhn.jar = %changelog -* Thu Jun 25 2009 John Matthews 0.6.27-1 +* Thu Jun 25 2009 John Matthews 0.6.28-1 - Remove catch/log return null of HibernateExceptions. (dgoodwin(a)redhat.= com) - Fix server migration when source org has > 1000 org admins. (dgoodwin(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-j= ava index 747ed8f..bbbd9da 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -0.6.27-1 java/ +0.6.28-1 java/ --===============7545333156272845940==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:51 2015 Content-Type: multipart/mixed; boundary="===============6634707085249240219==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Thu, 25 Jun 2009 21:44:02 +0000 Message-ID: <20090625214402.853D91201ED@lists.fedorahosted.org> --===============6634707085249240219== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackage= MenuAction.java | 10 +--------- java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_chan= nel_header.jspf | 2 +- java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp = | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) New commits: commit d6d62ab7e85e9f23ef690ed6f65be23c9c8e561a Author: Brad Buckingham Date: Thu Jun 25 17:43:02 2009 -0400 508141 - ManageSoftwareChannels - fix broken links for 'delete software= channel' = The delete_confirm.pxt has been ported to java; however, there were sti= ll several pages pointing to it. Updated those. = Also found that the channel id (cid) was not being saved in the request= for ManageSoftwareChannels->channel->Packages; therefore, the delete link o= n that page was missing the cid value. Updated that as well. diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/Ch= annelPackageMenuAction.java b/java/code/src/com/redhat/rhn/frontend/action/= channel/manage/ChannelPackageMenuAction.java index 93a7c4d..54d782d 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPa= ckageMenuAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPa= ckageMenuAction.java @@ -35,8 +35,6 @@ import javax.servlet.http.HttpServletResponse; */ public class ChannelPackageMenuAction extends RhnAction { = - - /** {@inheritDoc} */ public ActionForward execute(ActionMapping mapping, ActionForm formIn, @@ -46,7 +44,6 @@ public class ChannelPackageMenuAction extends RhnAction { RequestContext requestContext =3D new RequestContext(request); User user =3D requestContext.getLoggedInUser(); = - long cid =3D requestContext.getRequiredParam("cid"); = Channel chan =3D ChannelFactory.lookupByIdAndUser(cid, user); @@ -57,13 +54,8 @@ public class ChannelPackageMenuAction extends RhnAction { = request.setAttribute("channel_name", chan.getName()); request.setAttribute("channel", chan); + request.setAttribute("cid", cid); = return mapping.findForward("default"); - } - - - - - } diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage= /manage_channel_header.jspf b/java/code/webapp/WEB-INF/pages/common/fragmen= ts/channel/manage/manage_channel_header.jspf index 172aa7f..118367c 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage= _channel_header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage= _channel_header.jspf @@ -1,7 +1,7 @@ diff --git a/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp b= /java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp index e345a73..a344361 100644 --- a/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp +++ b/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp @@ -10,7 +10,7 @@ --===============6634707085249240219==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:51 2015 Content-Type: multipart/mixed; boundary="===============0217439988038592035==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Thu, 25 Jun 2009 21:45:59 +0000 Message-ID: <20090625214559.B7C541201ED@lists.fedorahosted.org> --===============0217439988038592035== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackage= MenuAction.java | 10 +--------- java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_chan= nel_header.jspf | 2 +- java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp = | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) New commits: commit 7199612c442c40fc67046895be6c175cc1a8b983 Author: Brad Buckingham Date: Thu Jun 25 17:43:02 2009 -0400 508141 - ManageSoftwareChannels - fix broken links for 'delete software= channel' = The delete_confirm.pxt has been ported to java; however, there were sti= ll several pages pointing to it. Updated those. = Also found that the channel id (cid) was not being saved in the request= for ManageSoftwareChannels->channel->Packages; therefore, the delete link o= n that page was missing the cid value. Updated that as well. diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/Ch= annelPackageMenuAction.java b/java/code/src/com/redhat/rhn/frontend/action/= channel/manage/ChannelPackageMenuAction.java index 93a7c4d..54d782d 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPa= ckageMenuAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPa= ckageMenuAction.java @@ -35,8 +35,6 @@ import javax.servlet.http.HttpServletResponse; */ public class ChannelPackageMenuAction extends RhnAction { = - - /** {@inheritDoc} */ public ActionForward execute(ActionMapping mapping, ActionForm formIn, @@ -46,7 +44,6 @@ public class ChannelPackageMenuAction extends RhnAction { RequestContext requestContext =3D new RequestContext(request); User user =3D requestContext.getLoggedInUser(); = - long cid =3D requestContext.getRequiredParam("cid"); = Channel chan =3D ChannelFactory.lookupByIdAndUser(cid, user); @@ -57,13 +54,8 @@ public class ChannelPackageMenuAction extends RhnAction { = request.setAttribute("channel_name", chan.getName()); request.setAttribute("channel", chan); + request.setAttribute("cid", cid); = return mapping.findForward("default"); - } - - - - - } diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage= /manage_channel_header.jspf b/java/code/webapp/WEB-INF/pages/common/fragmen= ts/channel/manage/manage_channel_header.jspf index 172aa7f..118367c 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage= _channel_header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage= _channel_header.jspf @@ -1,7 +1,7 @@ diff --git a/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp b= /java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp index bcba877..ae73eb3 100644 --- a/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp +++ b/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp @@ -16,7 +16,7 @@ = --===============0217439988038592035==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:51 2015 Content-Type: multipart/mixed; boundary="===============6574174165015196679==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: client/tools rel-eng/packages Date: Thu, 25 Jun 2009 21:57:27 +0000 Message-ID: <20090625215727.109961201ED@lists.fedorahosted.org> --===============6574174165015196679== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/tools/rhn-virtualization/rhn-virtualization.spec | 6 +++++- rel-eng/packages/rhn-virtualization | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 9cdd3b750f36399d1e26bccc95f707dac0fadc5e Author: Brad Buckingham Date: Thu Jun 25 17:56:52 2009 -0400 Automatic commit of package [rhn-virtualization] release [5.4.1-1]. diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec b/clie= nt/tools/rhn-virtualization/rhn-virtualization.spec index 7407508..fbc0bf5 100644 --- a/client/tools/rhn-virtualization/rhn-virtualization.spec +++ b/client/tools/rhn-virtualization/rhn-virtualization.spec @@ -10,7 +10,7 @@ License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{= version}.tar.gz = -Version: 5.4.0 +Version: 5.4.1 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u}= -n) BuildArch: noarch @@ -162,6 +162,10 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE = %changelog +* Thu Jun 25 2009 Brad Buckingham 5.4.1-1 +- 470335 - Fixing EOF error when poller tries to pickle dump the data to c= ache + file. (pkilambi(a)redhat.com) + * Tue Jun 16 2009 Brad Buckingham 5.4.0-1 - bumping version (bbuckingham(a)redhat.com) - 502902 - If xend is not running instead of returning an empty list retur= n an diff --git a/rel-eng/packages/rhn-virtualization b/rel-eng/packages/rhn-vir= tualization index 87f4c1c..e782bec 100644 --- a/rel-eng/packages/rhn-virtualization +++ b/rel-eng/packages/rhn-virtualization @@ -1 +1 @@ -5.4.0-1 client/tools/rhn-virtualization/ +5.4.1-1 client/tools/rhn-virtualization/ --===============6574174165015196679==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:51 2015 Content-Type: multipart/mixed; boundary="===============3512108870549037951==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/rhn-virtualization-5.4.1-1' Date: Thu, 25 Jun 2009 21:57:32 +0000 Message-ID: <20090625215732.A2A7C1202FF@lists.fedorahosted.org> --===============3512108870549037951== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'rhn-virtualization-5.4.1-1' created by Brad Buckingham at 2009-06-25 21:56 +0000 Tagging package [rhn-virtualization] version [5.4.1-1] in directory [client= /tools/rhn-virtualization/]. Changes since spacewalk-java-0.6.28-1: Brad Buckingham (2): 508141 - ManageSoftwareChannels - fix broken links for 'delete softwa= re channel' Automatic commit of package [rhn-virtualization] release [5.4.1-1]. --- client/tools/rhn-virtualization/rhn-virtualization.spec = | 6 +++++- java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackage= MenuAction.java | 10 +--------- java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_chan= nel_header.jspf | 2 +- java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp = | 2 +- rel-eng/packages/rhn-virtualization = | 2 +- 5 files changed, 9 insertions(+), 13 deletions(-) --- --===============3512108870549037951==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:51 2015 Content-Type: multipart/mixed; boundary="===============7014367867648864997==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-java-0.6.29-1' Date: Thu, 25 Jun 2009 21:59:58 +0000 Message-ID: <20090625215958.6466A120309@lists.fedorahosted.org> --===============7014367867648864997== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-java-0.6.29-1' created by John Matthews at 2009-06-25 21:54 +0000 Tagging package [spacewalk-java] version [0.6.29-1] in directory [java/]. Changes since rhn-virtualization-5.4.1-1: John Matthews (1): Automatic commit of package [spacewalk-java] release [0.6.29-1]. --- java/spacewalk-java.spec | 4 ++-- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) --- --===============7014367867648864997==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:51 2015 Content-Type: multipart/mixed; boundary="===============7790371023579150465==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: java/spacewalk-java.spec rel-eng/packages Date: Thu, 25 Jun 2009 21:59:56 +0000 Message-ID: <20090625215956.53413120304@lists.fedorahosted.org> --===============7790371023579150465== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/spacewalk-java.spec | 4 ++-- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit d58966434ef7a5544cc537d41c47fa0c70e11d3d Author: John Matthews Date: Thu Jun 25 17:54:43 2009 -0400 Automatic commit of package [spacewalk-java] release [0.6.29-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 488976a..4a19631 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -11,7 +11,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 0.6.28 +Version: 0.6.29 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{versi= on}.tar.gz = @@ -250,7 +250,7 @@ fi %attr(644, root, root) %{_datadir}/rhn/lib/rhn.jar = %changelog -* Thu Jun 25 2009 John Matthews 0.6.28-1 +* Thu Jun 25 2009 John Matthews 0.6.29-1 - Remove catch/log return null of HibernateExceptions. (dgoodwin(a)redhat.= com) - Fix server migration when source org has > 1000 org admins. (dgoodwin(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-j= ava index bbbd9da..51d3e20 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -0.6.28-1 java/ +0.6.29-1 java/ --===============7790371023579150465==-- From jmatthews at fedoraproject.org Thu Aug 20 11:57:51 2015 Content-Type: multipart/mixed; boundary="===============6942855914539748580==" MIME-Version: 1.0 From: John Matthews To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Thu, 25 Jun 2009 22:28:31 +0000 Message-ID: <20090625222831.F072B1201ED@lists.fedorahosted.org> --===============6942855914539748580== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.jav= a | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3861a01016f590d581d47591c24fa50f8119cca5 Author: John Matthews Date: Thu Jun 25 18:22:34 2009 -0400 ErrataSearch, add "synopsis" to ALL_FIELDS diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSear= chAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataS= earchAction.java index 2ea77af..5febc05 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchActio= n.java +++ b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchActio= n.java @@ -559,7 +559,7 @@ public class ErrataSearchAction extends RhnAction { query =3D escapeSpecialChars(query); return "(description:(" + query + ") topic:(" + query + ") sol= ution:(" + query + ") notes:(" + query + ") product:(" + query + ")" + - " advisoryName:(" + query + "))"; + " advisoryName:(" + query + ") synopsis:(" + query + "))"; } else if (OPT_ADVISORY.equals(mode)) { query =3D escapeSpecialChars(query); --===============6942855914539748580==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:51 2015 Content-Type: multipart/mixed; boundary="===============1350304293172237345==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - proxy/proxy rel-eng/packages Date: Fri, 26 Jun 2009 09:15:49 +0000 Message-ID: <20090626091549.8E040120380@lists.fedorahosted.org> --===============1350304293172237345== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable proxy/proxy/broker/rhnRepository.py | 3 +-- proxy/proxy/spacewalk-proxy.spec | 5 ++++- rel-eng/packages/spacewalk-proxy | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) New commits: commit 8b411f10d7081c04954026fb4a656a4dd89bfadc Author: Miroslav Such=C3=BD Date: Fri Jun 26 11:15:43 2009 +0200 Automatic commit of package [spacewalk-proxy] release [0.6.6-1]. diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy= .spec index 65f9545..e83ca74 100644 --- a/proxy/proxy/spacewalk-proxy.spec +++ b/proxy/proxy/spacewalk-proxy.spec @@ -4,7 +4,7 @@ Group: Applications/Internet License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz -Version: 0.6.5 +Version: 0.6.6 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) = BuildRequires: python @@ -288,6 +288,9 @@ fi = = %changelog +* Fri Jun 26 2009 John Matthews 0.6.6-1 +- fix build error + * Thu Jun 25 2009 John Matthews 0.6.5-1 - change comments to docstrings (msuchy(a)redhat.com) - change comments to docstrings (msuchy(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-= proxy index c208048..16c29cd 100644 --- a/rel-eng/packages/spacewalk-proxy +++ b/rel-eng/packages/spacewalk-proxy @@ -1 +1 @@ -0.6.5-1 proxy/proxy/ +0.6.6-1 proxy/proxy/ commit 0a334d1d82426ffd6279777cb03f4eaf67bbd119 Author: Miroslav Such=C3=BD Date: Fri Jun 26 11:15:01 2009 +0200 fix build error = addressing: rhnRepository.py: Error compiling File "rhnRepository.py", line 247 name =3D nvrea[0] = ^ SyntaxError: unindent does not match any outer indentation level diff --git a/proxy/proxy/broker/rhnRepository.py b/proxy/proxy/broker/rhnRe= pository.py index 454518d..3daa794 100644 --- a/proxy/proxy/broker/rhnRepository.py +++ b/proxy/proxy/broker/rhnRepository.py @@ -242,8 +242,7 @@ def listPackages(function, channel, version): = = def computePackagePath(nvrea, source=3D0, prepend=3D""): - """ Finds the appropriate path, prepending something if necessary """ - + """ Finds the appropriate path, prepending something if necessary """ name =3D nvrea[0] release =3D nvrea[2] = --===============1350304293172237345==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:51 2015 Content-Type: multipart/mixed; boundary="===============5644012758165326450==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-proxy-0.6.6-1' Date: Fri, 26 Jun 2009 09:16:07 +0000 Message-ID: <20090626091607.47B65120380@lists.fedorahosted.org> --===============5644012758165326450== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-proxy-0.6.6-1' created by Miroslav Such=C3=BD at 2009-06-26 09:15 +0000 Tagging package [spacewalk-proxy] version [0.6.6-1] in directory [proxy/pro= xy/]. Changes since spacewalk-java-0.6.29-1: John Matthews (1): ErrataSearch, add "synopsis" to ALL_FIELDS Miroslav Such=C3=BD (2): fix build error Automatic commit of package [spacewalk-proxy] release [0.6.6-1]. --- java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.jav= a | 2 +- proxy/proxy/broker/rhnRepository.py = | 3 +-- proxy/proxy/spacewalk-proxy.spec = | 5 ++++- rel-eng/packages/spacewalk-proxy = | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) --- --===============5644012758165326450==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:51 2015 Content-Type: multipart/mixed; boundary="===============6280002253878070859==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - client/rhel rel-eng/packages Date: Fri, 26 Jun 2009 12:40:48 +0000 Message-ID: <20090626124048.408871201EE@lists.fedorahosted.org> --===============6280002253878070859== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 6 +++++- rel-eng/packages/yum-rhn-plugin | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit d4bce1069cd9aab44f6e1720ce4d8c4fa0b3a1f1 Author: Miroslav Such=C3=BD Date: Fri Jun 26 14:40:35 2009 +0200 Automatic commit of package [yum-rhn-plugin] release [0.5.7-1]. diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/y= um-rhn-plugin/yum-rhn-plugin.spec index 0157c6d..1a0b102 100644 --- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec +++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec @@ -1,7 +1,7 @@ Summary: RHN support for yum Name: yum-rhn-plugin Source: %{name}-%{version}.tar.gz -Version: 0.5.6 +Version: 0.5.7 Release: 1%{?dist} License: GPLv2 Group: System Environment/Base @@ -60,6 +60,9 @@ make -f Makefile.yum-rhn-plugin install VERSION=3D%{versi= on}-%{release} PREFIX=3D$RP = = %changelog +* Fri Jun 26 2009 John Matthews 0.5.7-1 +- yum-rhn-plugin requires m2crypto + * Thu Jun 25 2009 John Matthews 0.5.6-1 - yum operations are not getting redirected as the GET requested is formed= at the plugin level and not through rhnlib. (pkilambi(a)redhat.com) diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plu= gin index 1544f8d..ef578d7 100644 --- a/rel-eng/packages/yum-rhn-plugin +++ b/rel-eng/packages/yum-rhn-plugin @@ -1 +1 @@ -0.5.6-1 client/rhel/yum-rhn-plugin/ +0.5.7-1 client/rhel/yum-rhn-plugin/ commit 44a483d18aee83e460206ffb3eb8f28e8bf3a5e9 Author: Miroslav Such=C3=BD Date: Fri Jun 26 14:39:22 2009 +0200 yum-rhn-plugin requires m2crypto = addressing: Traceback (most recent call last): File "/usr/lib/yum-plugins/rhnplugin.py", line 43, in from M2Crypto.SSL import SSLError, Connection ImportError: No module named M2Crypto.SSL diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/y= um-rhn-plugin/yum-rhn-plugin.spec index a4e6556..0157c6d 100644 --- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec +++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec @@ -15,6 +15,7 @@ BuildRequires: gettext = Requires: yum >=3D 3.0-5.3 Requires: rhn-client-tools >=3D 0.4.19 +Requires: m2crypto = # Not really, but for upgrades we need these Requires: rhn-setup --===============6280002253878070859==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:51 2015 Content-Type: multipart/mixed; boundary="===============8631100939505503574==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/yum-rhn-plugin-0.5.7-1' Date: Fri, 26 Jun 2009 12:40:58 +0000 Message-ID: <20090626124058.E6B11120307@lists.fedorahosted.org> --===============8631100939505503574== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'yum-rhn-plugin-0.5.7-1' created by Miroslav Such=C3=BD at 2009-06-26 12:40 +0000 Tagging package [yum-rhn-plugin] version [0.5.7-1] in directory [client/rhe= l/yum-rhn-plugin/]. Changes since spacewalk-proxy-0.6.6-1: Miroslav Such=C3=BD (2): yum-rhn-plugin requires m2crypto Automatic commit of package [yum-rhn-plugin] release [0.5.7-1]. --- client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 6 +++++- rel-eng/packages/yum-rhn-plugin | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) --- --===============8631100939505503574==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:51 2015 Content-Type: multipart/mixed; boundary="===============1555971580658360069==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - client/rhel rel-eng/packages Date: Fri, 26 Jun 2009 12:54:29 +0000 Message-ID: <20090626125429.1B01B1201EE@lists.fedorahosted.org> --===============1555971580658360069== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++= ++- client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py | 1 - rel-eng/packages/rhn-client-tools | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) New commits: commit 7b3fefff63f8dc5fb07bb0155b975728cb5d1ae0 Author: Miroslav Such=C3=BD Date: Fri Jun 26 14:54:04 2009 +0200 Automatic commit of package [rhn-client-tools] release [0.6.1-1]. diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rh= el/rhn-client-tools/rhn-client-tools.spec index 5dc8c60..bdab38e 100644 --- a/client/rhel/rhn-client-tools/rhn-client-tools.spec +++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec @@ -4,7 +4,7 @@ Group: System Environment/Base Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version= }.tar.gz URL: https://fedorahosted.org/spacewalk Name: rhn-client-tools -Version: 0.4.28 +Version: 0.6.1 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -204,6 +204,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/rhn_register.desktop = %changelog +* Fri Jun 26 2009 Miroslav Suchy 0.6.1-1 +- code cleanup - there is no usage of md5 in this code +- bump up version to 0.6 + * Thu Jun 25 2009 John Matthews 0.4.28-1 - 503090 - Fix missing packages reported during rhnreg_ks. (dgoodwin(a)redhat.com) diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-clien= t-tools index ef7f6d9..645d98f 100644 --- a/rel-eng/packages/rhn-client-tools +++ b/rel-eng/packages/rhn-client-tools @@ -1 +1 @@ -0.4.28-1 client/rhel/rhn-client-tools/ +0.6.1-1 client/rhel/rhn-client-tools/ commit 6e0cf98d4d2a50e8e262dad6dd169aa26be01be4 Author: Miroslav Such=C3=BD Date: Fri Jun 26 14:51:53 2009 +0200 code cleanup - there is no usage of md5 in this code = addressing: /usr/share/rhn/up2date_client/up2dateUtils.py:14: DeprecationWarning: t= he md5 module is deprecated; use hashlib instead import md5 An error has occurred: See /var/log/up2date for more information = Which happend on F11 diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.p= y b/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py index 4f1d75c..9ee6198 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py @@ -11,7 +11,6 @@ import os import sys import rpm import string -import md5 = import up2dateErrors import transaction --===============1555971580658360069==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:52 2015 Content-Type: multipart/mixed; boundary="===============1698733152238531013==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/rhn-client-tools-0.6.1-1' Date: Fri, 26 Jun 2009 12:54:40 +0000 Message-ID: <20090626125440.E6FC91201EE@lists.fedorahosted.org> --===============1698733152238531013== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'rhn-client-tools-0.6.1-1' created by Miroslav Such=C3=BD at 2009-06-26 12:54 +0000 Tagging package [rhn-client-tools] version [0.6.1-1] in directory [client/r= hel/rhn-client-tools/]. Changes since yum-rhn-plugin-0.5.7-1: Miroslav Such=C3=BD (2): code cleanup - there is no usage of md5 in this code Automatic commit of package [rhn-client-tools] release [0.6.1-1]. --- client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++= ++- client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py | 1 - rel-eng/packages/rhn-client-tools | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) --- --===============1698733152238531013==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:52 2015 Content-Type: multipart/mixed; boundary="===============2790513109076309354==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Fri, 26 Jun 2009 13:25:28 +0000 Message-ID: <20090626132528.332261201EE@lists.fedorahosted.org> --===============2790513109076309354== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/server/Server.java | 4 ++-- java/code/src/com/redhat/rhn/domain/server/ServerFactory.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit e39a8035a199da3ed34d48c922aa9ca622afecd4 Author: Devan Goodwin Date: Fri Jun 26 10:21:46 2009 -0300 Fix API call to remove server custom data value. = Looks like this was being hidden by our recently removed hibernate exception hiding. = At least in this test, deleting a custom data value from a server was getting re-saved as the object wasn't actually deleted from it's association with the server. Seems likely this would be a problem for actual API use as well. diff --git a/java/code/src/com/redhat/rhn/domain/server/Server.java b/java/= code/src/com/redhat/rhn/domain/server/Server.java index 115db94..4df50ef 100644 --- a/java/code/src/com/redhat/rhn/domain/server/Server.java +++ b/java/code/src/com/redhat/rhn/domain/server/Server.java @@ -92,7 +92,7 @@ public class Server extends BaseDomainHelper implements I= dentifiable { private Ram ram; private Dmi dmi; private Set networkInterfaces; - private Set customDataValues; + private Set customDataValues; private Set channels; private List configChannels =3D Collections.EMPTY_LIST; private Set localChannels =3D new HashSet(); @@ -994,7 +994,7 @@ public class Server extends BaseDomainHelper implements= Identifiable { /** * @return Returns the customDataValues. */ - public Set getCustomDataValues() { + public Set getCustomDataValues() { return customDataValues; } = diff --git a/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java = b/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java index 2ac9d88..d265624 100644 --- a/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java +++ b/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java @@ -95,6 +95,7 @@ public class ServerFactory extends HibernateFactory { */ public static void removeCustomDataValue(Server server, CustomDataKey = key) { CustomDataValue value =3D server.getCustomDataValue(key); + server.getCustomDataValues().remove(value); if (value !=3D null) { singleton.removeObject(value); } --===============2790513109076309354==-- From shughes at fedoraproject.org Thu Aug 20 11:57:52 2015 Content-Type: multipart/mixed; boundary="===============8651678140848058479==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Fri, 26 Jun 2009 13:46:30 +0000 Message-ID: <20090626134630.139511201EE@lists.fedorahosted.org> --===============8651678140848058479== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml= | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 45de4fb041e8ee07316a38fe2d3a805b6782ca09 Author: Shannon Hughes Date: Fri Jun 26 09:38:16 2009 -0400 508220 - fixed channel sharing syntax error on english side diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResour= ce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringReso= urce_en_US.xml index 521532d..7527dd8 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml @@ -11555,7 +11555,7 @@ the <strong>Red Hat Enterprise Linux System A= dministration Guide.</stro = = - The software channels listed below my be shared by your or= ganization. + The software channels listed below may be shared by your o= rganization. = = --===============8651678140848058479==-- From shughes at fedoraproject.org Thu Aug 20 11:57:52 2015 Content-Type: multipart/mixed; boundary="===============6923820977194308392==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Fri, 26 Jun 2009 13:47:14 +0000 Message-ID: <20090626134714.54EA81201EE@lists.fedorahosted.org> --===============6923820977194308392== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml= | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 969ddbe65f6a8ed70b381b4531a4790f1a5c365d Author: Shannon Hughes Date: Fri Jun 26 09:38:16 2009 -0400 508220 - fixed channel sharing syntax error on english side diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResour= ce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringReso= urce_en_US.xml index 7d7c840..5ad2ea2 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml @@ -11555,7 +11555,7 @@ the <strong>Red Hat Enterprise Linux System A= dministration Guide.</stro = = - The software channels listed below my be shared by your or= ganization. + The software channels listed below may be shared by your o= rganization. = = --===============6923820977194308392==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:52 2015 Content-Type: multipart/mixed; boundary="===============4787338695856664215==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'sha256-support' - schema/spacewalk Date: Fri, 26 Jun 2009 15:55:28 +0000 Message-ID: <20090626155528.3409A120286@lists.fedorahosted.org> --===============4787338695856664215== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable schema/spacewalk/rhnsat/tables/rhnChecksumType.sql = | 61 ++++++++++ schema/spacewalk/rhnsat/tables/rhnChecksumType_data.sql = | 38 ++++++ schema/spacewalk/rhnsat/tables/rhnPackage.sql = | 9 - schema/spacewalk/rhnsat/tables/rhnPackageChecksum.sql = | 26 ++-- schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/124-= rhnChecksumType.sql | 44 +++++++ schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/124-= rhnPackageChecksum.sql | 27 ---- schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/125-= rhnChecksumType_data.sql | 20 +++ schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/126-= rhnpackage_checksum.sql | 4 = schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/127-= rhnPackageChecksum.sql | 46 +++++++ 9 files changed, 225 insertions(+), 50 deletions(-) New commits: commit 35f393934af9b6eb0c73e4e5f3aa7a692598cd93 Author: Pradeep Kilambi Date: Fri Jun 26 11:55:14 2009 -0400 Schema changes for sha256 support = - New rhnChecksumtype to lookup the type of checksum - New rhnPackageChecksum to associate package_id to hceksum type and ch= eksum - Drop md5sum from rhnPackage and index on oergid and md5sum diff --git a/schema/spacewalk/rhnsat/tables/rhnChecksumType.sql b/schema/sp= acewalk/rhnsat/tables/rhnChecksumType.sql new file mode 100644 index 0000000..0132f65 --- /dev/null +++ b/schema/spacewalk/rhnsat/tables/rhnChecksumType.sql @@ -0,0 +1,61 @@ +-- +-- Copyright (c) 2009 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 sequence rhn_checksum_id_seq; + +create table +rhnChecksumType +( + id number + constraint rhn_checksumtype_id_nn not null, + label varchar2(32) + constraint rhn_checksumtype_label_nn not null, + description varchar2(64) + constraint rhn_checksumtype_desc_nn not null, + created date default(sysdate) + constraint rhn_checksumtype_creat_nn not null, + modified date default(sysdate) + constraint rhn_checksumtype_mod_nn not null +) + enable row movement + ; + +create index rhn_checksumtype_label_id_idx + on rhnChecksumType( label, id ) + tablespace [[64k_tbs]] + ; +alter table rhnChecksumType add constraint rhn_checksumtype_id_pk = + primary key ( id ); +alter table rhnChecksumType add constraint rhn_checksumtype_label_uq + unique ( label ); + +create or replace trigger +rhn_checksumtype_mod_trig +before insert or update on rhnChecksumType +for each row +begin + :new.modified :=3D sysdate; +end; +/ +show errors + +-- +-- +-- Revision 1.1 2009/06/26 10:39:17 pkilambi +-- add schema to hold checksum types +-- diff --git a/schema/spacewalk/rhnsat/tables/rhnChecksumType_data.sql b/sche= ma/spacewalk/rhnsat/tables/rhnChecksumType_data.sql new file mode 100644 index 0000000..106fa52 --- /dev/null +++ b/schema/spacewalk/rhnsat/tables/rhnChecksumType_data.sql @@ -0,0 +1,38 @@ +-- +-- Copyright (c) 2008 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. = +-- +-- +-- +-- + + +insert into rhnChecksumType (id, label, description) values + (rhn_checksum_id_seq.nextval, 'md5', 'md5sum' ); +insert into rhnChecksumType (id, label, description) values + (rhn_checksum_id_seq.nextval, 'sha1', 'sha1' ); +insert into rhnChecksumType (id, label, description) values + (rhn_checksum_id_seq.nextval, 'sha224', 'sha224' ); +insert into rhnChecksumType (id, label, description) values + (rhn_checksum_id_seq.nextval, 'sha256', 'sha256' ); +insert into rhnChecksumType (id, label, description) values + (rhn_checksum_id_seq.nextval, 'sha384', 'sha384' ); +insert into rhnChecksumType (id, label, description) values + (rhn_checksum_id_seq.nextval, 'sha512', 'sha512' ); + +commit; + +-- +-- +-- Revision 1.1 2009/06/26 11:00:17 pkilambi +-- diff --git a/schema/spacewalk/rhnsat/tables/rhnPackage.sql b/schema/spacewa= lk/rhnsat/tables/rhnPackage.sql index 96e2741..36db8d2 100644 --- a/schema/spacewalk/rhnsat/tables/rhnPackage.sql +++ b/schema/spacewalk/rhnsat/tables/rhnPackage.sql @@ -54,10 +54,6 @@ rhnPackage source_rpm_id number constraint rhn_package_srcrpmid_fk references rhnSourceRPM(id), - md5sum varchar2(64) - constraint rhn_package_md5_nn not null, - sha256 varchar2(256) - constraint rhn_package_sha256_nn not null, vendor varchar2(64) constraint rhn_package_vendor_nn not null, payload_format varchar2(32), @@ -87,11 +83,6 @@ rhnPackage = create sequence rhn_package_id_seq; = -create unique index rhn_package_md5_oid_uq - on rhnPackage(md5sum, org_id) - tablespace [[2m_tbs]] - ; - create index rhn_package_oid_id_idx on rhnPackage(org_id, id) tablespace [[64k_tbs]] diff --git a/schema/spacewalk/rhnsat/tables/rhnPackageChecksum.sql b/schema= /spacewalk/rhnsat/tables/rhnPackageChecksum.sql index cc4b1e3..461888b 100644 --- a/schema/spacewalk/rhnsat/tables/rhnPackageChecksum.sql +++ b/schema/spacewalk/rhnsat/tables/rhnPackageChecksum.sql @@ -20,25 +20,27 @@ create table rhnPackageChecksum ( - package_id number - constraint rhn_pkgcs_nn not null - constraint rhn_pkgcs_id_fk - references rhnPackage(id), - md5sum varchar2(64) - constraint rhn_pkgcs_md5_nn not null, - sha256 varchar2(128) - constraint rhn_pkgcs_sha256_nn not null + package_id number + constraint rhn_pkgcs_nn not null + constraint rhn_pkgcs_id_fk + references rhnPackage(id), + checksum_type_id number + constraint rhn_pkg_checksum_type_nn not null + constraint rhn_pkg_checksum_type_id_fk + references rhnChecksumType(id), + checksum varchar2(128) + constraint rhn_pkg_checksum_nn not null ) enable row movement ; = -create index rhn_pkg_id_n_idx - on rhnPackageChecksum (package_id, md5sum, sha256) +create index rhn_pkgcsum_id_n_idx + on rhnPackageChecksum (package_id, checksum_type_id) tablespace [[64k_tbs]]; = alter table rhnPackageChecksum add constraint rhn_pkgcs_id_pk primary key = ( package_id); -alter table rhnPackageChecksum add constraint rhn_pkgcs_id_uq unique ( pac= kage_id, md5sum, sha256 ); +alter table rhnPackageChecksum add constraint rhn_pkgcs_id_uq unique ( pac= kage_id, checksum_type_id); = -- --- Revision 1.1 2009/06/19 00:37:16 pkilambi +-- Revision 1.1 2009/06/26 10:37:16 pkilambi -- = diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-sch= ema-0.6/124-rhnChecksumType.sql b/schema/spacewalk/upgrade/spacewalk-schema= -0.5-to-spacewalk-schema-0.6/124-rhnChecksumType.sql new file mode 100644 index 0000000..0467d6e --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6= /124-rhnChecksumType.sql @@ -0,0 +1,44 @@ + +create sequence rhn_checksum_id_seq; + +create table +rhnChecksumType +( + id number + constraint rhn_checksumtype_id_nn not null, + label varchar2(32) + constraint rhn_checksumtype_label_nn not null, + description varchar2(64) + constraint rhn_checksumtype_desc_nn not null, + created date default(sysdate) + constraint rhn_checksumtype_creat_nn not null, + modified date default(sysdate) + constraint rhn_checksumtype_mod_nn not null +) + enable row movement + ; + +create index rhn_checksumtype_label_id_idx + on rhnChecksumType( label, id ) + tablespace [[64k_tbs]] + ; +alter table rhnChecksumType add constraint rhn_checksumtype_id_pk = + primary key ( id ); +alter table rhnChecksumType add constraint rhn_checksumtype_label_uq + unique ( label ); + +create or replace trigger +rhn_checksumtype_mod_trig +before insert or update on rhnChecksumType +for each row +begin + :new.modified :=3D sysdate; +end; +/ +show errors + +-- +-- +-- Revision 1.1 2009/06/26 10:39:17 pkilambi +-- add schema to hold checksum types +-- diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-sch= ema-0.6/124-rhnPackageChecksum.sql b/schema/spacewalk/upgrade/spacewalk-sch= ema-0.5-to-spacewalk-schema-0.6/124-rhnPackageChecksum.sql deleted file mode 100644 index f09ab87..0000000 --- a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6= /124-rhnPackageChecksum.sql +++ /dev/null @@ -1,27 +0,0 @@ --- The types of checksum associated with a package... md5sum, sha1, sha256= ...? - -create table -rhnPackageChecksum -( - package_id number - constraint rhn_pkgcs_nn not null - constraint rhn_pkgcs_id_fk - references rhnPackage(id), - md5sum varchar2(64) - constraint rhn_pkgcs_md5_nn not null, - sha256 varchar2(128) - constraint rhn_pkgcs_sha256_nn not null -) - enable row movement - ; - -create index rhn_pkg_id_n_idx - on rhnPackageChecksum (package_id, md5sum, sha256) - tablespace [[64k_tbs]]; - -alter table rhnPackageChecksum add constraint rhn_pkgcs_id_pk primary key = ( package_id); -alter table rhnPackageChecksum add constraint rhn_pkgcs_id_uq unique ( pac= kage_id, md5sum, sha256 ); - --- --- Revision 1.1 2009/06/19 00:37:16 pkilambi --- = diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-sch= ema-0.6/125-rhnChecksumType_data.sql b/schema/spacewalk/upgrade/spacewalk-s= chema-0.5-to-spacewalk-schema-0.6/125-rhnChecksumType_data.sql new file mode 100644 index 0000000..990755b --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6= /125-rhnChecksumType_data.sql @@ -0,0 +1,20 @@ + +insert into rhnChecksumType (id, label, description) values + (rhn_checksum_id_seq.nextval, 'md5', 'md5sum' ); +insert into rhnChecksumType (id, label, description) values + (rhn_checksum_id_seq.nextval, 'sha1', 'sha1' ); +insert into rhnChecksumType (id, label, description) values + (rhn_checksum_id_seq.nextval, 'sha224', 'sha224' ); +insert into rhnChecksumType (id, label, description) values + (rhn_checksum_id_seq.nextval, 'sha256', 'sha256' ); +insert into rhnChecksumType (id, label, description) values + (rhn_checksum_id_seq.nextval, 'sha384', 'sha384' ); +insert into rhnChecksumType (id, label, description) values + (rhn_checksum_id_seq.nextval, 'sha512', 'sha512' ); + +commit; + +-- +-- +-- Revision 1.1 2009/06/26 11:00:17 pkilambi +-- diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-sch= ema-0.6/126-rhnpackage_checksum.sql b/schema/spacewalk/upgrade/spacewalk-sc= hema-0.5-to-spacewalk-schema-0.6/126-rhnpackage_checksum.sql index b3a5ae1..3c74f2f 100644 --- a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6= /126-rhnpackage_checksum.sql +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6= /126-rhnpackage_checksum.sql @@ -1,6 +1,6 @@ = -alter table rhnPackage add sha256 VARCHAR(128) -CONSTRAINT rhn_package_sha256_nn not null; +drop index rhn_package_md5_oid_uq; +alter table rhnPackage drop column md5sum; = show errors = diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-sch= ema-0.6/127-rhnPackageChecksum.sql b/schema/spacewalk/upgrade/spacewalk-sch= ema-0.5-to-spacewalk-schema-0.6/127-rhnPackageChecksum.sql new file mode 100644 index 0000000..461888b --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6= /127-rhnPackageChecksum.sql @@ -0,0 +1,46 @@ +-- +-- Copyright (c) 2008 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. = +-- +-- +-- +-- +-- The types of checksum associated with a package... md5sum, sha1, sha256= ...? + +create table +rhnPackageChecksum +( + package_id number + constraint rhn_pkgcs_nn not null + constraint rhn_pkgcs_id_fk + references rhnPackage(id), + checksum_type_id number + constraint rhn_pkg_checksum_type_nn not null + constraint rhn_pkg_checksum_type_id_fk + references rhnChecksumType(id), + checksum varchar2(128) + constraint rhn_pkg_checksum_nn not null +) + enable row movement + ; + +create index rhn_pkgcsum_id_n_idx + on rhnPackageChecksum (package_id, checksum_type_id) + tablespace [[64k_tbs]]; + +alter table rhnPackageChecksum add constraint rhn_pkgcs_id_pk primary key = ( package_id); +alter table rhnPackageChecksum add constraint rhn_pkgcs_id_uq unique ( pac= kage_id, checksum_type_id); + +-- +-- Revision 1.1 2009/06/26 10:37:16 pkilambi +-- = --===============4787338695856664215==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:52 2015 Content-Type: multipart/mixed; boundary="===============3320146053008367864==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Fri, 26 Jun 2009 16:10:21 +0000 Message-ID: <20090626161021.8ACB1120286@lists.fedorahosted.org> --===============3320146053008367864== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreate= Command.java | 3 ++- java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtualSyste= mCommand.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit a4fb92cb3a4b5a7b5761ed5c6cb8a8a36a55d4da Author: Justin Sherrill Date: Fri Jun 26 12:10:46 2009 -0400 508323 - fixing issue with creating cobbler system records with spaces = (which would fail) diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= SystemCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/c= obbler/CobblerSystemCreateCommand.java index 0ad2ca1..e6e3869 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemC= reateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemC= reateCommand.java @@ -298,7 +298,8 @@ public class CobblerSystemCreateCommand extends Cobbler= Command { * @return String name of cobbler system record. = */ public String getCobblerSystemRecordName() { - return this.server.getName() + ":" + = + String name =3D this.server.getName().replace(' ', '_'); + return name + ":" + this.server.getOrg().getId(); } = diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= VirtualSystemCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/= cobbler/CobblerVirtualSystemCommand.java index 69adcd2..0c265ae 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtual= SystemCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtual= SystemCommand.java @@ -91,7 +91,7 @@ public class CobblerVirtualSystemCommand extends CobblerS= ystemCreateCommand { */ @Override public String getCobblerSystemRecordName() { - return super.getCobblerSystemRecordName() + ":" + guestName; + return super.getCobblerSystemRecordName() + ":" + guestName.replac= e(' ', '_'); } = @Override --===============3320146053008367864==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:52 2015 Content-Type: multipart/mixed; boundary="===============3537186451682655736==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Fri, 26 Jun 2009 16:11:45 +0000 Message-ID: <20090626161145.3C339120286@lists.fedorahosted.org> --===============3537186451682655736== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreate= Command.java | 3 ++- java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtualSyste= mCommand.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 7f194d40c841269a38edd90ee1cbdf1ae8d7d11b Author: Justin Sherrill Date: Fri Jun 26 12:10:46 2009 -0400 508323 - fixing issue with creating cobbler system records with spaces = (which would fail) diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= SystemCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/c= obbler/CobblerSystemCreateCommand.java index 0ad2ca1..e6e3869 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemC= reateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemC= reateCommand.java @@ -298,7 +298,8 @@ public class CobblerSystemCreateCommand extends Cobbler= Command { * @return String name of cobbler system record. = */ public String getCobblerSystemRecordName() { - return this.server.getName() + ":" + = + String name =3D this.server.getName().replace(' ', '_'); + return name + ":" + this.server.getOrg().getId(); } = diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= VirtualSystemCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/= cobbler/CobblerVirtualSystemCommand.java index 69adcd2..0c265ae 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtual= SystemCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtual= SystemCommand.java @@ -91,7 +91,7 @@ public class CobblerVirtualSystemCommand extends CobblerS= ystemCreateCommand { */ @Override public String getCobblerSystemRecordName() { - return super.getCobblerSystemRecordName() + ":" + guestName; + return super.getCobblerSystemRecordName() + ":" + guestName.replac= e(' ', '_'); } = @Override --===============3537186451682655736==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:52 2015 Content-Type: multipart/mixed; boundary="===============6245739981129815055==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'sha256-support' - schema/spacewalk Date: Fri, 26 Jun 2009 16:45:40 +0000 Message-ID: <20090626164540.67B31120286@lists.fedorahosted.org> --===============6245739981129815055== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/128-= rhnPackageFile.sql | 4 ++++ 1 file changed, 4 insertions(+) New commits: commit e8fbd9f9e95697369f70de285193066f46fee3d6 Author: Pradeep Kilambi Date: Fri Jun 26 12:45:30 2009 -0400 Altering rhnPackageFile - Rename md5 to checksum - change the length to 128 diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-sch= ema-0.6/128-rhnPackageFile.sql b/schema/spacewalk/upgrade/spacewalk-schema-= 0.5-to-spacewalk-schema-0.6/128-rhnPackageFile.sql new file mode 100644 index 0000000..b57d281 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6= /128-rhnPackageFile.sql @@ -0,0 +1,4 @@ +ALTER TABLE rhnPackageFile RENAME COLUMN md5 TO checksum; +ALTER TABLE rhnPackageFile MODIFY checksum varchar(128); +/ +show errors --===============6245739981129815055==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:52 2015 Content-Type: multipart/mixed; boundary="===============9085402877325307860==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'sha256-support' - schema/spacewalk Date: Fri, 26 Jun 2009 16:48:44 +0000 Message-ID: <20090626164844.E2887120286@lists.fedorahosted.org> --===============9085402877325307860== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable schema/spacewalk/rhnsat/tables/rhnPackageFile.sql = | 2 +- schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/125-= rhnChecksumType_data.sql | 2 -- schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/126-= rhnpackage_checksum.sql | 2 -- schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/127-= rhnPackageChecksum.sql | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) New commits: commit e781fd425048e6310a1a765a1bbb13db2badc433 Author: Pradeep Kilambi Date: Fri Jun 26 12:48:39 2009 -0400 Altering rhnPackageFile - Rename md5 to checksum - change the length to 128 diff --git a/schema/spacewalk/rhnsat/tables/rhnPackageFile.sql b/schema/spa= cewalk/rhnsat/tables/rhnPackageFile.sql index 99de065..e4e3ec3 100644 --- a/schema/spacewalk/rhnsat/tables/rhnPackageFile.sql +++ b/schema/spacewalk/rhnsat/tables/rhnPackageFile.sql @@ -45,7 +45,7 @@ rhnPackageFile constraint rhn_package_file_size_nn not null, mtime date constraint rhn_package_file_mtime_nn not null, - md5 varchar2(32), + checksum varchar2(128), linkto varchar2(256), flags number constraint rhn_package_file_flags_nn not null, diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-sch= ema-0.6/125-rhnChecksumType_data.sql b/schema/spacewalk/upgrade/spacewalk-s= chema-0.5-to-spacewalk-schema-0.6/125-rhnChecksumType_data.sql index 990755b..53e4efc 100644 --- a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6= /125-rhnChecksumType_data.sql +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6= /125-rhnChecksumType_data.sql @@ -12,8 +12,6 @@ insert into rhnChecksumType (id, label, description) valu= es insert into rhnChecksumType (id, label, description) values (rhn_checksum_id_seq.nextval, 'sha512', 'sha512' ); = -commit; - -- -- -- Revision 1.1 2009/06/26 11:00:17 pkilambi diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-sch= ema-0.6/126-rhnpackage_checksum.sql b/schema/spacewalk/upgrade/spacewalk-sc= hema-0.5-to-spacewalk-schema-0.6/126-rhnpackage_checksum.sql index 3c74f2f..e0a887b 100644 --- a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6= /126-rhnpackage_checksum.sql +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6= /126-rhnpackage_checksum.sql @@ -2,5 +2,3 @@ drop index rhn_package_md5_oid_uq; alter table rhnPackage drop column md5sum; = -show errors - diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-sch= ema-0.6/127-rhnPackageChecksum.sql b/schema/spacewalk/upgrade/spacewalk-sch= ema-0.5-to-spacewalk-schema-0.6/127-rhnPackageChecksum.sql index 461888b..48b0de1 100644 --- a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6= /127-rhnPackageChecksum.sql +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6= /127-rhnPackageChecksum.sql @@ -40,7 +40,6 @@ create index rhn_pkgcsum_id_n_idx = alter table rhnPackageChecksum add constraint rhn_pkgcs_id_pk primary key = ( package_id); alter table rhnPackageChecksum add constraint rhn_pkgcs_id_uq unique ( pac= kage_id, checksum_type_id); - -- -- Revision 1.1 2009/06/26 10:37:16 pkilambi -- = --===============9085402877325307860==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:52 2015 Content-Type: multipart/mixed; boundary="===============0849021199139459052==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Fri, 26 Jun 2009 21:45:51 +0000 Message-ID: <20090626214551.A77B3120286@lists.fedorahosted.org> --===============0849021199139459052== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xm= l | 5 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/MissingCapabilityException.ja= va | 10 ++++ java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHan= dler.java | 9 +++- java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConf= igHandlerTest.java | 21 ++++++++-- 4 files changed, 39 insertions(+), 6 deletions(-) New commits: commit 3bc4c571c889c85bd038a06f08bed865f3aeff0f Author: Brad Buckingham Date: Fri Jun 26 17:44:11 2009 -0400 508141 - api - system.config.deployAll updated w/ better exception when= system not config capable = Updated the logic of the deployAll api to provide an error message cons= istent with what the UI provides when the user attempts to deploy config files to a system that is not capable of deploying files to. E.g. system doesn't have tools channel and rhncfg* packages installed. diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResou= rce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringRe= source_en_US.xml index 8db5c8a..a1d65ac 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml @@ -7676,7 +7676,10 @@ Follow this url to see the full list of inactive sys= tems: Invalid profile label specified: {0} = - = + + The server {0} does not have the {1} client capability. = Please enable the capability before proceeding with the operation. + + The specified server is not a member of the specified gr= oup diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/MissingCapability= Exception.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/MissingCapabi= lityException.java index 78ce5a9..ad7a01a 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/MissingCapabilityExcepti= on.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/MissingCapabilityExcepti= on.java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.xmlrpc; = import com.redhat.rhn.FaultException; +import com.redhat.rhn.domain.server.Server; = /** * MissingCapabilityException @@ -40,4 +41,13 @@ public class MissingCapabilityException extends FaultExc= eption { super(2401, "missingCapability" , "Missing capability"); } = + /** + * Constructor for exception on missing capability on a server. + * @param missingCapability the missing capability. + * @param incapableServer the server missing the capability + */ + public MissingCapabilityException(String missingCapability, Server inc= apableServer) { + super(2401, "missingCapability", "api.system.missingCapabilities", + new Object[] {incapableServer.getHostname(), missingCapability= }); + } } diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/Ser= verConfigHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system= /config/ServerConfigHandler.java index 886d8fc..cc738de 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConf= igHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConf= igHandler.java @@ -37,6 +37,7 @@ import com.redhat.rhn.frontend.xmlrpc.BaseHandler; import com.redhat.rhn.frontend.xmlrpc.configchannel.XmlRpcConfigChannelHel= per; import com.redhat.rhn.frontend.xmlrpc.serializer.ConfigFileNameDtoSerializ= er; import com.redhat.rhn.frontend.xmlrpc.system.XmlRpcSystemHelper; +import com.redhat.rhn.manager.MissingCapabilityException; import com.redhat.rhn.manager.configuration.ConfigurationManager; = = @@ -318,7 +319,13 @@ public class ServerConfigHandler extends BaseHandler { servers.add(helper.lookupServer(loggedInUser, sid)); } ConfigurationManager manager =3D ConfigurationManager.getInstance(= ); - manager.deployConfiguration(loggedInUser, servers, date); + try { + manager.deployConfiguration(loggedInUser, servers, date); + } + catch (MissingCapabilityException e) { + throw new com.redhat.rhn.frontend.xmlrpc.MissingCapabilityExce= ption( + e.getCapability(), e.getServer()); + } return 1; } = diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/tes= t/ServerConfigHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlr= pc/system/config/test/ServerConfigHandlerTest.java index 6559418..5510057 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/Serve= rConfigHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/Serve= rConfigHandlerTest.java @@ -73,9 +73,7 @@ public class ServerConfigHandlerTest extends BaseHandlerT= estCase { // gcc1 only = Server srv1 =3D ServerFactoryTest.createTestServer(regular, true, ServerConstants.getServerGroupTypeProvisioningEntitled= ()); - SystemManagerTest.giveCapability(srv1.getId(), = - SystemManager.CAP_CONFIGFILES_DEPLOY, ver); - = + srv1.subscribe(gcc1); srv1.subscribe(gcc2); = @@ -108,7 +106,22 @@ public class ServerConfigHandlerTest extends BaseHandl= erTestCase { // System 1 - both g1f1 and g1f2 should deploy here List systems =3D new ArrayList(); systems.add(srv1.getId()); - Date date =3D new Date(); = + Date date =3D new Date(); + + try { + // validate that system must have config deployment capability + // in order to deploy config files... (e.g. rhncfg* pkgs insta= lled) + handler.deployAll(regularKey, systems, date); + + fail("Shouldn't be permitted to deploy without config deploy c= apability."); + } + catch (Exception e) { + // Success + } + + SystemManagerTest.giveCapability(srv1.getId(), + SystemManager.CAP_CONFIGFILES_DEPLOY, ver); + handler.deployAll(regularKey, systems, date); = DataResult actions =3D ActionManager. --===============0849021199139459052==-- From bbuckingham at fedoraproject.org Thu Aug 20 11:57:52 2015 Content-Type: multipart/mixed; boundary="===============0654339511723232220==" MIME-Version: 1.0 From: Brad Buckingham To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Fri, 26 Jun 2009 21:48:51 +0000 Message-ID: <20090626214851.32D06120286@lists.fedorahosted.org> --===============0654339511723232220== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xm= l | 5 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/MissingCapabilityException.ja= va | 10 ++++ java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHan= dler.java | 9 +++- java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConf= igHandlerTest.java | 21 ++++++++-- 4 files changed, 39 insertions(+), 6 deletions(-) New commits: commit d4ca5991386fbdfa060d95758fdece11f1a6909a Author: Brad Buckingham Date: Fri Jun 26 17:44:11 2009 -0400 508141 - api - system.config.deployAll updated w/ better exception when= system not config capable = Updated the logic of the deployAll api to provide an error message cons= istent with what the UI provides when the user attempts to deploy config files to a system that is not capable of deploying files to. E.g. system doesn't have tools channel and rhncfg* packages installed. diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResou= rce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringRe= source_en_US.xml index 8db5c8a..a1d65ac 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml @@ -7676,7 +7676,10 @@ Follow this url to see the full list of inactive sys= tems: Invalid profile label specified: {0} = - = + + The server {0} does not have the {1} client capability. = Please enable the capability before proceeding with the operation. + + The specified server is not a member of the specified gr= oup diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/MissingCapability= Exception.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/MissingCapabi= lityException.java index 78ce5a9..ad7a01a 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/MissingCapabilityExcepti= on.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/MissingCapabilityExcepti= on.java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.xmlrpc; = import com.redhat.rhn.FaultException; +import com.redhat.rhn.domain.server.Server; = /** * MissingCapabilityException @@ -40,4 +41,13 @@ public class MissingCapabilityException extends FaultExc= eption { super(2401, "missingCapability" , "Missing capability"); } = + /** + * Constructor for exception on missing capability on a server. + * @param missingCapability the missing capability. + * @param incapableServer the server missing the capability + */ + public MissingCapabilityException(String missingCapability, Server inc= apableServer) { + super(2401, "missingCapability", "api.system.missingCapabilities", + new Object[] {incapableServer.getHostname(), missingCapability= }); + } } diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/Ser= verConfigHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system= /config/ServerConfigHandler.java index 886d8fc..cc738de 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConf= igHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConf= igHandler.java @@ -37,6 +37,7 @@ import com.redhat.rhn.frontend.xmlrpc.BaseHandler; import com.redhat.rhn.frontend.xmlrpc.configchannel.XmlRpcConfigChannelHel= per; import com.redhat.rhn.frontend.xmlrpc.serializer.ConfigFileNameDtoSerializ= er; import com.redhat.rhn.frontend.xmlrpc.system.XmlRpcSystemHelper; +import com.redhat.rhn.manager.MissingCapabilityException; import com.redhat.rhn.manager.configuration.ConfigurationManager; = = @@ -318,7 +319,13 @@ public class ServerConfigHandler extends BaseHandler { servers.add(helper.lookupServer(loggedInUser, sid)); } ConfigurationManager manager =3D ConfigurationManager.getInstance(= ); - manager.deployConfiguration(loggedInUser, servers, date); + try { + manager.deployConfiguration(loggedInUser, servers, date); + } + catch (MissingCapabilityException e) { + throw new com.redhat.rhn.frontend.xmlrpc.MissingCapabilityExce= ption( + e.getCapability(), e.getServer()); + } return 1; } = diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/tes= t/ServerConfigHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlr= pc/system/config/test/ServerConfigHandlerTest.java index 6559418..5510057 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/Serve= rConfigHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/Serve= rConfigHandlerTest.java @@ -73,9 +73,7 @@ public class ServerConfigHandlerTest extends BaseHandlerT= estCase { // gcc1 only = Server srv1 =3D ServerFactoryTest.createTestServer(regular, true, ServerConstants.getServerGroupTypeProvisioningEntitled= ()); - SystemManagerTest.giveCapability(srv1.getId(), = - SystemManager.CAP_CONFIGFILES_DEPLOY, ver); - = + srv1.subscribe(gcc1); srv1.subscribe(gcc2); = @@ -108,7 +106,22 @@ public class ServerConfigHandlerTest extends BaseHandl= erTestCase { // System 1 - both g1f1 and g1f2 should deploy here List systems =3D new ArrayList(); systems.add(srv1.getId()); - Date date =3D new Date(); = + Date date =3D new Date(); + + try { + // validate that system must have config deployment capability + // in order to deploy config files... (e.g. rhncfg* pkgs insta= lled) + handler.deployAll(regularKey, systems, date); + + fail("Shouldn't be permitted to deploy without config deploy c= apability."); + } + catch (Exception e) { + // Success + } + + SystemManagerTest.giveCapability(srv1.getId(), + SystemManager.CAP_CONFIGFILES_DEPLOY, ver); + handler.deployAll(regularKey, systems, date); = DataResult actions =3D ActionManager. --===============0654339511723232220==-- From partha at fedoraproject.org Thu Aug 20 11:57:52 2015 Content-Type: multipart/mixed; boundary="===============5153182383578036623==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/spacewalk-java.spec Date: Mon, 29 Jun 2009 19:54:43 +0000 Message-ID: <20090629195443.6D0A11201FE@lists.fedorahosted.org> --===============5153182383578036623== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/spacewalk-java.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) New commits: commit f221ed3961b8e98dc2ec1089e0cb1e07837c8cc1 Author: Partha Aji Date: Mon Jun 29 15:57:40 2009 -0400 508736 - Corrected spec to properly set the cobbler/snippets/spacewalk= symlink diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 4a19631..22e3f09 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -3,6 +3,7 @@ %define cobprofdirup %{_localstatedir}/lib/rhn/kickstarts/upload %define cobprofdirwiz %{_localstatedir}/lib/rhn/kickstarts/wizard %define cobdirsnippets %{_localstatedir}/lib/rhn/kickstarts/snippets +%define realcobsnippetsdir %{_localstatedir}/lib/cobbler/snippets %define appdir %{_localstatedir}/lib/tomcat5/webapps %define jardir %{_localstatedir}/lib/tomcat5/webapps/rhn/WEB-INF/= lib %define jars antlr asm bcel c3p0 cglib commons-beanutils commons-cli commo= ns-codec commons-digester commons-discovery commons-el commons-io commons-f= ileupload commons-lang commons-logging commons-validator concurrent dom4j h= ibernate3 jaf jasper5-compiler jasper5-runtime javamail jcommon jdom jfreec= hart jspapi jpam log4j redstone-xmlrpc redstone-xmlrpc-client ojdbc14 oro o= scache sitemesh struts taglibs-core taglibs-standard xalan-j2 xerces-j2 xml= -commons-apis commons-collections @@ -202,16 +203,14 @@ install -m 644 build/webapp/rhnjava/WEB-INF/lib/rhn.j= ar $RPM_BUILD_ROOT/%{_datad install -m 644 conf/log4j.properties.taskomatic $RPM_BUILD_ROOT/%{_datadir= }/rhn/classes/log4j.properties ln -s -f /usr/sbin/tanukiwrapper $RPM_BUILD_ROOT/%{_bindir}/taskomaticd ln -s -f %{_javadir}/ojdbc14.jar $RPM_BUILD_ROOT%{jardir}/ojdbc14.jar - +mkdir -p $RPM_BUILD_ROOT/%{realcobsnippetsdir} +ln -s -f %{cobdirsnippets} $RPM_BUILD_ROOT/%{realcobsnippetsdir}/spacewalk = %clean rm -rf $RPM_BUILD_ROOT = -%postun -rm -f /var/lib/cobbler/snippets/spacewalk - -%post -ln -s -f %{cobdirsnippets} /var/lib/cobbler/snippets/spacewalk = +%pre +rm -f %{realcobsnippetsdir}/spacewalk = %post -n spacewalk-taskomatic # This adds the proper /etc/rc*.d links for the script @@ -232,6 +231,7 @@ fi %dir %{cobdirsnippets} %{appdir}/* %config(noreplace) %{_sysconfdir}/tomcat5/Catalina/localhost/rhn.xml +%{realcobsnippetsdir}/spacewalk = %files -n spacewalk-taskomatic %attr(755, root, root) %{_initrddir}/taskomatic @@ -497,6 +497,7 @@ fi code had been ripped out, so i converted it to java (jsherril(a)redhat.c= om) - 491361 - Added note to error messages to check the log for error message= s. (jason.dobies(a)redhat.com) - 500891 - fixed an unescaped string on snippets delete confirm page (paji= (a)redhat.com) +dually.rdu.redhat.com,10.11.228.46 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAt3L= 3QI0h+nKNrRIrd/Qj/l2aaPAtSk1O7smalVJZYLx8JCwmYLd+XzWc9b951l6zevxMIHfHRFjA2E= woJWKVzffNE/91RVs9jQ3M5289YX5VZbu6g/9PZ6gj5JG7EN+Q6h29iDhJ/LBrZb62ytXru+jBG= McoBoZggQ+nAtjZstZcOwlIOZ0ldLMJycsWV2aKXwhbVgowtE/evPuF+lF68Z4Fdfi/ScznuF7m= QlHAnxQNEQCQojjqf37fgW8dQENIxoaFOJXOFjeW57X2HIgz0XX3ux3kgtGgmKvQanVRpISnUBn= lEEXtDvYxO73mlTen+eS+wbyhF0Wkpg3OEWaTOQ=3D=3D - 500887 -Fix to not escape contents in cobbler snippet detials page (paji= (a)redhat.com) - 5/14 update of webui translation strings (shughes(a)redhat.com) - 500727 - Just noticed this was flagged as NOTABUG since we don't want to --===============5153182383578036623==-- From partha at fedoraproject.org Thu Aug 20 11:57:52 2015 Content-Type: multipart/mixed; boundary="===============7880434357071567999==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/spacewalk-java.spec Date: Mon, 29 Jun 2009 20:06:13 +0000 Message-ID: <20090629200613.4C4161201FE@lists.fedorahosted.org> --===============7880434357071567999== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/spacewalk-java.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 6bf67aa2175cb8d66afd392ad1d616bd51f171c5 Author: Partha Aji Date: Mon Jun 29 15:57:40 2009 -0400 508736 - Corrected spec to properly set the cobbler/snippets/spacewalk= symlink diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 6c8f28e..48648b9 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -3,6 +3,7 @@ %define cobprofdirup %{_localstatedir}/lib/rhn/kickstarts/upload %define cobprofdirwiz %{_localstatedir}/lib/rhn/kickstarts/wizard %define cobdirsnippets %{_localstatedir}/lib/rhn/kickstarts/snippets +%define realcobsnippetsdir %{_localstatedir}/lib/cobbler/snippets %define appdir %{_localstatedir}/lib/tomcat5/webapps %define jardir %{_localstatedir}/lib/tomcat5/webapps/rhn/WEB-INF/= lib %define jars antlr asm bcel c3p0 cglib commons-beanutils commons-cli commo= ns-codec commons-digester commons-discovery commons-el commons-io commons-f= ileupload commons-lang commons-logging commons-validator concurrent dom4j h= ibernate3 jaf jasper5-compiler jasper5-runtime javamail jcommon jdom jfreec= hart jspapi jpam log4j redstone-xmlrpc redstone-xmlrpc-client ojdbc14 oro o= scache sitemesh struts taglibs-core taglibs-standard xalan-j2 xerces-j2 xml= -commons-apis commons-collections @@ -208,16 +209,14 @@ install -m 644 build/webapp/rhnjava/WEB-INF/lib/rhn.j= ar $RPM_BUILD_ROOT/%{_datad install -m 644 conf/log4j.properties.taskomatic $RPM_BUILD_ROOT/%{_datadir= }/rhn/classes/log4j.properties ln -s -f /usr/sbin/tanukiwrapper $RPM_BUILD_ROOT/%{_bindir}/taskomaticd ln -s -f %{_javadir}/ojdbc14.jar $RPM_BUILD_ROOT%{jardir}/ojdbc14.jar - +mkdir -p $RPM_BUILD_ROOT/%{realcobsnippetsdir} +ln -s -f %{cobdirsnippets} $RPM_BUILD_ROOT/%{realcobsnippetsdir}/spacewalk = %clean rm -rf $RPM_BUILD_ROOT = -%postun -rm -f /var/lib/cobbler/snippets/spacewalk - -%post -ln -s -f %{cobdirsnippets} /var/lib/cobbler/snippets/spacewalk = +%pre +rm -f %{realcobsnippetsdir}/spacewalk = %post -n spacewalk-taskomatic # This adds the proper /etc/rc*.d links for the script @@ -238,6 +237,7 @@ fi %dir %{cobdirsnippets} %{appdir}/* %config(noreplace) %{_sysconfdir}/tomcat5/Catalina/localhost/rhn.xml +%{realcobsnippetsdir}/spacewalk = %files -n spacewalk-taskomatic %attr(755, root, root) %{_initrddir}/taskomatic --===============7880434357071567999==-- From mmccune at fedoraproject.org Thu Aug 20 11:57:52 2015 Content-Type: multipart/mixed; boundary="===============2134977993822547104==" MIME-Version: 1.0 From: Mike McCune To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Mon, 29 Jun 2009 21:55:58 +0000 Message-ID: <20090629215558.C01771201FE@lists.fedorahosted.org> --===============2134977993822547104== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/log4j.properties | 3 --- 1 file changed, 3 deletions(-) New commits: commit c98efa074c95300f32c21172abf9a40148eb3f07 Author: Mike McCune Date: Mon Jun 29 14:51:37 2009 -0700 removing spammy debug from log4j properties file diff --git a/java/code/src/log4j.properties b/java/code/src/log4j.properties index d2f0275..de268b7 100644 --- a/java/code/src/log4j.properties +++ b/java/code/src/log4j.properties @@ -40,8 +40,5 @@ log4j.logger.com.redhat.rhn.taskomatic.SchedulerKernel=3D= INFO #log4j.logger.net.rkbloom.logdriver.LogCallableStatement=3DDEBUG #log4j.logger.net.rkbloom.logdriver.LogConnection=3DDEBUG,HibernateAppender = -log4j.logger.org.cobbler.CobblerConnection=3DDEBUG -log4j.logger.com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper= =3DDEBUG - # General debug for everything. Very noisy #log4j.logger.com.redhat.rhn=3DDEBUG --===============2134977993822547104==-- From mmccune at fedoraproject.org Thu Aug 20 11:57:52 2015 Content-Type: multipart/mixed; boundary="===============2902621903116427554==" MIME-Version: 1.0 From: Mike McCune To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Mon, 29 Jun 2009 21:59:33 +0000 Message-ID: <20090629215933.B881A1201FE@lists.fedorahosted.org> --===============2902621903116427554== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/log4j.properties | 3 --- 1 file changed, 3 deletions(-) New commits: commit 412f83ad0ec27e320e00157c7eb1168ce8d6f5d2 Author: Mike McCune Date: Mon Jun 29 14:51:37 2009 -0700 removing spammy debug from log4j properties file diff --git a/java/code/src/log4j.properties b/java/code/src/log4j.properties index d2f0275..de268b7 100644 --- a/java/code/src/log4j.properties +++ b/java/code/src/log4j.properties @@ -40,8 +40,5 @@ log4j.logger.com.redhat.rhn.taskomatic.SchedulerKernel=3D= INFO #log4j.logger.net.rkbloom.logdriver.LogCallableStatement=3DDEBUG #log4j.logger.net.rkbloom.logdriver.LogConnection=3DDEBUG,HibernateAppender = -log4j.logger.org.cobbler.CobblerConnection=3DDEBUG -log4j.logger.com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper= =3DDEBUG - # General debug for everything. Very noisy #log4j.logger.com.redhat.rhn=3DDEBUG --===============2902621903116427554==-- From partha at fedoraproject.org Thu Aug 20 11:57:52 2015 Content-Type: multipart/mixed; boundary="===============4215068829273343031==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/spacewalk-java.spec Date: Mon, 29 Jun 2009 22:01:28 +0000 Message-ID: <20090629220128.31A011201FE@lists.fedorahosted.org> --===============4215068829273343031== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/spacewalk-java.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 4b80c5d58eea761e92eeaf7df4a5ee7238d35db0 Author: Partha Aji Date: Mon Jun 29 18:03:07 2009 -0400 508376 - fix for a typo in the previous commit diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 22e3f09..206f021 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -203,7 +203,7 @@ install -m 644 build/webapp/rhnjava/WEB-INF/lib/rhn.jar= $RPM_BUILD_ROOT/%{_datad install -m 644 conf/log4j.properties.taskomatic $RPM_BUILD_ROOT/%{_datadir= }/rhn/classes/log4j.properties ln -s -f /usr/sbin/tanukiwrapper $RPM_BUILD_ROOT/%{_bindir}/taskomaticd ln -s -f %{_javadir}/ojdbc14.jar $RPM_BUILD_ROOT%{jardir}/ojdbc14.jar -mkdir -p $RPM_BUILD_ROOT/%{realcobsnippetsdir} +install -d -m 755 $RPM_BUILD_ROOT/%{realcobsnippetsdir} ln -s -f %{cobdirsnippets} $RPM_BUILD_ROOT/%{realcobsnippetsdir}/spacewalk = %clean @@ -497,7 +497,6 @@ fi code had been ripped out, so i converted it to java (jsherril(a)redhat.c= om) - 491361 - Added note to error messages to check the log for error message= s. (jason.dobies(a)redhat.com) - 500891 - fixed an unescaped string on snippets delete confirm page (paji= (a)redhat.com) -dually.rdu.redhat.com,10.11.228.46 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAt3L= 3QI0h+nKNrRIrd/Qj/l2aaPAtSk1O7smalVJZYLx8JCwmYLd+XzWc9b951l6zevxMIHfHRFjA2E= woJWKVzffNE/91RVs9jQ3M5289YX5VZbu6g/9PZ6gj5JG7EN+Q6h29iDhJ/LBrZb62ytXru+jBG= McoBoZggQ+nAtjZstZcOwlIOZ0ldLMJycsWV2aKXwhbVgowtE/evPuF+lF68Z4Fdfi/ScznuF7m= QlHAnxQNEQCQojjqf37fgW8dQENIxoaFOJXOFjeW57X2HIgz0XX3ux3kgtGgmKvQanVRpISnUBn= lEEXtDvYxO73mlTen+eS+wbyhF0Wkpg3OEWaTOQ=3D=3D - 500887 -Fix to not escape contents in cobbler snippet detials page (paji= (a)redhat.com) - 5/14 update of webui translation strings (shughes(a)redhat.com) - 500727 - Just noticed this was flagged as NOTABUG since we don't want to --===============4215068829273343031==-- From partha at fedoraproject.org Thu Aug 20 11:57:52 2015 Content-Type: multipart/mixed; boundary="===============8043739110355103828==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/spacewalk-java.spec Date: Mon, 29 Jun 2009 22:14:37 +0000 Message-ID: <20090629221437.9961F1201FE@lists.fedorahosted.org> --===============8043739110355103828== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/spacewalk-java.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 693a797ce5d438539fec061b66a6fbfc499095e3 Author: Partha Aji Date: Mon Jun 29 18:03:07 2009 -0400 508376 - fix for a typo in the previous commit diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 48648b9..499b827 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -209,7 +209,7 @@ install -m 644 build/webapp/rhnjava/WEB-INF/lib/rhn.jar= $RPM_BUILD_ROOT/%{_datad install -m 644 conf/log4j.properties.taskomatic $RPM_BUILD_ROOT/%{_datadir= }/rhn/classes/log4j.properties ln -s -f /usr/sbin/tanukiwrapper $RPM_BUILD_ROOT/%{_bindir}/taskomaticd ln -s -f %{_javadir}/ojdbc14.jar $RPM_BUILD_ROOT%{jardir}/ojdbc14.jar -mkdir -p $RPM_BUILD_ROOT/%{realcobsnippetsdir} +install -d -m 755 $RPM_BUILD_ROOT/%{realcobsnippetsdir} ln -s -f %{cobdirsnippets} $RPM_BUILD_ROOT/%{realcobsnippetsdir}/spacewalk = %clean --===============8043739110355103828==-- From partha at fedoraproject.org Thu Aug 20 11:57:52 2015 Content-Type: multipart/mixed; boundary="===============7392256075912496828==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Tue, 30 Jun 2009 02:26:05 +0000 Message-ID: <20090630022605.9EC421201FE@lists.fedorahosted.org> --===============7392256075912496828== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedul= e-options.jspf | 34 ++++++++++ java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp = | 20 ----- java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/fi= rst.jsp | 17 ----- 3 files changed, 38 insertions(+), 33 deletions(-) New commits: commit a3f11584b0543c25b4b5b7bce8d222562c2023ce Author: Partha Aji Date: Mon Jun 29 22:28:59 2009 -0400 Made the radio button in schedule ks page choose scheduleAsap by default diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/sche= dule/schedule-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragment= s/kickstart/schedule/schedule-options.jspf new file mode 100644 index 0000000..806895f --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/sc= hedule-options.jspf @@ -0,0 +1,34 @@ +<%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> +<%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> + +

                                      + 3D"<bean:message= " /> + +

                                      + + + + + + + + + + + = +
                                      diff --git a/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp b/java/= code/webapp/WEB-INF/pages/errata/editchannels.jsp index abe06c4..9ffc845 100644 --- a/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp @@ -9,12 +9,7 @@ - - - - - = - @@ -25,9 +20,6 @@

                                      =

                                      - = - - = diff --git a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp b/java/= code/webapp/WEB-INF/pages/errata/erratasearch.jsp index 80ca59c..bce3688 100644 --- a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp @@ -25,13 +25,7 @@ = - - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/errata/notify.jsp b/java/code/w= ebapp/WEB-INF/pages/errata/notify.jsp index 185620c..fa705cc 100644 --- a/java/code/webapp/WEB-INF/pages/errata/notify.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/notify.jsp @@ -9,13 +9,7 @@ - - - - - - = - diff --git a/java/code/webapp/WEB-INF/pages/errata/overview.jsp b/java/code= /webapp/WEB-INF/pages/errata/overview.jsp index 89ef07a..d10ff46 100644 --- a/java/code/webapp/WEB-INF/pages/errata/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/overview.jsp @@ -10,12 +10,6 @@ - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/errata/packagepush.jsp b/java/c= ode/webapp/WEB-INF/pages/errata/packagepush.jsp index 0d8e32f..b5e394e 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packagepush.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packagepush.jsp @@ -9,20 +9,12 @@ - - - - - = - =

                                      - = - - = <%@ include file=3D"/WEB-INF/pages/common/fragments/errata/packagepush.jsp= f" %> diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp b/java/= code/webapp/WEB-INF/pages/errata/packages/add.jsp index d11b8bf..e648f14 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp @@ -19,13 +19,7 @@ - - - - - - = - diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp b/j= ava/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp index dcf1f76..b2b6833 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp @@ -10,13 +10,7 @@ - - - - - - = - diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp b/java= /code/webapp/WEB-INF/pages/errata/packages/list.jsp index 688376d..4fe1f7b 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp @@ -9,13 +9,7 @@ - - - - - - = - diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp b/= java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp index 31b9b4a..92d0ebe 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp @@ -9,13 +9,7 @@ - - - - - - = - diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp b/ja= va/code/webapp/WEB-INF/pages/errata/packages/remove.jsp index 94b6865..1446769 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp @@ -9,13 +9,7 @@ - - - - - - = - diff --git a/java/code/webapp/WEB-INF/pages/errata/published.jsp b/java/cod= e/webapp/WEB-INF/pages/errata/published.jsp index 2d825fc..20feca6 100644 --- a/java/code/webapp/WEB-INF/pages/errata/published.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/published.jsp @@ -9,11 +9,6 @@ - - - - - - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp b/java/c= ode/webapp/WEB-INF/pages/errata/unpublished.jsp index d385f2b..727e452 100644 --- a/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp @@ -9,11 +9,6 @@ - - - - - - - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp= b/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp index cdc2eb9..9b25648 100644 --- a/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp @@ -6,12 +6,6 @@ - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/keys/keycreate.jsp b/java/code/= webapp/WEB-INF/pages/keys/keycreate.jsp index 0822b04..c6cb206 100644 --- a/java/code/webapp/WEB-INF/pages/keys/keycreate.jsp +++ b/java/code/webapp/WEB-INF/pages/keys/keycreate.jsp @@ -5,12 +5,6 @@ = - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/keys/keyedit.jsp b/java/code/we= bapp/WEB-INF/pages/keys/keyedit.jsp index c04063d..29b687c 100644 --- a/java/code/webapp/WEB-INF/pages/keys/keyedit.jsp +++ b/java/code/webapp/WEB-INF/pages/keys/keyedit.jsp @@ -6,12 +6,6 @@ - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/keys/keys.jsp b/java/code/webap= p/WEB-INF/pages/keys/keys.jsp index acb0875..236f82f 100644 --- a/java/code/webapp/WEB-INF/pages/keys/keys.jsp +++ b/java/code/webapp/WEB-INF/pages/keys/keys.jsp @@ -7,12 +7,6 @@ - - - - - - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/kickstart-to= olbar.jspf" %> = = - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/kickstart-to= olbar.jspf" %> = - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetail= s.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp index fe5e969..09cf099 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp @@ -9,12 +9,6 @@ = - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp = b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp index 2e43807..1a73888 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp @@ -6,12 +6,6 @@ = - - - - - - - - - - - - ${requestScope.snippet.displayName} diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cryptokeys.jsp b/java= /code/webapp/WEB-INF/pages/kickstart/cryptokeys.jsp index bf4a071..4ef2c19 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/cryptokeys.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/cryptokeys.jsp @@ -5,12 +5,6 @@ = - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/kickstart-to= olbar.jspf" %> = - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/kickstart-to= olbar.jspf" %> = - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/kickstart-to= olbar.jspf" %> = - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/kickstart-to= olbar.jspf" %> = - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/kickstart-to= olbar.jspf" %> = - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/kickstart-to= olbar.jspf" %> = - - - - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/kickstart-to= olbar.jspf" %> - - - - - - = diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp b/java= /code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp index 1929d5d..1afa501 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp @@ -7,12 +7,6 @@ = - - - - - - - - - - - - - - - - - - - - - - - + <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/advanced/he= ader.jspf"%> = = = - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/kickstart= -toolbar.jspf" %> +<%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/kickstart-to= olbar.jspf" %> = - - - - - - - - -
                                      diff --git a/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp b/java/cod= e/webapp/WEB-INF/pages/kickstart/locale.jsp index 374ee20..1bed39e 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp @@ -5,12 +5,6 @@ = - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/kickstart-to= olbar.jspf" %> = - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/kickstart-to= olbar.jspf" %> = - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/kickstart-to= olbar.jspf" %> = - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/kickstart-to= olbar.jspf" %> = - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/kickstart-to= olbar.jspf" %> = - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp b/java= /code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp index 4f7567f..20ce841 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp @@ -10,12 +10,6 @@ - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/kickstart-to= olbar.jspf" %> = - - - - - - - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/kickstart-to= olbar.jspf" %> = = - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/kickstart-to= olbar.jspf" %> = = - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp b/java/c= ode/webapp/WEB-INF/pages/kickstart/treeedit.jsp index 18cd5bc..723f0f0 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp @@ -12,12 +12,6 @@ = - - - - - - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/kickstart-to= olbar.jspf" %> = - - - - diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.= jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp index d67a715..f7fca6a 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp @@ -29,11 +29,6 @@ function refresh() { = - - - - -
                                      diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/second= .jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/second.jsp index 5b4fa20..b5fbe17 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/second.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/second.jsp @@ -48,11 +48,6 @@ function movePrevious() { = - - - - -
                                      diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/third.= jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/third.jsp index cbf5bfa..e3dfd26 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/third.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/third.jsp @@ -32,11 +32,6 @@ function movePrevious() { = - - - - -
                                      diff --git a/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp b/java/co= de/webapp/WEB-INF/pages/monitoring/probes.jsp index 4ff615c..279b679 100644 --- a/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp +++ b/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp @@ -7,12 +7,6 @@ - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp = b/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp index 31dbf3b..78a9e98 100644 --- a/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp +++ b/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp @@ -16,13 +16,7 @@ function showFiltered() { = - = - - - - - - + ${trustorg} diff --git a/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp b= /java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp index 8fde4c4..e345a73 100644 --- a/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp +++ b/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp @@ -9,13 +9,6 @@ - - - - - - - = - = - - - - - - + ${trustorg} diff --git a/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp b/ja= va/code/webapp/WEB-INF/pages/multiorg/organizations.jsp index 07af7dd..6bbae4f 100644 --- a/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp +++ b/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp @@ -7,12 +7,6 @@ = - - - - - - = diff --git a/java/code/webapp/WEB-INF/pages/profiles/delete.jsp b/java/code= /webapp/WEB-INF/pages/profiles/delete.jsp index 032d5e5..4507e83 100644 --- a/java/code/webapp/WEB-INF/pages/profiles/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/profiles/delete.jsp @@ -7,13 +7,6 @@ = - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/profile/header.jspf" %> =

                                      diff --git a/java/code/webapp/WEB-INF/pages/profiles/details.jsp b/java/cod= e/webapp/WEB-INF/pages/profiles/details.jsp index accfe3e..e838e37 100644 --- a/java/code/webapp/WEB-INF/pages/profiles/details.jsp +++ b/java/code/webapp/WEB-INF/pages/profiles/details.jsp @@ -7,9 +7,6 @@ = <%@ include file=3D"/WEB-INF/pages/common/fragments/profile/header.jspf" %> - - -
                                      = diff --git a/java/code/webapp/WEB-INF/pages/profiles/list.jsp b/java/code/w= ebapp/WEB-INF/pages/profiles/list.jsp index 02b480b..af4dafb 100644 --- a/java/code/webapp/WEB-INF/pages/profiles/list.jsp +++ b/java/code/webapp/WEB-INF/pages/profiles/list.jsp @@ -7,19 +7,11 @@ - - - - - - - -

                                      diff --git a/java/code/webapp/WEB-INF/pages/profiles/packagelist.jsp b/java= /code/webapp/WEB-INF/pages/profiles/packagelist.jsp index cb0a2c4..3607b0b 100644 --- a/java/code/webapp/WEB-INF/pages/profiles/packagelist.jsp +++ b/java/code/webapp/WEB-INF/pages/profiles/packagelist.jsp @@ -8,9 +8,6 @@ = <%@ include file=3D"/WEB-INF/pages/common/fragments/profile/header.jspf" %> - - -

                                      diff --git a/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp b/= java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp index e13d901..5e2e357 100644 --- a/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp +++ b/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp @@ -7,14 +7,7 @@ = - - - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/package/package_head= er.jspf" %> +<%@ include file=3D"/WEB-INF/pages/common/fragments/package/package_header= .jspf" %> =

                                      diff --git a/java/code/webapp/WEB-INF/pages/schedule/actiondetails.jsp b/ja= va/code/webapp/WEB-INF/pages/schedule/actiondetails.jsp index e3c997b..2032784 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/actiondetails.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/actiondetails.jsp @@ -6,12 +6,6 @@ - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/scheduledactions/actio= n-header.jspf" %> =

                                      diff --git a/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp b= /java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp index d2ee2ea..ca1061e 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp @@ -8,13 +8,7 @@ - - - - - - = - diff --git a/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp b/ja= va/code/webapp/WEB-INF/pages/schedule/failedactions.jsp index 34d7442..afab339 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp @@ -8,15 +8,7 @@ - - - - - - - - = - diff --git a/java/code/webapp/WEB-INF/pages/schedule/inprogresssystems.jsp = b/java/code/webapp/WEB-INF/pages/schedule/inprogresssystems.jsp index b0f0bf1..2b08f69 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/inprogresssystems.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/inprogresssystems.jsp @@ -6,12 +6,6 @@ - - - - - - <%@ include file=3D"/WEB-INF/pages/common/fragments/scheduledactions/actio= n-header.jspf" %> =

                                      diff --git a/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp b/j= ava/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp index e8d4a7b..3b94b9f 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp @@ -7,13 +7,7 @@ - - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.= jsp b/java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp index 89be605..9c2377e 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp @@ -8,13 +8,7 @@ - - - - - - - diff --git a/java/code/webapp/WEB-INF/pages/software/downloads/download.jsp= b/java/code/webapp/WEB-INF/pages/software/downloads/download.jsp index cdcf5d5..55d003c 100644 --- a/java/code/webapp/WEB-INF/pages/software/downloads/download.jsp +++ b/java/code/webapp/WEB-INF/pages/software/downloads/download.jsp @@ -9,12 +9,6 @@ - - - - - - --===============5119206153842090336==-- From jmrodri at gmail.com Thu Aug 20 11:57:45 2015 Content-Type: multipart/mixed; boundary="===============1267492041562893332==" MIME-Version: 1.0 From: Jesus M. Rodriguez To: spacewalk-commits at lists.fedorahosted.org Subject: Re: java/code Date: Sat, 20 Jun 2009 08:35:13 -0400 Message-ID: In-Reply-To: 20090619223504.CBDC51201D2@lists.fedorahosted.org --===============1267492041562893332== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Partha, EXCELLENT commit with just one nit pick :) see inline. java/code/webapp/WEB-INF/decorators/layout_c.jsp | 5 +++ [snip filelist] New commits: commit 8c7a125761d570236aa67559e249ef336c3e83c6 Author: Partha Aji Date: Fri Jun 19 18:37:46 2009 -0400 Fix for html:errors and html:messages to be consitently viewed in the UI Basically cut out the duplicate code we used for html:message and html:errors in every jsp moved that logic to layout_c.jsp which is used by every jsp in our UI. diff --git a/java/code/webapp/WEB-INF/decorators/layout_c.jsp b/java/code/webapp/WEB-INF/decorators/layout_c.jsp index f7e99f9..e4f8ad2 100644 --- a/java/code/webapp/WEB-INF/decorators/layout_c.jsp +++ b/java/code/webapp/WEB-INF/decorators/layout_c.jsp @@ -1,3 +1,4 @@ +<%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> <%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> <%@ taglib uri=3D"http://www.opensymphony.com/sitemesh/decorator" prefix=3D"decorator" %> <%@ taglib uri=3D"http://www.opensymphony.com/sitemesh/page" prefix=3D"pag= e" %> @@ -32,6 +33,10 @@

                                      + + + +
                                      :<= /th> - :<= /th> +
                                      :<= /th> - :<= /th> +
                                      :
                                      :
                                      :: + + +
                                      : + + (none) + + + + + + + + + +
                                      :
                                      :
                                      :
                                      :: + + +
                                      : + + (none) + + + + + + + + + +
                                      :
                                      + + + + + + = +


                                      + + + +
                                      +
                                      \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first= .jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp index 6c05b7d..e7afbe1 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp @@ -115,24 +115,8 @@ function setStep(stepName) {

                                      = -

                                      - 3D"<bean:message= " /> - -

                                      - - - - - - - -


                                      - - - -
                                      -
                                      + <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/schedule/= schedule-options.jspf" %> + =
                                      diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/= provision/first.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtua= lization/provision/first.jsp index e261f1d..e9a7323 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provisi= on/first.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provisi= on/first.jsp @@ -94,21 +94,8 @@ function setStep(stepName) {

                                      - = -

                                      - - - - - - - -


                                      - - - -
                                      -
                                      + = + <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/schedule= /schedule-options.jspf" %> - - - - - = - - <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/= virtoptions.jspf" %> - = + <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/vir= toptions.jspf" %> + = = = diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virt= options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/vi= rtoptions.jspf index cbcb96d..93506eb 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions= .jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions= .jspf @@ -1,7 +1,15 @@ - - - - = + + + + + @@ -19,5 +27,6 @@ - = - = \ No newline at end of file + + = + \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp = b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp index 2e79b4f..732a03d 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp @@ -38,20 +38,9 @@ - - - - - = = - - <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/= virtoptions.jspf" %> - = + <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/virtoption= s.jspf" %> + = = = = --===============2661323024088930764==-- From partha at fedoraproject.org Thu Aug 20 11:57:53 2015 Content-Type: multipart/mixed; boundary="===============2000019972030661868==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Tue, 30 Jun 2009 18:10:32 +0000 Message-ID: <20090630181033.230291201B9@lists.fedorahosted.org> --===============2000019972030661868== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEdi= tAction.java | 46 +++++----- java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details= .jspf | 14 --- java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf= | 21 +++- java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp = | 15 --- 4 files changed, 42 insertions(+), 54 deletions(-) New commits: commit 1f2d364188f760587962e6b39f041e0cd5f5e962 Author: Partha Aji Date: Tue Jun 30 14:06:22 2009 -0400 508705 - Fixed KS details page to hide virt options if virt type is none diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Kicksta= rtDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kic= kstart/KickstartDetailsEditAction.java index 93f74ef..1e65b36 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetai= lsEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetai= lsEditAction.java @@ -146,29 +146,29 @@ public class KickstartDetailsEditAction extends BaseK= ickstartEditAction { form.set(KERNEL_OPTIONS, prof.getKernelOptionsString()); form.set(POST_KERNEL_OPTIONS, prof.getKernelPostOptionsString(= )); } - = - if (prof =3D=3D null) { - form.set(VIRT_BRIDGE, Config.get().getDefaultXenVirtBridge()); - form.set(VIRT_CPU, Config.get().getDefaultVirtCpus()); - form.set(VIRT_DISK_SIZE, Config.get().getDefaultVirtDiskSize()); - form.set(VIRT_MEMORY, Config.get().getDefaultVirtMemorySize()); - } - else { - setFormValueOrDefault(form, VIRT_BRIDGE, prof.getVirtBridge(), = - Config.get().getDefaultXenV= irtBridge()); - setFormValueOrDefault(form, VIRT_CPU, prof.getVirtCpus(), - Config.get().getDefault= VirtCpus()); - setFormValueOrDefault(form, VIRT_DISK_SIZE, prof.getVirtFileSiz= e(), - Config.get().getDefaultVirt= DiskSize()); - setFormValueOrDefault(form, VIRT_MEMORY, prof.getVirtRam(), - Config.get().getDefaultVirtMemo= rySize()); = - } - - = - //Should we show virt options? - ctx.getRequest().setAttribute(IS_VIRT, !data.getKickstartDefaults(). - getVirtualizationType().equals(KickstartFactory.VIRT_TY= PE_PV_HOST)); - + KickstartVirtualizationType type =3D data.getKickstartDefaults(). + getVirtualizationType(= ); + //Should we show virt options? + if (!type.equals(KickstartVirtualizationType.paraHost()) && + !type.equals(KickstartVirtualizationType.none())) { + if (prof =3D=3D null) { + form.set(VIRT_BRIDGE, Config.get().getDefaultXenVirtBridge(= )); + form.set(VIRT_CPU, Config.get().getDefaultVirtCpus()); + form.set(VIRT_DISK_SIZE, Config.get().getDefaultVirtDiskSiz= e()); + form.set(VIRT_MEMORY, Config.get().getDefaultVirtMemorySize= ()); + } + else { + setFormValueOrDefault(form, VIRT_BRIDGE, prof.getVirtBridge= (), = + Config.get().getDefault= XenVirtBridge()); + setFormValueOrDefault(form, VIRT_CPU, prof.getVirtCpus(), + Config.get().getDef= aultVirtCpus()); + setFormValueOrDefault(form, VIRT_DISK_SIZE, prof.getVirtFil= eSize(), + Config.get().getDefault= VirtDiskSize()); + setFormValueOrDefault(form, VIRT_MEMORY, prof.getVirtRam(), + Config.get().getDefaultVirt= MemorySize()); = + } + ctx.getRequest().setAttribute(IS_VIRT, Boolean.TRUE); = + } } = = diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/adva= nced/details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kicksta= rt/advanced/details.jspf index 571b990..e290a04 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/de= tails.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/de= tails.jspf @@ -30,18 +30,8 @@ = - - - - - = - - <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/= virtoptions.jspf" %> - = + <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/vir= toptions.jspf" %> + = = = diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virt= options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/vi= rtoptions.jspf index cbcb96d..93506eb 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions= .jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions= .jspf @@ -1,7 +1,15 @@ - - - - = + + + + + @@ -19,5 +27,6 @@ - = - = \ No newline at end of file + + = + \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp = b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp index ccab725..eca73ce 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp @@ -32,20 +32,9 @@ - - - - - = = - - <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/= virtoptions.jspf" %> - = + <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/virtoption= s.jspf" %> + = = = = --===============2000019972030661868==-- From mmccune at fedoraproject.org Thu Aug 20 11:57:53 2015 Content-Type: multipart/mixed; boundary="===============9029814318345832189==" MIME-Version: 1.0 From: Mike McCune To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Tue, 30 Jun 2009 18:54:05 +0000 Message-ID: <20090630185405.685061201B9@lists.fedorahosted.org> --===============9029814318345832189== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/conf/Config.java = | 10 ++++++ java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java = | 15 ++++++++++ java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java = | 13 ++++++++ java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEdi= tAction.java | 4 +- java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreat= eCommand.java | 2 - 5 files changed, 41 insertions(+), 3 deletions(-) New commits: commit 3c0955251af6e6f38136b0ea3d55d507ba79c27e Author: Mike McCune Date: Tue Jun 30 11:44:03 2009 -0700 508790 - use virbr0 for KVM guest defaults diff --git a/java/code/src/com/redhat/rhn/common/conf/Config.java b/java/co= de/src/com/redhat/rhn/common/conf/Config.java index ad40462..5106870 100644 --- a/java/code/src/com/redhat/rhn/common/conf/Config.java +++ b/java/code/src/com/redhat/rhn/common/conf/Config.java @@ -794,6 +794,16 @@ public class Config { public String getDefaultXenVirtBridge() { return getString(VIRT_BRIDGE, "xenbr0"); } + = + /** + * Returns the default value for the xen virt bridge + * @return the value for virt bridge. + */ + public String getDefaultKVMVirtBridge() { + return getString(VIRT_BRIDGE, "virbr0"); + } + + = /** * Returns the default virt disk size in GBs * @return the virt disk size diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.ja= va b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java index b1d4c91..88feacc 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java @@ -1483,4 +1483,19 @@ public class KickstartData { this.kickstartType =3D kickstartTypeIn; } = + /** + * Get the default virt bridge for this KickstartData object. + * = + * @return String virt bridge (xenbr0, virbr0) + */ + public String getDefaultVirtBridge() { + if (this.getKickstartDefaults().getVirtualizationType().getLabel() + .equals(KickstartVirtualizationType.KVM_FULLYVIRT)) { + return Config.get().getDefaultKVMVirtBridge(); + } = + else { + return Config.get().getDefaultXenVirtBridge(); + } + } + = } diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDa= taTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartD= ataTest.java index a75cbc3..317055d 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 @@ -757,4 +757,17 @@ public class KickstartDataTest extends BaseTestCaseWit= hUser { assertTrue(k.isRhel5OrGreater()); assertFalse(k.isRhel5()); } + + public void testDefaultBridge() throws Exception { + KickstartData k =3D createKickstartWithChannel(user.getOrg()); + k.getKickstartDefaults(). + setVirtualizationType(KickstartVirtualizationType.kvmGuest()); + = + assertTrue(k.getDefaultVirtBridge().equals(Config.get().getDefaultKVM= VirtBridge())); + = + k.getKickstartDefaults(). + setVirtualizationType(KickstartVirtualizationType.xenPV()); + = + assertTrue(k.getDefaultVirtBridge().equals(Config.get().getDefaultXen= VirtBridge())); + } } diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Kicksta= rtDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kic= kstart/KickstartDetailsEditAction.java index 1e65b36..e2fb148 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetai= lsEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetai= lsEditAction.java @@ -152,14 +152,14 @@ public class KickstartDetailsEditAction extends BaseK= ickstartEditAction { if (!type.equals(KickstartVirtualizationType.paraHost()) && !type.equals(KickstartVirtualizationType.none())) { if (prof =3D=3D null) { - form.set(VIRT_BRIDGE, Config.get().getDefaultXenVirtBridge(= )); + form.set(VIRT_BRIDGE, data.getDefaultVirtBridge()); form.set(VIRT_CPU, Config.get().getDefaultVirtCpus()); form.set(VIRT_DISK_SIZE, Config.get().getDefaultVirtDiskSiz= e()); form.set(VIRT_MEMORY, Config.get().getDefaultVirtMemorySize= ()); } else { setFormValueOrDefault(form, VIRT_BRIDGE, prof.getVirtBridge= (), = - Config.get().getDefault= XenVirtBridge()); + data.getDefaultVirtBridge()); setFormValueOrDefault(form, VIRT_CPU, prof.getVirtCpus(), Config.get().getDef= aultVirtCpus()); setFormValueOrDefault(form, VIRT_DISK_SIZE, prof.getVirtFil= eSize(), diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= ProfileCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/= cobbler/CobblerProfileCreateCommand.java index 510967c..6f52d29 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfile= CreateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfile= CreateCommand.java @@ -75,7 +75,7 @@ public class CobblerProfileCreateCommand extends CobblerP= rofileCommand { meta.put("org", ksData.getOrg().getId().toString()); prof.setKsMeta(meta); KickstartFactory.saveKickstartData(this.ksData); - prof.setVirtBridge(Config.get().getDefaultXenVirtBridge()); + prof.setVirtBridge(this.ksData.getDefaultVirtBridge()); prof.setVirtCpus(Config.get().getDefaultVirtCpus()); prof.setVirtRam(Config.get().getDefaultVirtMemorySize()); prof.setVirtFileSize(Config.get().getDefaultVirtDiskSize()); --===============9029814318345832189==-- From mmccune at fedoraproject.org Thu Aug 20 11:57:53 2015 Content-Type: multipart/mixed; boundary="===============0501225656964994913==" MIME-Version: 1.0 From: Mike McCune To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Tue, 30 Jun 2009 18:56:29 +0000 Message-ID: <20090630185629.5249A1201B9@lists.fedorahosted.org> --===============0501225656964994913== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/conf/Config.java = | 10 ++++++ java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java = | 15 ++++++++++ java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java = | 13 ++++++++ java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEdi= tAction.java | 4 +- java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreat= eCommand.java | 2 - 5 files changed, 41 insertions(+), 3 deletions(-) New commits: commit 827aefe6a7b13bff7b6b9db297f975dc7b7bf46d Author: Mike McCune Date: Tue Jun 30 11:44:03 2009 -0700 508790 - use virbr0 for KVM guest defaults diff --git a/java/code/src/com/redhat/rhn/common/conf/Config.java b/java/co= de/src/com/redhat/rhn/common/conf/Config.java index ad40462..5106870 100644 --- a/java/code/src/com/redhat/rhn/common/conf/Config.java +++ b/java/code/src/com/redhat/rhn/common/conf/Config.java @@ -794,6 +794,16 @@ public class Config { public String getDefaultXenVirtBridge() { return getString(VIRT_BRIDGE, "xenbr0"); } + = + /** + * Returns the default value for the xen virt bridge + * @return the value for virt bridge. + */ + public String getDefaultKVMVirtBridge() { + return getString(VIRT_BRIDGE, "virbr0"); + } + + = /** * Returns the default virt disk size in GBs * @return the virt disk size diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.ja= va b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java index b1d4c91..88feacc 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java @@ -1483,4 +1483,19 @@ public class KickstartData { this.kickstartType =3D kickstartTypeIn; } = + /** + * Get the default virt bridge for this KickstartData object. + * = + * @return String virt bridge (xenbr0, virbr0) + */ + public String getDefaultVirtBridge() { + if (this.getKickstartDefaults().getVirtualizationType().getLabel() + .equals(KickstartVirtualizationType.KVM_FULLYVIRT)) { + return Config.get().getDefaultKVMVirtBridge(); + } = + else { + return Config.get().getDefaultXenVirtBridge(); + } + } + = } diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDa= taTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartD= ataTest.java index a75cbc3..317055d 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 @@ -757,4 +757,17 @@ public class KickstartDataTest extends BaseTestCaseWit= hUser { assertTrue(k.isRhel5OrGreater()); assertFalse(k.isRhel5()); } + + public void testDefaultBridge() throws Exception { + KickstartData k =3D createKickstartWithChannel(user.getOrg()); + k.getKickstartDefaults(). + setVirtualizationType(KickstartVirtualizationType.kvmGuest()); + = + assertTrue(k.getDefaultVirtBridge().equals(Config.get().getDefaultKVM= VirtBridge())); + = + k.getKickstartDefaults(). + setVirtualizationType(KickstartVirtualizationType.xenPV()); + = + assertTrue(k.getDefaultVirtBridge().equals(Config.get().getDefaultXen= VirtBridge())); + } } diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Kicksta= rtDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kic= kstart/KickstartDetailsEditAction.java index 1e65b36..e2fb148 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetai= lsEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetai= lsEditAction.java @@ -152,14 +152,14 @@ public class KickstartDetailsEditAction extends BaseK= ickstartEditAction { if (!type.equals(KickstartVirtualizationType.paraHost()) && !type.equals(KickstartVirtualizationType.none())) { if (prof =3D=3D null) { - form.set(VIRT_BRIDGE, Config.get().getDefaultXenVirtBridge(= )); + form.set(VIRT_BRIDGE, data.getDefaultVirtBridge()); form.set(VIRT_CPU, Config.get().getDefaultVirtCpus()); form.set(VIRT_DISK_SIZE, Config.get().getDefaultVirtDiskSiz= e()); form.set(VIRT_MEMORY, Config.get().getDefaultVirtMemorySize= ()); } else { setFormValueOrDefault(form, VIRT_BRIDGE, prof.getVirtBridge= (), = - Config.get().getDefault= XenVirtBridge()); + data.getDefaultVirtBridge()); setFormValueOrDefault(form, VIRT_CPU, prof.getVirtCpus(), Config.get().getDef= aultVirtCpus()); setFormValueOrDefault(form, VIRT_DISK_SIZE, prof.getVirtFil= eSize(), diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/Cobbler= ProfileCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/= cobbler/CobblerProfileCreateCommand.java index 510967c..6f52d29 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfile= CreateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfile= CreateCommand.java @@ -75,7 +75,7 @@ public class CobblerProfileCreateCommand extends CobblerP= rofileCommand { meta.put("org", ksData.getOrg().getId().toString()); prof.setKsMeta(meta); KickstartFactory.saveKickstartData(this.ksData); - prof.setVirtBridge(Config.get().getDefaultXenVirtBridge()); + prof.setVirtBridge(this.ksData.getDefaultVirtBridge()); prof.setVirtCpus(Config.get().getDefaultVirtCpus()); prof.setVirtRam(Config.get().getDefaultVirtMemorySize()); prof.setVirtFileSize(Config.get().getDefaultVirtDiskSize()); --===============0501225656964994913==-- From partha at fedoraproject.org Thu Aug 20 11:57:53 2015 Content-Type: multipart/mixed; boundary="===============3215964015390471354==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Tue, 30 Jun 2009 19:08:50 +0000 Message-ID: <20090630190850.C2CEF1201B9@lists.fedorahosted.org> --===============3215964015390471354== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEd= itAction.java | 41 ++++++---- java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp = | 7 - 2 files changed, 29 insertions(+), 19 deletions(-) New commits: commit 9666fb3f37bf2361db12ea32e111deb64acab9e2 Author: Partha Aji Date: Tue Jun 30 15:08:05 2009 -0400 508962 - Fixed KS software edit page to hide repo section if tree is no= t rhel 5 diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Kicksta= rtSoftwareEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/ki= ckstart/KickstartSoftwareEditAction.java index aa2dc00..d69922b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftw= areEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftw= areEditAction.java @@ -71,7 +71,7 @@ public class KickstartSoftwareEditAction extends BaseKick= startEditAction { String fieldChanged =3D form.getString("fieldChanged"); KickstartEditCommand cmd =3D (KickstartEditCommand) cmdIn; KickstartableTree tree =3D cmd.getKickstartData().getKickstartDefa= ults().getKstree(); - KickstartHelper kshelper =3D new KickstartHelper(ctx.getRequest()); + KickstartableTree selectedTree; List trees =3D null; Long incomingChannelId =3D (Long) form.get(CHANNEL); Long channelId =3D incomingChannelId; @@ -88,6 +88,7 @@ public class KickstartSoftwareEditAction extends BaseKick= startEditAction { ctx.getCurrentUser().getOrg()); } setupUrl(ctx, form, kstree); + selectedTree =3D kstree; } else { if (form.get(CHANNEL) !=3D null) { @@ -104,12 +105,14 @@ public class KickstartSoftwareEditAction extends Base= KickstartEditAction { ctx.getCurrentUser().getOrg()); } setupUrl(ctx, form, kstree); + selectedTree =3D kstree; } if (fieldChanged.equals("kstree")) { KickstartableTree kstree =3D = KickstartFactory.lookupKickstartTreeByIdAndOrg((Long) form= .get(TREE), ctx.getCurrentUser().getOrg()); setupUrl(ctx, form, kstree); + selectedTree =3D kstree; } ctx.getRequest().setAttribute(TREES, trees); if (trees =3D=3D null || trees.size() =3D=3D 0) { @@ -143,7 +146,7 @@ public class KickstartSoftwareEditAction extends BaseKi= ckstartEditAction { if (form.getString(URL) =3D=3D null) { ctx.getRequest().setAttribute("nourl", "true"); } - setupRepos(ctx, form, cmd.getKickstartData()); + setupRepos(ctx, form, cmd.getKickstartData(), selectedTree); } = private void setupChildChannels(RequestContext ctx, Long channelId, = @@ -244,21 +247,27 @@ public class KickstartSoftwareEditAction extends Base= KickstartEditAction { } = private void setupRepos(RequestContext context, = - DynaActionForm form, KickstartData ksdata) { - List repos =3D new LinkedList(); - for (String name : RepoInfo.getStandardRepos().keySet()) { - repos.add(lve(name, name, false)); - } - form.set(POSSIBLE_REPOS, (LabelValueEnabledBean[]) - repos.toArray(new LabelValueEnabledBean[0])); - Set selected =3D ksdata.getRepoInfos(); - String [] items =3D new String[selected.size()]; - int i =3D 0; - for (RepoInfo repo : selected) { - items[i] =3D repo.getName(); - i++; + DynaActionForm form, KickstartData ksdata, = + KickstartableTree tree) { + = + if (tree !=3D null && !tree.getInstallType().isRhel2() && + !tree.getInstallType().isRhel3() && + !tree.getInstallType().isRhel4()) { + List repos =3D new LinkedList(); + for (String name : RepoInfo.getStandardRepos().keySet()) { + repos.add(lve(name, name, false)); + } + form.set(POSSIBLE_REPOS, (LabelValueEnabledBean[]) + repos.toArray(new LabelValueEnabledBean[0])); + Set selected =3D ksdata.getRepoInfos(); + String [] items =3D new String[selected.size()]; + int i =3D 0; + for (RepoInfo repo : selected) { + items[i] =3D repo.getName(); + i++; + } + form.set(SELECTED_REPOS, items); = } - form.set(SELECTED_REPOS, items); } = /** diff --git a/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp b/ja= va/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp index eea1562..cda5b3d 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp @@ -101,10 +101,11 @@ function reloadForm(ctl) { + - = + = = --===============3215964015390471354==-- From partha at fedoraproject.org Thu Aug 20 11:57:53 2015 Content-Type: multipart/mixed; boundary="===============5235155729475160430==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Tue, 30 Jun 2009 19:09:18 +0000 Message-ID: <20090630190918.7B59D1201B9@lists.fedorahosted.org> --===============5235155729475160430== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEd= itAction.java | 41 ++++++---- java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp = | 7 - 2 files changed, 29 insertions(+), 19 deletions(-) New commits: commit 5e297d3f61874b2c4316073878cda85b9cf51687 Author: Partha Aji Date: Tue Jun 30 15:08:05 2009 -0400 508962 - Fixed KS software edit page to hide repo section if tree is no= t rhel 5 diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Kicksta= rtSoftwareEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/ki= ckstart/KickstartSoftwareEditAction.java index aa2dc00..d69922b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftw= areEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftw= areEditAction.java @@ -71,7 +71,7 @@ public class KickstartSoftwareEditAction extends BaseKick= startEditAction { String fieldChanged =3D form.getString("fieldChanged"); KickstartEditCommand cmd =3D (KickstartEditCommand) cmdIn; KickstartableTree tree =3D cmd.getKickstartData().getKickstartDefa= ults().getKstree(); - KickstartHelper kshelper =3D new KickstartHelper(ctx.getRequest()); + KickstartableTree selectedTree; List trees =3D null; Long incomingChannelId =3D (Long) form.get(CHANNEL); Long channelId =3D incomingChannelId; @@ -88,6 +88,7 @@ public class KickstartSoftwareEditAction extends BaseKick= startEditAction { ctx.getCurrentUser().getOrg()); } setupUrl(ctx, form, kstree); + selectedTree =3D kstree; } else { if (form.get(CHANNEL) !=3D null) { @@ -104,12 +105,14 @@ public class KickstartSoftwareEditAction extends Base= KickstartEditAction { ctx.getCurrentUser().getOrg()); } setupUrl(ctx, form, kstree); + selectedTree =3D kstree; } if (fieldChanged.equals("kstree")) { KickstartableTree kstree =3D = KickstartFactory.lookupKickstartTreeByIdAndOrg((Long) form= .get(TREE), ctx.getCurrentUser().getOrg()); setupUrl(ctx, form, kstree); + selectedTree =3D kstree; } ctx.getRequest().setAttribute(TREES, trees); if (trees =3D=3D null || trees.size() =3D=3D 0) { @@ -143,7 +146,7 @@ public class KickstartSoftwareEditAction extends BaseKi= ckstartEditAction { if (form.getString(URL) =3D=3D null) { ctx.getRequest().setAttribute("nourl", "true"); } - setupRepos(ctx, form, cmd.getKickstartData()); + setupRepos(ctx, form, cmd.getKickstartData(), selectedTree); } = private void setupChildChannels(RequestContext ctx, Long channelId, = @@ -244,21 +247,27 @@ public class KickstartSoftwareEditAction extends Base= KickstartEditAction { } = private void setupRepos(RequestContext context, = - DynaActionForm form, KickstartData ksdata) { - List repos =3D new LinkedList(); - for (String name : RepoInfo.getStandardRepos().keySet()) { - repos.add(lve(name, name, false)); - } - form.set(POSSIBLE_REPOS, (LabelValueEnabledBean[]) - repos.toArray(new LabelValueEnabledBean[0])); - Set selected =3D ksdata.getRepoInfos(); - String [] items =3D new String[selected.size()]; - int i =3D 0; - for (RepoInfo repo : selected) { - items[i] =3D repo.getName(); - i++; + DynaActionForm form, KickstartData ksdata, = + KickstartableTree tree) { + = + if (tree !=3D null && !tree.getInstallType().isRhel2() && + !tree.getInstallType().isRhel3() && + !tree.getInstallType().isRhel4()) { + List repos =3D new LinkedList(); + for (String name : RepoInfo.getStandardRepos().keySet()) { + repos.add(lve(name, name, false)); + } + form.set(POSSIBLE_REPOS, (LabelValueEnabledBean[]) + repos.toArray(new LabelValueEnabledBean[0])); + Set selected =3D ksdata.getRepoInfos(); + String [] items =3D new String[selected.size()]; + int i =3D 0; + for (RepoInfo repo : selected) { + items[i] =3D repo.getName(); + i++; + } + form.set(SELECTED_REPOS, items); = } - form.set(SELECTED_REPOS, items); } = /** diff --git a/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp b/ja= va/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp index 2961b69..dc07c22 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp @@ -107,10 +107,11 @@ function reloadForm(ctl) { + - = + = = --===============5235155729475160430==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:54 2015 Content-Type: multipart/mixed; boundary="===============4923435250436522442==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - java/code Date: Tue, 30 Jun 2009 19:14:18 +0000 Message-ID: <20090630191418.8D0C81201D8@lists.fedorahosted.org> --===============4923435250436522442== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/messaging/test/MessageQueueTest.java = | 2 = java/code/src/com/redhat/rhn/frontend/action/user/DeleteUserAction.java = | 16 ++- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xm= l | 7 + java/code/src/com/redhat/rhn/frontend/xmlrpc/DeleteUserException.java = | 40 +++++++ java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.java = | 12 ++ java/code/src/com/redhat/rhn/manager/user/DeleteSatAdminException.java = | 52 ++++++++++ java/code/src/com/redhat/rhn/manager/user/UserManager.java = | 11 ++ 7 files changed, 137 insertions(+), 3 deletions(-) New commits: commit 7387b64ad2241c37ab1ce5c2fc734c1510fae514 Author: Devan Goodwin Date: Tue Jun 30 15:57:48 2009 -0300 508789 - Block deletion of last remaining Satellite Administrator. diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/DeleteUserAc= tion.java b/java/code/src/com/redhat/rhn/frontend/action/user/DeleteUserAct= ion.java index 809f4c1..d17484b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/DeleteUserAction.ja= va +++ b/java/code/src/com/redhat/rhn/frontend/action/user/DeleteUserAction.ja= va @@ -21,6 +21,7 @@ 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.manager.acl.AclManager; +import com.redhat.rhn.manager.user.DeleteSatAdminException; import com.redhat.rhn.manager.user.UserManager; = import org.apache.struts.action.ActionErrors; @@ -83,7 +84,20 @@ public class DeleteUserAction extends RhnAction { return getStrutsDelegate().forwardParams(mapping.findForward("= failure"), = params); } - UserManager.deleteUser(loggedInUser, uid); + + try { + UserManager.deleteUser(loggedInUser, uid); + } + catch (DeleteSatAdminException e) { + errors.add(ActionMessages.GLOBAL_MESSAGE, + new ActionMessage("user.cannot.delete.last.sat.admin")= ); + Map params =3D new HashMap(); + params.put("uid", uid); + addErrors(request, errors); + return getStrutsDelegate().forwardParams(mapping.findForward("= failure"), + params); + } + ActionMessages msg =3D new ActionMessages(); msg.add(ActionMessages.GLOBAL_MESSAGE, = new ActionMessage("user.delete", user.getLogin())); diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResou= rce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringRe= source_en_US.xml index a1d65ac..32fafc1 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml @@ -1085,6 +1085,13 @@ http://www.oasis-open.org/committees/xliff/documents= /xliff-core-1.1.xsd" = + +Cannot delete the last remaining satellite administrator. + + /rhn/users/DeleteUser + + + Users/Servers diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/DeleteUserExcepti= on.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/DeleteUserException.= java new file mode 100644 index 0000000..4d5b2c8 --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/DeleteUserException.java @@ -0,0 +1,40 @@ +/** + * Copyright (c) 2009 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.xmlrpc; + +import com.redhat.rhn.FaultException; +import com.redhat.rhn.common.localization.LocalizationService; + +/** + * Delete User Exception + * + * Thrown whenever a problem occurs deleting a user. + * + * @version $Rev$ + */ +public class DeleteUserException extends FaultException { + + /** + * Constructor + * @param resourceKey Resource bundle key for error message to return. + */ + public DeleteUserException(String resourceKey) { + super(2601, "Error deleting user", LocalizationService.getInstance= (). + getMessage(resourceKey, new Object [] {})); + } + +} + diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.= java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.java index 15ae77f..71fcd0c 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.java @@ -14,6 +14,10 @@ */ package com.redhat.rhn.frontend.xmlrpc.user; = +import com.redhat.rhn.frontend.xmlrpc.DeleteUserException; + +import com.redhat.rhn.manager.user.DeleteSatAdminException; + import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -535,7 +539,13 @@ public class UserHandler extends BaseHandler { User loggedInUser =3D getLoggedInUser(sessionKey); ensureOrgAdmin(loggedInUser); User target =3D XmlRpcUserHelper.getInstance().lookupTargetUser(lo= ggedInUser, login); - UserManager.deleteUser(loggedInUser, target.getId()); + + try { + UserManager.deleteUser(loggedInUser, target.getId()); + } + catch (DeleteSatAdminException e) { + throw new DeleteUserException("user.cannot.delete.last.sat.adm= in"); + } = return 1; } diff --git a/java/code/src/com/redhat/rhn/manager/user/DeleteSatAdminExcept= ion.java b/java/code/src/com/redhat/rhn/manager/user/DeleteSatAdminExceptio= n.java new file mode 100644 index 0000000..c1d4482 --- /dev/null +++ b/java/code/src/com/redhat/rhn/manager/user/DeleteSatAdminException.java @@ -0,0 +1,52 @@ +/** + * Copyright (c) 2009 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.manager.user; + +import com.redhat.rhn.common.RhnRuntimeException; + +import com.redhat.rhn.domain.user.User; + +/** + * DeleteSatAdminException + * + * Exception thrown when we cannot delete a Satellite administrator. (pres= umably because + * they are the last remaining) + * + * @version $Rev$ + */ +public class DeleteSatAdminException extends RhnRuntimeException { + + private User targetUser; + + /** + * Constructor + * + * @param targetUserIn User we could not delete. + */ + public DeleteSatAdminException(User targetUserIn) { + super(); + this.targetUser =3D targetUserIn; + } + + /** + * Return the target user we could not delete. + * + * @return target user + */ + public User getTargetUser() { + return targetUser; + } + +} diff --git a/java/code/src/com/redhat/rhn/manager/user/UserManager.java b/j= ava/code/src/com/redhat/rhn/manager/user/UserManager.java index b2c26e1..ae9208f 100644 --- a/java/code/src/com/redhat/rhn/manager/user/UserManager.java +++ b/java/code/src/com/redhat/rhn/manager/user/UserManager.java @@ -40,6 +40,7 @@ import com.redhat.rhn.frontend.dto.SystemSearchResult; import com.redhat.rhn.frontend.listview.PageControl; import com.redhat.rhn.frontend.taglibs.list.decorators.PageSizeDecorator; import com.redhat.rhn.manager.BaseManager; +import com.redhat.rhn.manager.SatManager; = import org.apache.commons.lang.BooleanUtils; import org.apache.log4j.Logger; @@ -450,6 +451,16 @@ public class UserManager extends BaseManager { pex.setLocalizedSummary(ls.getMessage("permission.jsp.summary.= deleteuser")); throw pex; } + + // Do not allow deletion of the last Satellite Administrator: + User toDelete =3D UserFactory.lookupById(loggedInUser, targetUid); + if (toDelete.hasRole(RoleFactory.SAT_ADMIN)) { + if (SatManager.getActiveSatAdmins().size() =3D=3D 1) { + log.warn("Cannot delete the last Satellite Administrator"); + throw new DeleteSatAdminException(toDelete); + } + } + CallableMode m =3D ModeFactory.getCallableMode("User_queries", "delete_user"); Map inParams =3D new HashMap(); commit 0df9b87830366aabe192b1a7d7c75d4ee79c1a02 Author: Devan Goodwin Date: Mon Jun 29 10:09:06 2009 -0300 Bumping timeout on Message Queue Test. = It appears to fail sometimes. diff --git a/java/code/src/com/redhat/rhn/common/messaging/test/MessageQueu= eTest.java b/java/code/src/com/redhat/rhn/common/messaging/test/MessageQueu= eTest.java index 077ea62..9ff3c31 100644 --- a/java/code/src/com/redhat/rhn/common/messaging/test/MessageQueueTest.j= ava +++ b/java/code/src/com/redhat/rhn/common/messaging/test/MessageQueueTest.j= ava @@ -227,7 +227,7 @@ public class MessageQueueTest extends RhnBaseTestCase { if (count > 25) { break; } - Thread.sleep(100); + Thread.sleep(500); } if (matchingValue) { assertTrue(wasReceived); --===============4923435250436522442==-- From dgoodwin at fedoraproject.org Thu Aug 20 11:57:54 2015 Content-Type: multipart/mixed; boundary="===============8252189141125558957==" MIME-Version: 1.0 From: Devan Goodwin To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Tue, 30 Jun 2009 19:15:16 +0000 Message-ID: <20090630191516.844081201B9@lists.fedorahosted.org> --===============8252189141125558957== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/user/DeleteUserAction.java = | 16 ++- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xm= l | 7 + java/code/src/com/redhat/rhn/frontend/xmlrpc/DeleteUserException.java = | 40 +++++++ java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.java = | 12 ++ java/code/src/com/redhat/rhn/manager/user/DeleteSatAdminException.java = | 52 ++++++++++ java/code/src/com/redhat/rhn/manager/user/UserManager.java = | 11 ++ 6 files changed, 136 insertions(+), 2 deletions(-) New commits: commit 2d5f5fa328b2461ae4884bca56be2ce5615e6722 Author: Devan Goodwin Date: Tue Jun 30 15:57:48 2009 -0300 508789 - Block deletion of last remaining Satellite Administrator. diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/DeleteUserAc= tion.java b/java/code/src/com/redhat/rhn/frontend/action/user/DeleteUserAct= ion.java index 809f4c1..d17484b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/DeleteUserAction.ja= va +++ b/java/code/src/com/redhat/rhn/frontend/action/user/DeleteUserAction.ja= va @@ -21,6 +21,7 @@ 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.manager.acl.AclManager; +import com.redhat.rhn.manager.user.DeleteSatAdminException; import com.redhat.rhn.manager.user.UserManager; = import org.apache.struts.action.ActionErrors; @@ -83,7 +84,20 @@ public class DeleteUserAction extends RhnAction { return getStrutsDelegate().forwardParams(mapping.findForward("= failure"), = params); } - UserManager.deleteUser(loggedInUser, uid); + + try { + UserManager.deleteUser(loggedInUser, uid); + } + catch (DeleteSatAdminException e) { + errors.add(ActionMessages.GLOBAL_MESSAGE, + new ActionMessage("user.cannot.delete.last.sat.admin")= ); + Map params =3D new HashMap(); + params.put("uid", uid); + addErrors(request, errors); + return getStrutsDelegate().forwardParams(mapping.findForward("= failure"), + params); + } + ActionMessages msg =3D new ActionMessages(); msg.add(ActionMessages.GLOBAL_MESSAGE, = new ActionMessage("user.delete", user.getLogin())); diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResou= rce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringRe= source_en_US.xml index a1d65ac..32fafc1 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_= US.xml @@ -1085,6 +1085,13 @@ http://www.oasis-open.org/committees/xliff/documents= /xliff-core-1.1.xsd" = + +Cannot delete the last remaining satellite administrator. + + /rhn/users/DeleteUser + + + Users/Servers diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/DeleteUserExcepti= on.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/DeleteUserException.= java new file mode 100644 index 0000000..4d5b2c8 --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/DeleteUserException.java @@ -0,0 +1,40 @@ +/** + * Copyright (c) 2009 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.xmlrpc; + +import com.redhat.rhn.FaultException; +import com.redhat.rhn.common.localization.LocalizationService; + +/** + * Delete User Exception + * + * Thrown whenever a problem occurs deleting a user. + * + * @version $Rev$ + */ +public class DeleteUserException extends FaultException { + + /** + * Constructor + * @param resourceKey Resource bundle key for error message to return. + */ + public DeleteUserException(String resourceKey) { + super(2601, "Error deleting user", LocalizationService.getInstance= (). + getMessage(resourceKey, new Object [] {})); + } + +} + diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.= java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.java index 15ae77f..71fcd0c 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.java @@ -14,6 +14,10 @@ */ package com.redhat.rhn.frontend.xmlrpc.user; = +import com.redhat.rhn.frontend.xmlrpc.DeleteUserException; + +import com.redhat.rhn.manager.user.DeleteSatAdminException; + import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -535,7 +539,13 @@ public class UserHandler extends BaseHandler { User loggedInUser =3D getLoggedInUser(sessionKey); ensureOrgAdmin(loggedInUser); User target =3D XmlRpcUserHelper.getInstance().lookupTargetUser(lo= ggedInUser, login); - UserManager.deleteUser(loggedInUser, target.getId()); + + try { + UserManager.deleteUser(loggedInUser, target.getId()); + } + catch (DeleteSatAdminException e) { + throw new DeleteUserException("user.cannot.delete.last.sat.adm= in"); + } = return 1; } diff --git a/java/code/src/com/redhat/rhn/manager/user/DeleteSatAdminExcept= ion.java b/java/code/src/com/redhat/rhn/manager/user/DeleteSatAdminExceptio= n.java new file mode 100644 index 0000000..c1d4482 --- /dev/null +++ b/java/code/src/com/redhat/rhn/manager/user/DeleteSatAdminException.java @@ -0,0 +1,52 @@ +/** + * Copyright (c) 2009 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.manager.user; + +import com.redhat.rhn.common.RhnRuntimeException; + +import com.redhat.rhn.domain.user.User; + +/** + * DeleteSatAdminException + * + * Exception thrown when we cannot delete a Satellite administrator. (pres= umably because + * they are the last remaining) + * + * @version $Rev$ + */ +public class DeleteSatAdminException extends RhnRuntimeException { + + private User targetUser; + + /** + * Constructor + * + * @param targetUserIn User we could not delete. + */ + public DeleteSatAdminException(User targetUserIn) { + super(); + this.targetUser =3D targetUserIn; + } + + /** + * Return the target user we could not delete. + * + * @return target user + */ + public User getTargetUser() { + return targetUser; + } + +} diff --git a/java/code/src/com/redhat/rhn/manager/user/UserManager.java b/j= ava/code/src/com/redhat/rhn/manager/user/UserManager.java index b2c26e1..ae9208f 100644 --- a/java/code/src/com/redhat/rhn/manager/user/UserManager.java +++ b/java/code/src/com/redhat/rhn/manager/user/UserManager.java @@ -40,6 +40,7 @@ import com.redhat.rhn.frontend.dto.SystemSearchResult; import com.redhat.rhn.frontend.listview.PageControl; import com.redhat.rhn.frontend.taglibs.list.decorators.PageSizeDecorator; import com.redhat.rhn.manager.BaseManager; +import com.redhat.rhn.manager.SatManager; = import org.apache.commons.lang.BooleanUtils; import org.apache.log4j.Logger; @@ -450,6 +451,16 @@ public class UserManager extends BaseManager { pex.setLocalizedSummary(ls.getMessage("permission.jsp.summary.= deleteuser")); throw pex; } + + // Do not allow deletion of the last Satellite Administrator: + User toDelete =3D UserFactory.lookupById(loggedInUser, targetUid); + if (toDelete.hasRole(RoleFactory.SAT_ADMIN)) { + if (SatManager.getActiveSatAdmins().size() =3D=3D 1) { + log.warn("Cannot delete the last Satellite Administrator"); + throw new DeleteSatAdminException(toDelete); + } + } + CallableMode m =3D ModeFactory.getCallableMode("User_queries", "delete_user"); Map inParams =3D new HashMap(); --===============8252189141125558957==-- From mmccune at fedoraproject.org Thu Aug 20 11:57:54 2015 Content-Type: multipart/mixed; boundary="===============2156328576861152801==" MIME-Version: 1.0 From: Mike McCune To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Tue, 30 Jun 2009 20:17:41 +0000 Message-ID: <20090630201741.A5A391201B9@lists.fedorahosted.org> --===============2156328576861152801== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java = | 22 +++++----- 1 file changed, 12 insertions(+), 10 deletions(-) New commits: commit 5a8020f3d83c09bb9acbd5c65cf66758a499c98e Author: Mike McCune Date: Tue Jun 30 13:12:18 2009 -0700 508790 - fixing tabs diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDa= taTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartD= ataTest.java index 317055d..e3f966a 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 @@ -759,15 +759,17 @@ public class KickstartDataTest extends BaseTestCaseWi= thUser { } = public void testDefaultBridge() throws Exception { - KickstartData k =3D createKickstartWithChannel(user.getOrg()); - k.getKickstartDefaults(). - setVirtualizationType(KickstartVirtualizationType.kvmGuest()); - = - assertTrue(k.getDefaultVirtBridge().equals(Config.get().getDefaultKVM= VirtBridge())); - = - k.getKickstartDefaults(). - setVirtualizationType(KickstartVirtualizationType.xenPV()); - = - assertTrue(k.getDefaultVirtBridge().equals(Config.get().getDefaultXen= VirtBridge())); + KickstartData k =3D createKickstartWithChannel(user.getOrg()); + k.getKickstartDefaults().setVirtualizationType( + KickstartVirtualizationType.kvmGuest()); + + assertTrue(k.getDefaultVirtBridge().equals( + Config.get().getDefaultKVMVirtBridge())); + + k.getKickstartDefaults().setVirtualizationType( + KickstartVirtualizationType.xenPV()); + + assertTrue(k.getDefaultVirtBridge().equals( + Config.get().getDefaultXenVirtBridge())); } } --===============2156328576861152801==-- From mmccune at fedoraproject.org Thu Aug 20 11:57:54 2015 Content-Type: multipart/mixed; boundary="===============5321092882893352705==" MIME-Version: 1.0 From: Mike McCune To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Tue, 30 Jun 2009 20:18:19 +0000 Message-ID: <20090630201819.029061201B9@lists.fedorahosted.org> --===============5321092882893352705== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java = | 22 +++++----- 1 file changed, 12 insertions(+), 10 deletions(-) New commits: commit 82b73745bb76a79dc24b3d060f382a9b0d597346 Author: Mike McCune Date: Tue Jun 30 13:12:18 2009 -0700 508790 - fixing tabs diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDa= taTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartD= ataTest.java index 317055d..e3f966a 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 @@ -759,15 +759,17 @@ public class KickstartDataTest extends BaseTestCaseWi= thUser { } = public void testDefaultBridge() throws Exception { - KickstartData k =3D createKickstartWithChannel(user.getOrg()); - k.getKickstartDefaults(). - setVirtualizationType(KickstartVirtualizationType.kvmGuest()); - = - assertTrue(k.getDefaultVirtBridge().equals(Config.get().getDefaultKVM= VirtBridge())); - = - k.getKickstartDefaults(). - setVirtualizationType(KickstartVirtualizationType.xenPV()); - = - assertTrue(k.getDefaultVirtBridge().equals(Config.get().getDefaultXen= VirtBridge())); + KickstartData k =3D createKickstartWithChannel(user.getOrg()); + k.getKickstartDefaults().setVirtualizationType( + KickstartVirtualizationType.kvmGuest()); + + assertTrue(k.getDefaultVirtBridge().equals( + Config.get().getDefaultKVMVirtBridge())); + + k.getKickstartDefaults().setVirtualizationType( + KickstartVirtualizationType.xenPV()); + + assertTrue(k.getDefaultVirtBridge().equals( + Config.get().getDefaultXenVirtBridge())); } } --===============5321092882893352705==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:54 2015 Content-Type: multipart/mixed; boundary="===============3065874265701225693==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'sha256-support' - backend/satellite_tools backend/server Date: Tue, 30 Jun 2009 20:32:28 +0000 Message-ID: <20090630203228.320C81201B9@lists.fedorahosted.org> --===============3065874265701225693== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/satellite_tools/satsync.py | 8 +++++--- backend/server/importlib/backend.py | 26 +++++++++++++++++++++----- backend/server/importlib/backendOracle.py | 19 +++++++++++++++---- backend/server/importlib/importLib.py | 7 +++++++ backend/server/importlib/packageImport.py | 4 ++++ 5 files changed, 52 insertions(+), 12 deletions(-) New commits: commit 7fce9af210678744fa15e59a2ebcf8d95d327e15 Author: Pradeep Kilambi Date: Tue Jun 30 16:32:17 2009 -0400 prilimary work to get the importer to handle checksum changes. More cha= nges on the way once I have exporter done. diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/s= atsync.py index 4504517..f4d0d37 100644 --- a/backend/satellite_tools/satsync.py +++ b/backend/satellite_tools/satsync.py @@ -830,15 +830,17 @@ Please contact your RHN representative""" % (generati= on, sat_cert.generation)) self._diff_packages() = _query_compare_packages =3D """ - select p.id, p.md5sum, p.path, p.package_size, + select p.id, pc.checksum md5sum, p.path, p.package_size, TO_CHAR(p.last_modified, 'YYYYMMDDHH24MISS') last_modified - from rhnPackage p + from rhnPackage p, + rhnPackageChecksum pc where p.name_id =3D lookup_package_name(:name) and p.evr_id =3D lookup_evr(:epoch, :version, :release) and p.package_arch_id =3D lookup_package_arch(:arch) and (p.org_id =3D :org_id or (p.org_id is null and :org_id is null)) - and p.md5sum =3D: md5sum + and pc.package_id =3D p.id + and pc.checksum =3D: md5sum """ # XXX the "is null" condition will have to change in multiorg satellit= es def _diff_packages(self): diff --git a/backend/server/importlib/backend.py b/backend/server/importlib= /backend.py index 1d39047..55d0390 100644 --- a/backend/server/importlib/backend.py +++ b/backend/server/importlib/backend.py @@ -686,9 +686,9 @@ class Backend: # Insert/update the packages = tbs =3D self.tables['rhnPackage'] - if CFG.ENABLE_NVREA: + #if CFG.ENABLE_NVREA: # Add md5sum as a primarykey if nevra is enabled - tbs.pk.append('md5sum') + # tbs.pk.append('md5sum') = childTables =3D { 'rhnPackageProvides': 'package_id', = @@ -1132,6 +1132,7 @@ class Backend: UPDATE rhnChannel SET channel_product_id =3D :channel_product_id WHERE id =3D :id + AND channel_product_id <> :channel_product_id """) = statement.execute(id =3D channel.id, @@ -1209,7 +1210,20 @@ class Backend: beta =3D channel['channel_product_beta']) = return id - = + = + def processPackageChecksum(self, packages): + sql_checksum =3D self.dbmodule.prepare(""" + insert into rhnPackageChecksum + (package_id, checksum_type_id, checksum) + values (:package_id, :checksum_type_id, :checksum) + """) + for package in packages: + #TODO: replace checksum_type_id once exporter sets it + sql_checksum.execute(package_id =3D package.id, + checksum_type_id=3D 1, + checksum =3D package['md5sum']) + = + = def subscribeToChannels(self, packages, strict=3D0): hash =3D { 'package_id' : [], = @@ -1796,10 +1810,11 @@ class Backend: pe.evr.release release, pa.label arch, p.org_id, - p.md5sum + pc.checksum as md5sum from rhnChannel c, = rhnChannelPackage cp, rhnPackage p, + rhnPackageChecksum pc, rhnPackageName pn, rhnPackageEVR pe, rhnPackageArch pa @@ -1807,6 +1822,7 @@ class Backend: and p.package_arch_id =3D pa.id and cp.channel_id =3D c.id and cp.package_id =3D p.id + and pc.package_id =3D p.id and p.name_id =3D pn.id and p.evr_id =3D pe.id """ @@ -2009,7 +2025,7 @@ def _buildExternalValue(dict, entry, tableObj): def computeDiff(hash1, hash2, diffHash, diffobj, prefix=3DNone): # Compare if the key-values of hash1 are a subset of hash2's difference =3D 0 - ignore_keys =3D ['last_modified'] + ignore_keys =3D ['last_modified', 'channel_product_id'] = for k, v in hash1.items(): if k in ignore_keys: diff --git a/backend/server/importlib/backendOracle.py b/backend/server/imp= ortlib/backendOracle.py index a967676..a032478 100644 --- a/backend/server/importlib/backendOracle.py +++ b/backend/server/importlib/backendOracle.py @@ -79,6 +79,17 @@ class OracleBackend(Backend): pk =3D ['package_id', 'name', 'text', 'time'], attribute =3D 'changelog', ), + + Table('rhnPackageChecksum', + fields =3D { + 'package_id' : DBint(), + 'checksum_type_id' : DBint(), + 'checksum' : DBstring(128) + }, + pk =3D ['package_id', 'checksum_type_id'], + attribute =3D 'checksum', + ), + Table('rhnPackageFile', fields =3D { 'package_id' : DBint(), @@ -91,7 +102,7 @@ class OracleBackend(Backend): 'rdev' : DBint(), 'file_size' : DBint(), 'mtime' : DBdateTime(), - 'md5' : DBstring(32), + 'checksum' : DBstring(32), 'linkto' : DBstring(256), 'flags' : DBint(), 'verifyflags' : DBint(), @@ -102,7 +113,7 @@ class OracleBackend(Backend): severityHash =3D { 'mtime' : 0, 'file_size' : 4, - 'md5' : 4, + 'checksum' : 4, }, ), Table('rhnPackage', @@ -121,7 +132,7 @@ class OracleBackend(Backend): 'build_host' : DBstring(256), = 'build_time' : DBdateTime(), 'source_rpm_id' : DBint(), - 'md5sum' : DBstring(64), = + #'md5sum' : DBstring(64), = 'vendor' : DBstring(64), = 'payload_format': DBstring(32), = 'path' : DBstring(1000), = @@ -135,7 +146,7 @@ class OracleBackend(Backend): nullable =3D ['org_id'], severityHash =3D { 'path' : 1, - 'md5sum' : 2, + #'md5sum' : 2, 'package_size' : 2, 'build_time' : 3, 'build_host' : 3, diff --git a/backend/server/importlib/importLib.py b/backend/server/importl= ib/importLib.py index ab9138c..1900cb6 100644 --- a/backend/server/importlib/importLib.py +++ b/backend/server/importlib/importLib.py @@ -260,6 +260,12 @@ class ChangeLog(Item): def __init__(self): Item.__init__(self, self.attributeTypes) = +class Checksum(Information): + attributeTypes =3D { + 'checksum_type_id' : StringType, + 'checksum' : StringType, + } + = class IncompletePackage(BaseInformation): attributeTypes =3D { @@ -342,6 +348,7 @@ class Package(IncompletePackage): 'obsoletes' : [Dependency], 'changelog' : [ChangeLog], 'channels' : [StringType], + #'checksum' : [Checksum], } def __init__(self): # Inherit from IncompletePackage diff --git a/backend/server/importlib/packageImport.py b/backend/server/imp= ortlib/packageImport.py index 90ba02e..a1fb009 100644 --- a/backend/server/importlib/packageImport.py +++ b/backend/server/importlib/packageImport.py @@ -112,6 +112,8 @@ class ChannelPackageSubscription(GenericPackageImport): = def submit(self): self.backend.lookupPackages(self.batch) + + self.backend.processPackageChecksum(self.batch) try: affected_channels =3D self.backend.subscribeToChannels(self.ba= tch, = strict=3Dself._strict_subscription) @@ -121,6 +123,8 @@ class ChannelPackageSubscription(GenericPackageImport): self.compute_affected_channels(affected_channels) self.backend.update_newest_package_cache(caller=3Dself.caller, = affected_channels=3Dself.affected_channel_packages) + taskomatic.add_to_repodata_queue_for_channel_package_subscription( + self.affected_channels, self.batch, self.caller) self.backend.commit() = def compute_affected_channels(self, affected_channels): --===============3065874265701225693==-- From jlsherrill at fedoraproject.org Thu Aug 20 11:57:54 2015 Content-Type: multipart/mixed; boundary="===============8144559705281547070==" MIME-Version: 1.0 From: Justin Sherrill To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Tue, 30 Jun 2009 21:33:17 +0000 Message-ID: <20090630213317.1709A1201B9@lists.fedorahosted.org> --===============8144559705281547070== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPackagePro= fileSetupAction.java | 95 ++++- java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPackagePro= fileSubmitAction.java | 177 ---------- java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPacka= geProfileActionTest.java | 4 = java/code/src/com/redhat/rhn/frontend/taglibs/list/RadioColumnTag.java = | 19 + java/code/src/com/redhat/rhn/frontend/taglibs/rhn-list.tld = | 5 = java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp = | 51 +- java/code/webapp/WEB-INF/struts-config.xml = | 15 = 7 files changed, 127 insertions(+), 239 deletions(-) New commits: commit b99361d53f3a3ef256cf4f3be9360bdd08d57409 Author: Justin Sherrill Date: Tue Jun 30 17:33:00 2009 -0400 508966 - fixed issue where could not set package profile for a kickstar= t, rewrote to new list tag diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Kicksta= rtPackageProfileSetupAction.java b/java/code/src/com/redhat/rhn/frontend/ac= tion/kickstart/KickstartPackageProfileSetupAction.java index cbaf6f3..bcf5302 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPacka= geProfileSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPacka= geProfileSetupAction.java @@ -14,53 +14,104 @@ */ package com.redhat.rhn.frontend.action.kickstart; = -import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.KickstartFactory; -import com.redhat.rhn.frontend.listview.PageControl; +import com.redhat.rhn.domain.rhnpackage.profile.Profile; import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnAction; +import com.redhat.rhn.frontend.taglibs.list.ListTagHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.Listable; import com.redhat.rhn.manager.profile.ProfileManager; -import com.redhat.rhn.manager.rhnset.RhnSetDecl; = -import java.util.Iterator; -import java.util.LinkedList; +import org.apache.commons.lang.StringUtils; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.HashMap; import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; = /** * KickstartPackageProfilesEditAction - setup for listing the profiles ava= ilable = * for selection. * @version $Rev: 1 $ */ -public class KickstartPackageProfileSetupAction extends BaseKickstartListS= etupAction { +public class KickstartPackageProfileSetupAction extends RhnAction implemen= ts Listable { + + + public static final String UPDATE_METHOD =3D "kickstart.packageprofile= .jsp.submit"; + public static final String CLEAR_METHOD =3D "kickstart.packageprofile.= jsp.clear"; = /** + * * {@inheritDoc} */ - protected Iterator getCurrentItemsIterator(KickstartData ksdata) { - List l =3D new LinkedList(); - if (ksdata.getKickstartDefaults().getProfile() !=3D null) { - l.add(ksdata.getKickstartDefaults().getProfile()); + public ActionForward execute(ActionMapping mapping, + ActionForm formIn, + HttpServletRequest request, + HttpServletResponse response) { + + RequestContext context =3D new RequestContext(request); + + + + KickstartData ks =3D KickstartFactory.lookupKickstartDataByIdAndOr= g( + context.getCurrentUser().getOrg(), context.getRequiredPara= m("ksid")); + + + ListHelper helper =3D new ListHelper(this, request); + helper.execute(); + + if (context.wasDispatched("kickstart.packageprofile.jsp.submit")) { + String selected =3D ListTagHelper.getRadioSelection(helper.get= ListName(), + request); + if (StringUtils.isNumeric(selected)) { + Profile prof =3D ProfileManager.lookupByIdAndOrg(new Long(= selected), + context.getCurrentUser().getOrg()); + ks.getKickstartDefaults().setProfile(prof); + + Map params =3D new HashMap(); + params.put("ksid", ks.getId()); + getStrutsDelegate().saveMessage(UPDATE_METHOD, request); + return getStrutsDelegate().forwardParams(mapping.findForwa= rd("success"), + params); + } } - return l.iterator(); - } + else if (context.wasDispatched("kickstart.packageprofile.jsp.clear= ")) { + ks.getKickstartDefaults().setProfile(null); + KickstartFactory.saveKickstartData(ks); + request.setAttribute("ksid", ks.getId()); + Map params =3D new HashMap(); + params.put("ksid", ks.getId()); + getStrutsDelegate().saveMessage(CLEAR_METHOD, request); + return getStrutsDelegate().forwardParams(mapping.findForwa= rd("success"), + params); = - /** - * {@inheritDoc} - */ - public RhnSetDecl getSetDecl() { - return RhnSetDecl.PACKAGE_PROFILES; + } + if (ks.getKickstartDefaults().getProfile() !=3D null) { + ListTagHelper.selectRadioValue(helper.getListName(), + ks.getKickstartDefaults().getProfile().getId().toString(),= request); + } + return mapping.findForward("default"); } = /** + * * {@inheritDoc} */ - protected DataResult getDataResult(RequestContext rctx, PageControl pc= ) { + public List getResult(RequestContext rctx) { KickstartData ksdata =3D KickstartFactory - .lookupKickstartDataByIdAndOrg(rctx.getCurrentUser().getOrg(), - rctx.getRequiredParam(RequestContext.KICKSTART_ID)); + .lookupKickstartDataByIdAndOrg(rctx.getCurrentUser().getOrg(), + rctx.getRequiredParam(RequestContext.KICKSTART_ID)); = return ProfileManager.compatibleWithChannel( - ksdata.getKickstartDefaults().getKstree().getChannel(), - rctx.getCurrentUser().getOrg(), pc); + ksdata.getKickstartDefaults().getKstree().getChannel(), + rctx.getCurrentUser().getOrg(), null); } + } diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Kicksta= rtPackageProfileSubmitAction.java b/java/code/src/com/redhat/rhn/frontend/a= ction/kickstart/KickstartPackageProfileSubmitAction.java deleted file mode 100644 index df9dc12..0000000 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPacka= geProfileSubmitAction.java +++ /dev/null @@ -1,177 +0,0 @@ -/** - * Copyright (c) 2009 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.kickstart; - -import com.redhat.rhn.common.db.datasource.DataResult; -import com.redhat.rhn.domain.kickstart.KickstartData; -import com.redhat.rhn.domain.kickstart.KickstartFactory; -import com.redhat.rhn.domain.rhnpackage.profile.Profile; -import com.redhat.rhn.domain.rhnpackage.profile.ProfileFactory; -import com.redhat.rhn.domain.rhnset.RhnSet; -import com.redhat.rhn.domain.rhnset.RhnSetElement; -import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.manager.kickstart.KickstartPackageProfileCommand; -import com.redhat.rhn.manager.profile.ProfileManager; -import com.redhat.rhn.manager.rhnset.RhnSetDecl; -import com.redhat.rhn.manager.rhnset.RhnSetManager; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * KickstartPackageProfileSubmitAction - * @version $Rev$ - */ -public class KickstartPackageProfileSubmitAction extends - BaseKickstartListSubmitAction { - - public static final String UPDATE_METHOD =3D "kickstart.packageprofile= .jsp.submit"; - public static final String CLEAR_METHOD =3D "kickstart.packageprofile.= jsp.clear"; - = - /** - * {@inheritDoc} - */ - protected void operateOnRemovedElements(List elements, - HttpServletRequest request) { - = - if (elements.size() > 0) { - RequestContext rctx =3D new RequestContext(request); - KickstartPackageProfileCommand cmd =3D new = - KickstartPackageProfileCommand( - rctx.getRequiredParam(RequestContext.KICKSTART_ID), - rctx.getCurrentUser()); - cmd.setProfile(null); - cmd.store(); - } - } - - /** - * {@inheritDoc} - */ - protected void operateOnAddedElements(List elements, - HttpServletRequest request) { - = - RequestContext rctx =3D new RequestContext(request); - KickstartPackageProfileCommand cmd =3D new = - KickstartPackageProfileCommand( - rctx.getRequiredParam(RequestContext.KICKSTART_ID), - rctx.getCurrentUser()); - Long pid =3D null; - if (elements.size() > 0) { - pid =3D ((RhnSetElement) elements.get(0)).getElement(); - Profile p =3D ProfileFactory.lookupByIdAndOrg(pid, = - rctx.getCurrentUser().getOrg()); - cmd.setProfile(p); - cmd.store(); - } - = - } - - /** - * {@inheritDoc} - */ - public RhnSetDecl getSetDecl() { - return RhnSetDecl.PACKAGE_PROFILES; - } - - /** - * {@inheritDoc} - */ - protected DataResult getDataResult(User user, = - ActionForm formIn, = - HttpServletRequest request) { - = - RequestContext rctx =3D new RequestContext(request); - KickstartData ksdata =3D KickstartFactory - .lookupKickstartDataByIdAndOrg(rctx.getCurrentUser().getOrg(), - rctx.getRequiredParam(RequestContext.KICKSTART_ID)); - = - DataResult dr =3D ProfileManager.compatibleWithChannel( - ksdata.getKickstartDefaults().getKstree().getChannel(), - rctx.getCurrentUser().getOrg(), null); - return dr; - } - - /** - * {@inheritDoc} - */ - protected void processMethodKeys(Map map) { - map.put(UPDATE_METHOD, "operateOnDiff"); - map.put(CLEAR_METHOD, "clearSelection"); - } - - protected Iterator getCurrentItemsIterator(RequestContext ctx) { - KickstartData ksdata =3D KickstartFactory - .lookupKickstartDataByIdAndOrg(ctx.getCurrentUser().getOrg(), - ctx.getRequiredParam(RequestContext.KICKSTART_ID)); - = - List l =3D new LinkedList(); - if (ksdata.getKickstartDefaults().getProfile() !=3D null) { - l.add(ksdata.getKickstartDefaults().getProfile()); - } - return l.iterator(); - = - } - = - /** - * This is executed if the clear button is pushed. Clears all associat= ed package = - * profiles from from the selected kickstart - * = - * @param mapping The ActionMapping used to select this instance - * @param formIn The optional ActionForm bean for this request (if any) - * @param request The HTTP request we are processing - * @param response The HTTP response we are creating - * @return Describes where and how control should be forwarded. - */ - public ActionForward clearSelection(ActionMapping mapping, - ActionForm formIn, - HttpServletRequest request, - HttpServletResponse response) { - = - RequestContext rctx =3D new RequestContext(request); - KickstartPackageProfileCommand cmd =3D new = - KickstartPackageProfileCommand( - rctx.getRequiredParam(RequestContext.KICKSTART_ID), - rctx.getCurrentUser()); - cmd.setProfile(null); - cmd.store(); - = - ArrayList added =3D new ArrayList(); - ArrayList removed =3D new ArrayList(); - - RhnSet currentSet =3D updateSet(request); - for (Iterator it =3D currentSet.getElements().iterator(); it.hasNe= xt();) { - removed.add(it.next()); - } - currentSet.clear(); - RhnSetManager.store(currentSet); - = - generateUserMessage(added, removed, request); - Map params =3D makeParamMap(formIn, request); - return getStrutsDelegate().forwardParams(mapping.findForward("defa= ult"), params); - } - -} diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/Ki= ckstartPackageProfileActionTest.java b/java/code/src/com/redhat/rhn/fronten= d/action/kickstart/test/KickstartPackageProfileActionTest.java index bd2bd4f..2d8d53a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/Kickstart= PackageProfileActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/Kickstart= PackageProfileActionTest.java @@ -19,7 +19,7 @@ import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.domain.kickstart.test.KickstartDataTest; import com.redhat.rhn.domain.rhnpackage.profile.Profile; import com.redhat.rhn.domain.role.RoleFactory; -import com.redhat.rhn.frontend.action.kickstart.KickstartPackageProfileSub= mitAction; +import com.redhat.rhn.frontend.action.kickstart.KickstartPackageProfileSet= upAction; import com.redhat.rhn.frontend.dto.ProfileDto; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.profile.test.ProfileManagerTest; @@ -61,7 +61,7 @@ public class KickstartPackageProfileActionTest extends Rh= nMockStrutsTestCase { user.addRole(RoleFactory.ORG_ADMIN); Profile p =3D ProfileManagerTest.createProfileWithServer(user); addSelectedItem(p.getId()); - addDispatchCall(KickstartPackageProfileSubmitAction.UPDATE_METHOD); + addDispatchCall(KickstartPackageProfileSetupAction.UPDATE_METHOD); setRequestPathInfo("/kickstart/KickstartPackageProfileEditSubmit"); actionPerform(); // Gotta make sure we can update the profile to the same entry twi= ce diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/RadioColumn= Tag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/RadioColumnTa= g.java index 8f63ec0..64a3f51 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/RadioColumnTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/RadioColumnTag.java @@ -45,6 +45,7 @@ public class RadioColumnTag extends TagSupport { private String valueExpr; private String headerStyle; private String headerKey; + private boolean useDefault =3D true; = /** * Sets the column width @@ -135,7 +136,7 @@ public class RadioColumnTag extends TagSupport { radio.setAttribute("type", "radio"); radio.setAttribute("name", getRadioName(listName)); radio.setAttribute("value", value); - if (StringUtils.isBlank(getRadioValue())) { + if (StringUtils.isBlank(getRadioValue()) && useDefault) { pageContext.getRequest().setAttribute(getRadioName(listName), = value); } if (isSelected()) { @@ -229,4 +230,20 @@ public class RadioColumnTag extends TagSupport { width =3D "20px"; headerStyle =3D null; } + + + /** + * @return Returns the setDefault. + */ + public boolean isUseDefault() { + return useDefault; + } + + + /** + * @param setDefaultIn The setDefault to set. + */ + public void setUseDefault(boolean setDefaultIn) { + this.useDefault =3D setDefaultIn; + } } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-list.tld b/j= ava/code/src/com/redhat/rhn/frontend/taglibs/rhn-list.tld index 95e8598..2450ad1 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-list.tld +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-list.tld @@ -242,6 +242,11 @@ true true + + useDefault + false + true + = csv diff --git a/java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp b= /java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp index 42fc4fb..f9652fe 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp @@ -2,6 +2,8 @@ <%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> <%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> <%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> +<%@ taglib uri=3D"http://rhn.redhat.com/tags/list" prefix=3D"rl" %> + = @@ -19,34 +21,31 @@

                                      = - - - - = - - + + + + = - + ${current.name} - - = - -

                                      = - -

                                      -
                                      -" /> -
                                      - - - = - - - - -
                                      - - + + +

                                      + +

                                      +
                                      + " /> +
                                      + + + + + + + +
                                      + + = diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/= WEB-INF/struts-config.xml index 5bd6f16..6baa745 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -5160,17 +5160,10 @@ scope=3D"request" input=3D"/WEB-INF/pages/kickstart/packageprofiles.jsp" type=3D"com.redhat.rhn.frontend.action.kickstart.KickstartPackageP= rofileSetupAction"> - - - - - + + = To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Tue, 30 Jun 2009 21:33:56 +0000 Message-ID: <20090630213356.9BD5E1201B9@lists.fedorahosted.org> --===============8355113434125296200== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPackagePro= fileSetupAction.java | 95 ++++- java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPackagePro= fileSubmitAction.java | 177 ---------- java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPacka= geProfileActionTest.java | 4 = java/code/src/com/redhat/rhn/frontend/taglibs/list/RadioColumnTag.java = | 19 + java/code/src/com/redhat/rhn/frontend/taglibs/rhn-list.tld = | 5 = java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp = | 51 +- java/code/webapp/WEB-INF/struts-config.xml = | 15 = 7 files changed, 127 insertions(+), 239 deletions(-) New commits: commit 5bf6274e4a85e6f024dea18c6ddef629f5acdc7e Author: Justin Sherrill Date: Tue Jun 30 17:33:00 2009 -0400 508966 - fixed issue where could not set package profile for a kickstar= t, rewrote to new list tag diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Kicksta= rtPackageProfileSetupAction.java b/java/code/src/com/redhat/rhn/frontend/ac= tion/kickstart/KickstartPackageProfileSetupAction.java index cbaf6f3..bcf5302 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPacka= geProfileSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPacka= geProfileSetupAction.java @@ -14,53 +14,104 @@ */ package com.redhat.rhn.frontend.action.kickstart; = -import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.KickstartFactory; -import com.redhat.rhn.frontend.listview.PageControl; +import com.redhat.rhn.domain.rhnpackage.profile.Profile; import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnAction; +import com.redhat.rhn.frontend.taglibs.list.ListTagHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.Listable; import com.redhat.rhn.manager.profile.ProfileManager; -import com.redhat.rhn.manager.rhnset.RhnSetDecl; = -import java.util.Iterator; -import java.util.LinkedList; +import org.apache.commons.lang.StringUtils; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.HashMap; import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; = /** * KickstartPackageProfilesEditAction - setup for listing the profiles ava= ilable = * for selection. * @version $Rev: 1 $ */ -public class KickstartPackageProfileSetupAction extends BaseKickstartListS= etupAction { +public class KickstartPackageProfileSetupAction extends RhnAction implemen= ts Listable { + + + public static final String UPDATE_METHOD =3D "kickstart.packageprofile= .jsp.submit"; + public static final String CLEAR_METHOD =3D "kickstart.packageprofile.= jsp.clear"; = /** + * * {@inheritDoc} */ - protected Iterator getCurrentItemsIterator(KickstartData ksdata) { - List l =3D new LinkedList(); - if (ksdata.getKickstartDefaults().getProfile() !=3D null) { - l.add(ksdata.getKickstartDefaults().getProfile()); + public ActionForward execute(ActionMapping mapping, + ActionForm formIn, + HttpServletRequest request, + HttpServletResponse response) { + + RequestContext context =3D new RequestContext(request); + + + + KickstartData ks =3D KickstartFactory.lookupKickstartDataByIdAndOr= g( + context.getCurrentUser().getOrg(), context.getRequiredPara= m("ksid")); + + + ListHelper helper =3D new ListHelper(this, request); + helper.execute(); + + if (context.wasDispatched("kickstart.packageprofile.jsp.submit")) { + String selected =3D ListTagHelper.getRadioSelection(helper.get= ListName(), + request); + if (StringUtils.isNumeric(selected)) { + Profile prof =3D ProfileManager.lookupByIdAndOrg(new Long(= selected), + context.getCurrentUser().getOrg()); + ks.getKickstartDefaults().setProfile(prof); + + Map params =3D new HashMap(); + params.put("ksid", ks.getId()); + getStrutsDelegate().saveMessage(UPDATE_METHOD, request); + return getStrutsDelegate().forwardParams(mapping.findForwa= rd("success"), + params); + } } - return l.iterator(); - } + else if (context.wasDispatched("kickstart.packageprofile.jsp.clear= ")) { + ks.getKickstartDefaults().setProfile(null); + KickstartFactory.saveKickstartData(ks); + request.setAttribute("ksid", ks.getId()); + Map params =3D new HashMap(); + params.put("ksid", ks.getId()); + getStrutsDelegate().saveMessage(CLEAR_METHOD, request); + return getStrutsDelegate().forwardParams(mapping.findForwa= rd("success"), + params); = - /** - * {@inheritDoc} - */ - public RhnSetDecl getSetDecl() { - return RhnSetDecl.PACKAGE_PROFILES; + } + if (ks.getKickstartDefaults().getProfile() !=3D null) { + ListTagHelper.selectRadioValue(helper.getListName(), + ks.getKickstartDefaults().getProfile().getId().toString(),= request); + } + return mapping.findForward("default"); } = /** + * * {@inheritDoc} */ - protected DataResult getDataResult(RequestContext rctx, PageControl pc= ) { + public List getResult(RequestContext rctx) { KickstartData ksdata =3D KickstartFactory - .lookupKickstartDataByIdAndOrg(rctx.getCurrentUser().getOrg(), - rctx.getRequiredParam(RequestContext.KICKSTART_ID)); + .lookupKickstartDataByIdAndOrg(rctx.getCurrentUser().getOrg(), + rctx.getRequiredParam(RequestContext.KICKSTART_ID)); = return ProfileManager.compatibleWithChannel( - ksdata.getKickstartDefaults().getKstree().getChannel(), - rctx.getCurrentUser().getOrg(), pc); + ksdata.getKickstartDefaults().getKstree().getChannel(), + rctx.getCurrentUser().getOrg(), null); } + } diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Kicksta= rtPackageProfileSubmitAction.java b/java/code/src/com/redhat/rhn/frontend/a= ction/kickstart/KickstartPackageProfileSubmitAction.java deleted file mode 100644 index df9dc12..0000000 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPacka= geProfileSubmitAction.java +++ /dev/null @@ -1,177 +0,0 @@ -/** - * Copyright (c) 2009 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.kickstart; - -import com.redhat.rhn.common.db.datasource.DataResult; -import com.redhat.rhn.domain.kickstart.KickstartData; -import com.redhat.rhn.domain.kickstart.KickstartFactory; -import com.redhat.rhn.domain.rhnpackage.profile.Profile; -import com.redhat.rhn.domain.rhnpackage.profile.ProfileFactory; -import com.redhat.rhn.domain.rhnset.RhnSet; -import com.redhat.rhn.domain.rhnset.RhnSetElement; -import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.manager.kickstart.KickstartPackageProfileCommand; -import com.redhat.rhn.manager.profile.ProfileManager; -import com.redhat.rhn.manager.rhnset.RhnSetDecl; -import com.redhat.rhn.manager.rhnset.RhnSetManager; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * KickstartPackageProfileSubmitAction - * @version $Rev$ - */ -public class KickstartPackageProfileSubmitAction extends - BaseKickstartListSubmitAction { - - public static final String UPDATE_METHOD =3D "kickstart.packageprofile= .jsp.submit"; - public static final String CLEAR_METHOD =3D "kickstart.packageprofile.= jsp.clear"; - = - /** - * {@inheritDoc} - */ - protected void operateOnRemovedElements(List elements, - HttpServletRequest request) { - = - if (elements.size() > 0) { - RequestContext rctx =3D new RequestContext(request); - KickstartPackageProfileCommand cmd =3D new = - KickstartPackageProfileCommand( - rctx.getRequiredParam(RequestContext.KICKSTART_ID), - rctx.getCurrentUser()); - cmd.setProfile(null); - cmd.store(); - } - } - - /** - * {@inheritDoc} - */ - protected void operateOnAddedElements(List elements, - HttpServletRequest request) { - = - RequestContext rctx =3D new RequestContext(request); - KickstartPackageProfileCommand cmd =3D new = - KickstartPackageProfileCommand( - rctx.getRequiredParam(RequestContext.KICKSTART_ID), - rctx.getCurrentUser()); - Long pid =3D null; - if (elements.size() > 0) { - pid =3D ((RhnSetElement) elements.get(0)).getElement(); - Profile p =3D ProfileFactory.lookupByIdAndOrg(pid, = - rctx.getCurrentUser().getOrg()); - cmd.setProfile(p); - cmd.store(); - } - = - } - - /** - * {@inheritDoc} - */ - public RhnSetDecl getSetDecl() { - return RhnSetDecl.PACKAGE_PROFILES; - } - - /** - * {@inheritDoc} - */ - protected DataResult getDataResult(User user, = - ActionForm formIn, = - HttpServletRequest request) { - = - RequestContext rctx =3D new RequestContext(request); - KickstartData ksdata =3D KickstartFactory - .lookupKickstartDataByIdAndOrg(rctx.getCurrentUser().getOrg(), - rctx.getRequiredParam(RequestContext.KICKSTART_ID)); - = - DataResult dr =3D ProfileManager.compatibleWithChannel( - ksdata.getKickstartDefaults().getKstree().getChannel(), - rctx.getCurrentUser().getOrg(), null); - return dr; - } - - /** - * {@inheritDoc} - */ - protected void processMethodKeys(Map map) { - map.put(UPDATE_METHOD, "operateOnDiff"); - map.put(CLEAR_METHOD, "clearSelection"); - } - - protected Iterator getCurrentItemsIterator(RequestContext ctx) { - KickstartData ksdata =3D KickstartFactory - .lookupKickstartDataByIdAndOrg(ctx.getCurrentUser().getOrg(), - ctx.getRequiredParam(RequestContext.KICKSTART_ID)); - = - List l =3D new LinkedList(); - if (ksdata.getKickstartDefaults().getProfile() !=3D null) { - l.add(ksdata.getKickstartDefaults().getProfile()); - } - return l.iterator(); - = - } - = - /** - * This is executed if the clear button is pushed. Clears all associat= ed package = - * profiles from from the selected kickstart - * = - * @param mapping The ActionMapping used to select this instance - * @param formIn The optional ActionForm bean for this request (if any) - * @param request The HTTP request we are processing - * @param response The HTTP response we are creating - * @return Describes where and how control should be forwarded. - */ - public ActionForward clearSelection(ActionMapping mapping, - ActionForm formIn, - HttpServletRequest request, - HttpServletResponse response) { - = - RequestContext rctx =3D new RequestContext(request); - KickstartPackageProfileCommand cmd =3D new = - KickstartPackageProfileCommand( - rctx.getRequiredParam(RequestContext.KICKSTART_ID), - rctx.getCurrentUser()); - cmd.setProfile(null); - cmd.store(); - = - ArrayList added =3D new ArrayList(); - ArrayList removed =3D new ArrayList(); - - RhnSet currentSet =3D updateSet(request); - for (Iterator it =3D currentSet.getElements().iterator(); it.hasNe= xt();) { - removed.add(it.next()); - } - currentSet.clear(); - RhnSetManager.store(currentSet); - = - generateUserMessage(added, removed, request); - Map params =3D makeParamMap(formIn, request); - return getStrutsDelegate().forwardParams(mapping.findForward("defa= ult"), params); - } - -} diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/Ki= ckstartPackageProfileActionTest.java b/java/code/src/com/redhat/rhn/fronten= d/action/kickstart/test/KickstartPackageProfileActionTest.java index bd2bd4f..2d8d53a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/Kickstart= PackageProfileActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/Kickstart= PackageProfileActionTest.java @@ -19,7 +19,7 @@ import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.domain.kickstart.test.KickstartDataTest; import com.redhat.rhn.domain.rhnpackage.profile.Profile; import com.redhat.rhn.domain.role.RoleFactory; -import com.redhat.rhn.frontend.action.kickstart.KickstartPackageProfileSub= mitAction; +import com.redhat.rhn.frontend.action.kickstart.KickstartPackageProfileSet= upAction; import com.redhat.rhn.frontend.dto.ProfileDto; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.profile.test.ProfileManagerTest; @@ -61,7 +61,7 @@ public class KickstartPackageProfileActionTest extends Rh= nMockStrutsTestCase { user.addRole(RoleFactory.ORG_ADMIN); Profile p =3D ProfileManagerTest.createProfileWithServer(user); addSelectedItem(p.getId()); - addDispatchCall(KickstartPackageProfileSubmitAction.UPDATE_METHOD); + addDispatchCall(KickstartPackageProfileSetupAction.UPDATE_METHOD); setRequestPathInfo("/kickstart/KickstartPackageProfileEditSubmit"); actionPerform(); // Gotta make sure we can update the profile to the same entry twi= ce diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/RadioColumn= Tag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/RadioColumnTa= g.java index 8f63ec0..64a3f51 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/RadioColumnTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/RadioColumnTag.java @@ -45,6 +45,7 @@ public class RadioColumnTag extends TagSupport { private String valueExpr; private String headerStyle; private String headerKey; + private boolean useDefault =3D true; = /** * Sets the column width @@ -135,7 +136,7 @@ public class RadioColumnTag extends TagSupport { radio.setAttribute("type", "radio"); radio.setAttribute("name", getRadioName(listName)); radio.setAttribute("value", value); - if (StringUtils.isBlank(getRadioValue())) { + if (StringUtils.isBlank(getRadioValue()) && useDefault) { pageContext.getRequest().setAttribute(getRadioName(listName), = value); } if (isSelected()) { @@ -229,4 +230,20 @@ public class RadioColumnTag extends TagSupport { width =3D "20px"; headerStyle =3D null; } + + + /** + * @return Returns the setDefault. + */ + public boolean isUseDefault() { + return useDefault; + } + + + /** + * @param setDefaultIn The setDefault to set. + */ + public void setUseDefault(boolean setDefaultIn) { + this.useDefault =3D setDefaultIn; + } } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-list.tld b/j= ava/code/src/com/redhat/rhn/frontend/taglibs/rhn-list.tld index 95e8598..2450ad1 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-list.tld +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-list.tld @@ -242,6 +242,11 @@ true true + + useDefault + false + true +
                                      = csv diff --git a/java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp b= /java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp index a63ee9c..ec64d49 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp @@ -2,6 +2,8 @@ <%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> <%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> <%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> +<%@ taglib uri=3D"http://rhn.redhat.com/tags/list" prefix=3D"rl" %> + = @@ -25,34 +27,31 @@

                                      = -
                                      - - - = - - + + + + = - + ${current.name} - - = - -

                                      = - -

                                      -
                                      -" /> -
                                      - - - = - - - - -
                                      - - + + +

                                      + +

                                      +
                                      + " /> +
                                      + + + + + + + +
                                      + + = diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/= WEB-INF/struts-config.xml index 5bd6f16..6baa745 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -5160,17 +5160,10 @@ scope=3D"request" input=3D"/WEB-INF/pages/kickstart/packageprofiles.jsp" type=3D"com.redhat.rhn.frontend.action.kickstart.KickstartPackageP= rofileSetupAction"> - - - - - + + = To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'ssm-kickstart' Date: Tue, 30 Jun 2009 22:17:51 +0000 Message-ID: <20090630221751.5BAFD1201B9@lists.fedorahosted.org> --===============5772762421851230183== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable New branch 'ssm-kickstart' available with the following commits: --===============5772762421851230183==-- From partha at fedoraproject.org Thu Aug 20 11:57:54 2015 Content-Type: multipart/mixed; boundary="===============3420209691602301638==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'ssm-kickstart' - java/code Date: Tue, 30 Jun 2009 22:22:48 +0000 Message-ID: <20090630222248.3BD1C1201B9@lists.fedorahosted.org> --===============3420209691602301638== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml = | 18 ++ java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAc= tion.java | 26 +++ java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKickstartabl= eSystemsAction.java | 68 ++++++++++ java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java = | 24 +++ java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay= .jspf | 9 - java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp = | 23 +++ java/code/webapp/WEB-INF/struts-config.xml = | 22 +++ 7 files changed, 186 insertions(+), 4 deletions(-) New commits: commit ec47b3f86f2b9bfded604eab6a5b96e70e2ad7b3 Author: Partha Aji Date: Tue Jun 30 18:22:20 2009 -0400 508980 - Initial cut of the SSM kickstart work diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_q= ueries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_q= ueries.xml index 3b335d3..2ce6af8 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.= xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.= xml @@ -36,6 +36,24 @@ ORDER BY UPPER(NVL(S.name, '(none)')), S.id = + + + +SELECT S.id, + S.name = + FROM rhnServer S + inner join rhnSet ST on S.id =3D ST.element + inner join rhnUserServerPerms USP on USP.server_id =3D S.id + WHERE USP.user_id =3D :user_id + AND ST.user_id =3D :user_id + AND ST.label =3D 'system_list' + AND EXISTS(SELECT 1 FROM rhnServerFeaturesView SFV WHERE SFV.server_id = =3D ST.element AND SFV.label =3D 'ftr_kickstart') + AND USP.server_id =3D S.id +ORDER BY UPPER(NVL(S.NAME, '(none)')), S.ID + + + + = diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/Ssm= KSScheduleAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickst= art/ssm/SsmKSScheduleAction.java new file mode 100644 index 0000000..46937df --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSSched= uleAction.java @@ -0,0 +1,26 @@ +/** + * Copyright (c) 2009 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.kickstart.ssm; + +import com.redhat.rhn.frontend.struts.RhnAction; + + +/** + * ScheduleKickstartAction + * @version $Rev$ + */ +public class SsmKSScheduleAction extends RhnAction { + = +} diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/Ssm= KickstartableSystemsAction.java b/java/code/src/com/redhat/rhn/frontend/act= ion/kickstart/ssm/SsmKickstartableSystemsAction.java new file mode 100644 index 0000000..6c6d9d0 --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKicksta= rtableSystemsAction.java @@ -0,0 +1,68 @@ +/** + * Copyright (c) 2009 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.kickstart.ssm; + +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.RhnHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.Listable; +import com.redhat.rhn.manager.kickstart.KickstartManager; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + + +/** + * SsmKickstartableSystemsAction + * @version $Rev$ + */ +public class SsmKickstartableSystemsAction extends RhnAction implements Li= stable { + + /** + * ${@inheritDoc} + */ + public ActionForward execute(ActionMapping mapping, ActionForm form, = + HttpServletRequest request, HttpServletResponse response) thro= ws Exception { + ListHelper helper =3D new ListHelper(this, request); + helper.setDataSetName(getDataSetName()); + helper.execute(); + return mapping.findForward(RhnHelper.DEFAULT_FORWARD); + } + + /** + * ${@inheritDoc} + */ + public String getDataSetName() { + return "pageList"; + } + + + /** + * ${@inheritDoc} + */ + public List getResult(RequestContext context) { + User user =3D context.getLoggedInUser(); + return KickstartManager.getInstance().kickstartableSystemsInSsm(us= er); + } + = +} diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManage= r.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.ja= va index 255769c..8a0f0da 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java @@ -15,12 +15,21 @@ package com.redhat.rhn.manager.kickstart; = import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.common.db.datasource.ModeFactory; +import com.redhat.rhn.common.db.datasource.SelectMode; import com.redhat.rhn.common.util.download.DownloadException; import com.redhat.rhn.common.util.download.DownloadUtils; import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.domain.kickstart.KickstartData; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.dto.SystemOverview; import com.redhat.rhn.manager.BaseManager; = +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + /** * = * KickstartManager @@ -81,5 +90,18 @@ public class KickstartManager extends BaseManager { ValidatorException.raiseException("kickstart.jsp.error.templat= e_generation", KickstartUrlHelper.getFileDowloadP= ageUrl(ksdata)); } - } = + } = + = + /** + * returns a list of systems in SSM + * that are kickstartable + * @param user the user for access info + * @return the list of kickstartable systems = + */ + public DataResult kickstartableSystemsInSsm(User user)= { + SelectMode m =3D ModeFactory.getMode("System_queries", "ssm_kickst= artable"); + Map params =3D new HashMap(); + params.put("user_id", user.getId()); + return makeDataResult(params, Collections.EMPTY_MAP, null, m); + } } diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system= _listdisplay.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems= /system_listdisplay.jspf index 87fc451..23c68e4 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdi= splay.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdi= splay.jspf @@ -50,6 +50,7 @@ <%@ include file=3D"monitoring_status_systems.jspf" %> = + = - + + = - = + = + - = + = diff --git a/java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesyst= ems.jsp b/java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems= .jsp new file mode 100644 index 0000000..9aa54a2 --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp @@ -0,0 +1,23 @@ +<%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> +<%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> +<%@ taglib uri=3D"http://rhn.redhat.com/tags/list" prefix=3D"rl" %> + + + + + + + <%@ include file=3D"/WEB-INF/pages/common/fragments/ssm/header.jsp= f" %> + + + + + + + + <%@ include file=3D"/WEB-INF/pages/common/fragments/systems/system_lis= tdisplay.jspf" %> + + + \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp b/ja= va/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp new file mode 100644 index 0000000..e69de29 diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/= WEB-INF/struts-config.xml index 6baa745..cec2db1 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -4603,6 +4603,28 @@ = + + + + + + + + + + + = To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Tue, 30 Jun 2009 23:34:29 +0000 Message-ID: <20090630233429.624651201B9@lists.fedorahosted.org> --===============8396231618773613671== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/conf/Config.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 135c27d0c96bcbcc72b1a9a071a1ba8f1c69a248 Author: Mike McCune Date: Tue Jun 30 16:24:34 2009 -0700 508790 - switch to /var/lib/libvirt/images for our default path = Instead of having /var/lib/xen which is xen specific we now create all our guests in /var/lib/libvirt/images which is always there and created/owned by libvirt. diff --git a/java/code/src/com/redhat/rhn/common/conf/Config.java b/java/co= de/src/com/redhat/rhn/common/conf/Config.java index 5106870..04b5947 100644 --- a/java/code/src/com/redhat/rhn/common/conf/Config.java +++ b/java/code/src/com/redhat/rhn/common/conf/Config.java @@ -175,7 +175,7 @@ public class Config { private static final String DEFAULT_COBBLER_SNIPPET_DIR =3D "/var/lib/= cobbler/snippets"; = public static final String VIRT_PATH_DIR =3D "kickstart.virt_storage_p= ath"; - private static final String DEFAULT_VIRT_PATH =3D "/var/lib/xen"; + private static final String DEFAULT_VIRT_PATH =3D "/var/lib/libvirt/im= ages"; public static final String VIRT_BRIDGE =3D "kickstart.virt_bridge"; public static final String VIRT_MEM =3D "kickstart.virt_mem_size_mb"; public static final String VIRT_CPU =3D "kickstart.virt_cpus"; @@ -786,7 +786,7 @@ public class Config { public File getVirtPath() { return new File(getString(VIRT_PATH_DIR, DEFAULT_VIRT_PATH)); } - = + /** * Returns the default value for the xen virt bridge * @return the value for virt bridge. --===============8396231618773613671==-- From mmccune at fedoraproject.org Thu Aug 20 11:57:54 2015 Content-Type: multipart/mixed; boundary="===============1578596972667644155==" MIME-Version: 1.0 From: Mike McCune To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Tue, 30 Jun 2009 23:35:02 +0000 Message-ID: <20090630233502.C574B1201B9@lists.fedorahosted.org> --===============1578596972667644155== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/common/conf/Config.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 85f9811cc5b03f188e9be3b7e950cfbf445b8908 Author: Mike McCune Date: Tue Jun 30 16:24:34 2009 -0700 508790 - switch to /var/lib/libvirt/images for our default path = Instead of having /var/lib/xen which is xen specific we now create all our guests in /var/lib/libvirt/images which is always there and created/owned by libvirt. diff --git a/java/code/src/com/redhat/rhn/common/conf/Config.java b/java/co= de/src/com/redhat/rhn/common/conf/Config.java index 5106870..04b5947 100644 --- a/java/code/src/com/redhat/rhn/common/conf/Config.java +++ b/java/code/src/com/redhat/rhn/common/conf/Config.java @@ -175,7 +175,7 @@ public class Config { private static final String DEFAULT_COBBLER_SNIPPET_DIR =3D "/var/lib/= cobbler/snippets"; = public static final String VIRT_PATH_DIR =3D "kickstart.virt_storage_p= ath"; - private static final String DEFAULT_VIRT_PATH =3D "/var/lib/xen"; + private static final String DEFAULT_VIRT_PATH =3D "/var/lib/libvirt/im= ages"; public static final String VIRT_BRIDGE =3D "kickstart.virt_bridge"; public static final String VIRT_MEM =3D "kickstart.virt_mem_size_mb"; public static final String VIRT_CPU =3D "kickstart.virt_cpus"; @@ -786,7 +786,7 @@ public class Config { public File getVirtPath() { return new File(getString(VIRT_PATH_DIR, DEFAULT_VIRT_PATH)); } - = + /** * Returns the default value for the xen virt bridge * @return the value for virt bridge. --===============1578596972667644155==--
                                      --===============7392256075912496828==-- From partha at fedoraproject.org Thu Aug 20 11:57:52 2015 Content-Type: multipart/mixed; boundary="===============6451070999395996120==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Tue, 30 Jun 2009 02:37:18 +0000 Message-ID: <20090630023718.387A51201FE@lists.fedorahosted.org> --===============6451070999395996120== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedul= e-options.jspf | 34 ++++++++++ java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp = | 20 ----- java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/fi= rst.jsp | 17 ----- 3 files changed, 38 insertions(+), 33 deletions(-) New commits: commit 8ccdc822e745b008a7c16bd04c16f8cfcbc7b47c Author: Partha Aji Date: Mon Jun 29 22:28:59 2009 -0400 508816 - Corrected the behaviour of the radio button in schedule ks page diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/sche= dule/schedule-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragment= s/kickstart/schedule/schedule-options.jspf new file mode 100644 index 0000000..806895f --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/sc= hedule-options.jspf @@ -0,0 +1,34 @@ +<%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> +<%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> + +

                                      + 3D"<bean:message= " /> + +

                                      + + + + + + + + + + + = + + + + + + + = +


                                      + + + +
                                      +
                                      \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first= .jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp index 6c05b7d..e7afbe1 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp @@ -115,24 +115,8 @@ function setStep(stepName) {

                                      = -

                                      - 3D"<bean:message= " /> - -

                                      - - - - - - - -


                                      - - - -
                                      -
                                      + <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/schedule/= schedule-options.jspf" %> + = =
                                      diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/= provision/first.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtua= lization/provision/first.jsp index 42359c3..f3f8fdd 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provisi= on/first.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provisi= on/first.jsp @@ -97,21 +97,8 @@ function setStep(stepName) {

                                      - = -

                                      - - - - - - - -


                                      - - - -
                                      -
                                      + = + <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/schedule= /schedule-options.jspf" %> =
                                      --===============6451070999395996120==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:52 2015 Content-Type: multipart/mixed; boundary="===============8553236835005301351==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: branding/img Date: Tue, 30 Jun 2009 11:44:20 +0000 Message-ID: <20090630114421.120371201B9@lists.fedorahosted.org> --===============8553236835005301351== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable branding/img/nav/utilBkgdRight.png |binary 1 file changed New commits: commit 4ec8b88442ab9238427b480e553852c3543d2fa6 Author: Miroslav Such=C3=BD Date: Tue Jun 30 13:43:34 2009 +0200 508710 - make bar on top of page wider, so we do not get empty space on= wider displays diff --git a/branding/img/nav/utilBkgdRight.png b/branding/img/nav/utilBkgd= Right.png index aa2043c..78ac2e4 100644 Binary files a/branding/img/nav/utilBkgdRight.png and b/branding/img/nav/ut= ilBkgdRight.png differ --===============8553236835005301351==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:52 2015 Content-Type: multipart/mixed; boundary="===============6330694392119565521==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: branding/spacewalk-branding.spec rel-eng/packages Date: Tue, 30 Jun 2009 11:45:55 +0000 Message-ID: <20090630114555.1B9FB1201B9@lists.fedorahosted.org> --===============6330694392119565521== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable branding/spacewalk-branding.spec | 5 ++++- rel-eng/packages/spacewalk-branding | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 4ebf9a50ed9a534226961db3a4402ed443860961 Author: Miroslav Such=C3=BD Date: Tue Jun 30 13:45:37 2009 +0200 Automatic commit of package [spacewalk-branding] release [0.6.7-1]. diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding= .spec index f4bb8bb..eb017b7 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -1,5 +1,5 @@ Name: spacewalk-branding -Version: 0.6.6 +Version: 0.6.7 Release: 1%{?dist} Summary: Spacewalk branding data = @@ -68,6 +68,9 @@ rm -rf %{buildroot} = = %changelog +* Tue Jun 30 2009 Miroslav Suchy 0.6.7-1 +- 508710 - make bar on top of page wider, so we do not get empty space on = wider displays + * Thu Jun 25 2009 John Matthews 0.6.6-1 - 506489 - remove the link associated with the org name present in the UI header (bbuckingham(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewa= lk-branding index ed657c3..660ed0e 100644 --- a/rel-eng/packages/spacewalk-branding +++ b/rel-eng/packages/spacewalk-branding @@ -1 +1 @@ -0.6.6-1 branding/ +0.6.7-1 branding/ --===============6330694392119565521==-- From msuchy at fedoraproject.org Thu Aug 20 11:57:52 2015 Content-Type: multipart/mixed; boundary="===============0335420477676447939==" MIME-Version: 1.0 From: =?utf-8?q?Miroslav_Such=C3=BD_=3Cmsuchy_at_fedoraproject=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: Changes to 'refs/tags/spacewalk-branding-0.6.7-1' Date: Tue, 30 Jun 2009 11:46:12 +0000 Message-ID: <20090630114612.2F0B41201B9@lists.fedorahosted.org> --===============0335420477676447939== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Tag 'spacewalk-branding-0.6.7-1' created by Miroslav Such=C3=BD at 2009-06-30 11:45 +0000 Tagging package [spacewalk-branding] version [0.6.7-1] in directory [brandi= ng/]. Changes since rhn-client-tools-0.6.1-1: Brad Buckingham (1): 508141 - api - system.config.deployAll updated w/ better exception wh= en system not config capable Devan Goodwin (1): Fix API call to remove server custom data value. Justin Sherrill (1): 508323 - fixing issue with creating cobbler system records with space= s (which would fail) Mike McCune (1): removing spammy debug from log4j properties file Miroslav Such=C3=BD (2): 508710 - make bar on top of page wider, so we do not get empty space = on wider displays Automatic commit of package [spacewalk-branding] release [0.6.7-1]. Partha Aji (3): 508736 - Corrected spec to properly set the cobbler/snippets/spacewa= lk symlink 508376 - fix for a typo in the previous commit Made the radio button in schedule ks page choose scheduleAsap by defa= ult Shannon Hughes (1): 508220 - fixed channel sharing syntax error on english side --- branding/img/nav/utilBkgdRight.png = |binary branding/spacewalk-branding.spec = | 5 + java/code/src/com/redhat/rhn/domain/server/Server.java = | 4 - java/code/src/com/redhat/rhn/domain/server/ServerFactory.java = | 1 = java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xm= l | 5 + java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml= | 2 = java/code/src/com/redhat/rhn/frontend/xmlrpc/MissingCapabilityException.ja= va | 10 ++ java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHan= dler.java | 9 ++ java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConf= igHandlerTest.java | 21 +++++- java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreate= Command.java | 3 = java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtualSyste= mCommand.java | 2 = java/code/src/log4j.properties = | 3 = java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedul= e-options.jspf | 34 ++++++++++ java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp = | 20 ----- java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/fi= rst.jsp | 17 ----- java/spacewalk-java.spec = | 12 +-- rel-eng/packages/spacewalk-branding = | 2 = 17 files changed, 95 insertions(+), 55 deletions(-) --- --===============0335420477676447939==-- From partha at fedoraproject.org Thu Aug 20 11:57:53 2015 Content-Type: multipart/mixed; boundary="===============1718856858717606627==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: java/code Date: Tue, 30 Jun 2009 16:27:59 +0000 Message-ID: <20090630162759.8D0B31201B9@lists.fedorahosted.org> --===============1718856858717606627== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedul= e-options.jspf | 59 +++++++++- java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp = | 47 ------- java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/fi= rst.jsp | 46 ------- 3 files changed, 61 insertions(+), 91 deletions(-) New commits: commit b5aa175bcaae5abca0f60bbdfa46fac2b053d02e Author: Partha Aji Date: Tue Jun 30 12:30:37 2009 -0400 508885 - fixed ks schedule pages to remember proxy host = Also fixed forgotten values such as postKernelParams diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/sche= dule/schedule-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragment= s/kickstart/schedule/schedule-options.jspf index 806895f..1c415bd 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/sc= hedule-options.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/sc= hedule-options.jspf @@ -2,7 +2,50 @@ <%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> <%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> <%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> + + + = + + + + + + + + + + + + + + + + + + + +

                                      + 3D"<bean:message" /> + +

                                      +

                                      + +

                                      +

                                      + +
                                      + +

                                      +
                                      +

                                      3D"<bean:message= " /> @@ -31,4 +74,18 @@

                                      -
                                      \ No newline at end of file +
                                      + + + + +
                                      + + " = + onclick=3D"setStep('fourth');this.form.submit();" /> + + " onclick=3D"setStep('second');this.form.submi= t();" /> + " onclick=3D"setStep('third');this.form.submit= ();" /> +
                                      +
                                      = \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first= .jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp index e7afbe1..e824a80 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp @@ -58,19 +58,6 @@ function setStep(stepName) { = - - - - = - - - - - = - - = - - = @@ -95,38 +82,8 @@ function setStep(stepName) { = * - - = -

                                      - 3D"<bean:message" /> - -

                                      -

                                      - -

                                      -

                                      - -
                                      - -

                                      -
                                      - = - <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/schedule/= schedule-options.jspf" %> - = - - - - -
                                      - " onclick=3D"setStep('fourth');this.form.submit();" /> - " onclick=3D"setStep('second');this.form.submi= t();" /> - " onclick=3D"setStep('third');this.form.submit= ();" /> -
                                      -
                                      + + <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/schedul= e/schedule-options.jspf" %>
                                      diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/= provision/first.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtua= lization/provision/first.jsp index e9a7323..ab2a6c4 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provisi= on/first.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provisi= on/first.jsp @@ -31,20 +31,6 @@ function setStep(stepName) {
                                      - - - - - - - - - = - - = - - - = @@ -59,8 +45,6 @@ function setStep(stepName) { =

                                      - = - = @@ -78,37 +62,9 @@ function setStep(stepName) {

                                      - - = -

                                      -

                                      - -

                                      -

                                      - -
                                      - -

                                      -
                                      - = - <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/schedule= /schedule-options.jspf" %> -
                                      - - - -
                                      - " onclick=3D"setStep('second');this.form.submit();" /> - " onclick=3D"setStep('third');this.form.submit();"= /> -
                                      - -

                                      +<%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/schedule/sch= edule-options.jspf" %> = - --===============1718856858717606627==-- From partha at fedoraproject.org Thu Aug 20 11:57:53 2015 Content-Type: multipart/mixed; boundary="===============2413831256722098112==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Tue, 30 Jun 2009 16:30:46 +0000 Message-ID: <20090630163046.B8F981201B9@lists.fedorahosted.org> --===============2413831256722098112== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedul= e-options.jspf | 59 +++++++++- java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp = | 47 ------- java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/fi= rst.jsp | 46 ------- 3 files changed, 61 insertions(+), 91 deletions(-) New commits: commit af5ad64f3539e8fda3fd765391910c90d541705f Author: Partha Aji Date: Tue Jun 30 12:30:37 2009 -0400 508885 - fixed ks schedule pages to remember proxy host = Also fixed forgotten values such as postKernelParams diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/sche= dule/schedule-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragment= s/kickstart/schedule/schedule-options.jspf index 806895f..1c415bd 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/sc= hedule-options.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/sc= hedule-options.jspf @@ -2,7 +2,50 @@ <%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> <%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> <%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> + + + = + + + + + + + + + + + + + + + + + + + +

                                      + 3D"<bean:message" /> + +

                                      +

                                      + +

                                      +

                                      + +
                                      + +

                                      +
                                      +

                                      3D"<bean:message= " /> @@ -31,4 +74,18 @@

                                      -
                                      \ No newline at end of file +
                                      + + + + +
                                      + + " = + onclick=3D"setStep('fourth');this.form.submit();" /> + + " onclick=3D"setStep('second');this.form.submi= t();" /> + " onclick=3D"setStep('third');this.form.submit= ();" /> +
                                      +
                                      = \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first= .jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp index e7afbe1..e824a80 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp @@ -58,19 +58,6 @@ function setStep(stepName) { = - - - - = - - - - - = - - = - - = @@ -95,38 +82,8 @@ function setStep(stepName) { = * - - = -

                                      - 3D"<bean:message" /> - -

                                      -

                                      - -

                                      -

                                      - -
                                      - -

                                      -
                                      - = - <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/schedule/= schedule-options.jspf" %> - = - - - - -
                                      - " onclick=3D"setStep('fourth');this.form.submit();" /> - " onclick=3D"setStep('second');this.form.submi= t();" /> - " onclick=3D"setStep('third');this.form.submit= ();" /> -
                                      -
                                      + + <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/schedul= e/schedule-options.jspf" %>
                                      diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/= provision/first.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtua= lization/provision/first.jsp index f3f8fdd..38dcac4 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provisi= on/first.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provisi= on/first.jsp @@ -34,20 +34,6 @@ function setStep(stepName) {
                                      - - - - - - - - - = - - = - - - = @@ -62,8 +48,6 @@ function setStep(stepName) { =

                                      - = - = @@ -81,37 +65,9 @@ function setStep(stepName) {

                                      - - = -

                                      -

                                      - -

                                      -

                                      - -
                                      - -

                                      -
                                      - = - <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/schedule= /schedule-options.jspf" %> -
                                      - - - -
                                      - " onclick=3D"setStep('second');this.form.submit();" /> - " onclick=3D"setStep('third');this.form.submit();"= /> -
                                      - -

                                      +<%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/schedule/sch= edule-options.jspf" %> = - --===============2413831256722098112==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:53 2015 Content-Type: multipart/mixed; boundary="===============7919478161191190890==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - backend/server Date: Tue, 30 Jun 2009 16:46:19 +0000 Message-ID: <20090630164620.0447C1201B9@lists.fedorahosted.org> --===============7919478161191190890== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/importlib/backend.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit ec7816a6e6ef615d3612c34abedd7ed04e048b62 Author: Pradeep Kilambi Date: Tue Jun 30 12:46:08 2009 -0400 506264 - check the query for null as well along with inequality. diff --git a/backend/server/importlib/backend.py b/backend/server/importlib= /backend.py index 1c0ba13..b31aa7c 100644 --- a/backend/server/importlib/backend.py +++ b/backend/server/importlib/backend.py @@ -1128,11 +1128,15 @@ class Backend: channel['channel_product_beta'] =3D channel['product_beta'] channel['channel_product_id'] =3D self.lookupChannelProduct(channe= l) = + if not channel['channel_product_id']: + # If no channel product dont update + return statement =3D self.dbmodule.prepare(""" UPDATE rhnChannel SET channel_product_id =3D :channel_product_id WHERE id =3D :id - AND channel_product_id <> :channel_product_id + AND (channel_product_id is NULL = + OR channel_product_id <> :channel_product_id) """) = statement.execute(id =3D channel.id, --===============7919478161191190890==-- From pkilambi at fedoraproject.org Thu Aug 20 11:57:53 2015 Content-Type: multipart/mixed; boundary="===============3838843079432432937==" MIME-Version: 1.0 From: Pradeep Kilambi To: spacewalk-commits at lists.fedorahosted.org Subject: backend/server Date: Tue, 30 Jun 2009 16:46:50 +0000 Message-ID: <20090630164650.0BF8B1201B9@lists.fedorahosted.org> --===============3838843079432432937== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable backend/server/importlib/backend.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit d2e47011c1a26a58ee2fefa24d2edd40472cdc57 Author: Pradeep Kilambi Date: Tue Jun 30 12:46:08 2009 -0400 506264 - check the query for null as well along with inequality. diff --git a/backend/server/importlib/backend.py b/backend/server/importlib= /backend.py index 1c0ba13..b31aa7c 100644 --- a/backend/server/importlib/backend.py +++ b/backend/server/importlib/backend.py @@ -1128,11 +1128,15 @@ class Backend: channel['channel_product_beta'] =3D channel['product_beta'] channel['channel_product_id'] =3D self.lookupChannelProduct(channe= l) = + if not channel['channel_product_id']: + # If no channel product dont update + return statement =3D self.dbmodule.prepare(""" UPDATE rhnChannel SET channel_product_id =3D :channel_product_id WHERE id =3D :id - AND channel_product_id <> :channel_product_id + AND (channel_product_id is NULL = + OR channel_product_id <> :channel_product_id) """) = statement.execute(id =3D channel.id, --===============3838843079432432937==-- From partha at fedoraproject.org Thu Aug 20 11:57:53 2015 Content-Type: multipart/mixed; boundary="===============2661323024088930764==" MIME-Version: 1.0 From: Partha Aji To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'VADER' - java/code Date: Tue, 30 Jun 2009 18:09:42 +0000 Message-ID: <20090630180942.0F2E71201B9@lists.fedorahosted.org> --===============2661323024088930764== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEdi= tAction.java | 46 +++++----- java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details= .jspf | 14 --- java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf= | 21 +++- java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp = | 15 --- 4 files changed, 42 insertions(+), 54 deletions(-) New commits: commit 067afa47558decb4671d8273e0d631b683e593d8 Author: Partha Aji Date: Tue Jun 30 14:06:22 2009 -0400 508705 - Fixed KS details page to hide virt options if virt type is none diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/Kicksta= rtDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kic= kstart/KickstartDetailsEditAction.java index 93f74ef..1e65b36 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetai= lsEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetai= lsEditAction.java @@ -146,29 +146,29 @@ public class KickstartDetailsEditAction extends BaseK= ickstartEditAction { form.set(KERNEL_OPTIONS, prof.getKernelOptionsString()); form.set(POST_KERNEL_OPTIONS, prof.getKernelPostOptionsString(= )); } - = - if (prof =3D=3D null) { - form.set(VIRT_BRIDGE, Config.get().getDefaultXenVirtBridge()); - form.set(VIRT_CPU, Config.get().getDefaultVirtCpus()); - form.set(VIRT_DISK_SIZE, Config.get().getDefaultVirtDiskSize()); - form.set(VIRT_MEMORY, Config.get().getDefaultVirtMemorySize()); - } - else { - setFormValueOrDefault(form, VIRT_BRIDGE, prof.getVirtBridge(), = - Config.get().getDefaultXenV= irtBridge()); - setFormValueOrDefault(form, VIRT_CPU, prof.getVirtCpus(), - Config.get().getDefault= VirtCpus()); - setFormValueOrDefault(form, VIRT_DISK_SIZE, prof.getVirtFileSiz= e(), - Config.get().getDefaultVirt= DiskSize()); - setFormValueOrDefault(form, VIRT_MEMORY, prof.getVirtRam(), - Config.get().getDefaultVirtMemo= rySize()); = - } - - = - //Should we show virt options? - ctx.getRequest().setAttribute(IS_VIRT, !data.getKickstartDefaults(). - getVirtualizationType().equals(KickstartFactory.VIRT_TY= PE_PV_HOST)); - + KickstartVirtualizationType type =3D data.getKickstartDefaults(). + getVirtualizationType(= ); + //Should we show virt options? + if (!type.equals(KickstartVirtualizationType.paraHost()) && + !type.equals(KickstartVirtualizationType.none())) { + if (prof =3D=3D null) { + form.set(VIRT_BRIDGE, Config.get().getDefaultXenVirtBridge(= )); + form.set(VIRT_CPU, Config.get().getDefaultVirtCpus()); + form.set(VIRT_DISK_SIZE, Config.get().getDefaultVirtDiskSiz= e()); + form.set(VIRT_MEMORY, Config.get().getDefaultVirtMemorySize= ()); + } + else { + setFormValueOrDefault(form, VIRT_BRIDGE, prof.getVirtBridge= (), = + Config.get().getDefault= XenVirtBridge()); + setFormValueOrDefault(form, VIRT_CPU, prof.getVirtCpus(), + Config.get().getDef= aultVirtCpus()); + setFormValueOrDefault(form, VIRT_DISK_SIZE, prof.getVirtFil= eSize(), + Config.get().getDefault= VirtDiskSize()); + setFormValueOrDefault(form, VIRT_MEMORY, prof.getVirtRam(), + Config.get().getDefaultVirt= MemorySize()); = + } + ctx.getRequest().setAttribute(IS_VIRT, Boolean.TRUE); = + } } = = diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/adva= nced/details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kicksta= rt/advanced/details.jspf index 571b990..e290a04 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/de= tails.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/de= tails.jspf @@ -30,18 +30,8 @@ =
                                      - - - -
                                      + + +
                                      + + + +
                                      :<= /th>
                                      :<= /th>
                                      = ()
                                      - - -
                                      - -
                                      - - - -
                                      + + +
                                      + + + +
                                      :<= /th>
                                      :<= /th>
                                      = ()
                                      - - -
                                      - -
                                      : - = + = ${item.value} @@ -112,10 +113,10 @@ function reloadForm(ctl) { ${item.label}
                                      -

                                      = = +
                                      =
                                      : - = + = ${item.value} @@ -118,10 +119,10 @@ function reloadForm(ctl) { ${item.label}
                                      -

                                      = = +
                                      =