August 2013 - spacewalk-commits - Fedora Mailing-Lists

2 commits - rel-eng/packages schema/spacewalk

by Tomas Lestach

rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/common/tables/log.sql | 2 +- schema/spacewalk/spacewalk-schema.spec | 5 ++++- schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/012-log.sql.oracle | 5 +++++ schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/012-log.sql.postgresql | 2 ++ 5 files changed, 13 insertions(+), 3 deletions(-) New commits: commit 42af372067ef2094b777d2eb0688d45adf86a057 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Aug 5 16:36:59 2013 +0200 Automatic commit of package [spacewalk-schema] release [2.1.6-1]. diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index d5d4e95..314a150 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -2.1.5-1 schema/spacewalk/ +2.1.6-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index 74472b8..4fdc257 100644 --- a/schema/spacewalk/spacewalk-schema.spec +++ b/schema/spacewalk/spacewalk-schema.spec @@ -4,7 +4,7 @@ Name: spacewalk-schema Group: Applications/Internet Summary: Oracle SQL schema for Spacewalk server -Version: 2.1.5 +Version: 2.1.6 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz @@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-sql* %changelog +* Mon Aug 05 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.6-1 +- changing stamp type on log table + * Wed Jul 31 2013 Simon Lukasik <slukasik(a)redhat.com> 2.1.5-1 - New OrgConfig attribute: period during which it is not possible to delete scan commit c8fc7f598f189daf79190232fae034cee706fabd Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Aug 5 16:13:50 2013 +0200 changing stamp type on log table to timestamp with local time zone diff --git a/schema/spacewalk/common/tables/log.sql b/schema/spacewalk/common/tables/log.sql index e2b4469..cbd8a90 100644 --- a/schema/spacewalk/common/tables/log.sql +++ b/schema/spacewalk/common/tables/log.sql @@ -17,7 +17,7 @@ CREATE TABLE log ( id NUMBER NOT NULL PRIMARY KEY, - stamp TIMESTAMP WITH TIME ZONE, + stamp TIMESTAMP WITH LOCAL TIME ZONE, user_id NUMBER REFERENCES web_contact_all(id) ) ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/012-log.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/012-log.sql.oracle new file mode 100644 index 0000000..f25520b --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/012-log.sql.oracle @@ -0,0 +1,5 @@ +ALTER TABLE log ADD stamp_ltz TIMESTAMP WITH LOCAL TIME ZONE; +UPDATE log SET stamp_ltz = stamp; +ALTER TABLE log DROP COLUMN stamp; +ALTER TABLE log RENAME COLUMN stamp_ltz TO stamp; + diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/012-log.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/012-log.sql.postgresql new file mode 100644 index 0000000..745bb50 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/012-log.sql.postgresql @@ -0,0 +1,2 @@ +-- oracle equivalent source sha1 331fbb666a23cd70f7fa9891acceaff8afa045bf +-- This file is intentionally left empty.

10 years, 9 months

1
0
0 / 0

Changes to 'refs/tags/spacecmd-2.1.2-1'

by Tomáš Kašpárek

Tag 'spacecmd-2.1.2-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-08-05 09:59 +0000 Tagging package [spacecmd] version [2.1.2-1] in directory [spacecmd/]. Changes since spacewalk-backend-2.1.4-1: Gregor Gruener (1): spacecmd - add new function is_monitoringenabled and list_proxies Tomas Kasparek (7): Branding clean-up of proxy stuff in backend dir Branding clean-up of proxy stuff in client dir Branding clean-up of proxy stuff in java dir Branding clean-up of proxy stuff in proxy dir Branding clean-up of proxy stuff in cert-tools dir Branding clean-up of proxy stuff in web dir Automatic commit of package [spacecmd] release [2.1.2-1]. --- backend/common/rhnApache.py | 4 - backend/common/rhnException.py | 16 ++--- backend/server/apacheAuth.py | 2 backend/server/handlers/xmlrpc/proxy.py | 4 - backend/server/rhn.conf.sample | 4 - backend/server/rhnServer/server_route.py | 2 client/rhel/rhn-client-tools/data/rh_register.glade | 6 +- client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py | 4 - client/rhel/yum-rhn-plugin/rhnplugin.py | 2 client/tools/osad/osad-conf/osad.conf | 2 client/tools/rhnpush/rhnpush.py | 4 - java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 4 - java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4 - java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4 - java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4 - java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4 - java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4 - java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 4 - java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 2 java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java | 2 java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 2 java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java | 2 proxy/changes-notes-v3x.txt | 4 - proxy/installer/configure-proxy.sh | 2 proxy/installer/rhn-proxy-activate | 2 proxy/installer/rhn-proxy-activate.sgml | 10 +-- proxy/installer/rhn.conf | 2 proxy/installer/rhn_proxy_activate.py | 26 ++++---- proxy/installer/squid.conf | 2 proxy/proxy/Makefile.proxy | 2 proxy/proxy/apacheHandler.py | 2 proxy/proxy/broker/Makefile | 2 proxy/proxy/broker/rhnBroker.py | 14 ++-- proxy/proxy/broker/rhnRepository.py | 2 proxy/proxy/pm/rhn_package_manager.py | 4 - proxy/proxy/pm/rhn_package_manager.sgml | 2 proxy/proxy/redirect/rhnRedirect.py | 2 proxy/proxy/rhn-conf/Makefile | 2 proxy/proxy/rhnAuthCacheClient.py | 6 +- proxy/proxy/rhnConstants.py | 4 - proxy/proxy/rhnProxyAuth.py | 30 +++++----- proxy/proxy/rhnShared.py | 8 +- rel-eng/packages/spacecmd | 2 spacecmd/spacecmd.spec | 5 + spacecmd/src/lib/misc.py | 21 +++++++ spacewalk/certs-tools/rhn-ssl-tool.sgml | 14 ++-- spacewalk/certs-tools/rhn_ssl_tool.py | 10 +-- spacewalk/certs-tools/sslToolCli.py | 2 web/html/network/systems/details/connection.pxt | 8 +- web/html/network/systems/details/proxy-clients.pxt | 2 web/html/network/systems/details/proxy.pxt | 2 web/modules/sniglets/Sniglets/Servers.pm | 4 - 61 files changed, 163 insertions(+), 139 deletions(-) ---

10 years, 9 months

1
0
0 / 0

rel-eng/packages spacecmd/spacecmd.spec

by Tomáš Kašpárek

rel-eng/packages/spacecmd | 2 +- spacecmd/spacecmd.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 970145304f753204709459eaff197f4132cfba66 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Mon Aug 5 11:59:04 2013 +0200 Automatic commit of package [spacecmd] release [2.1.2-1]. diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd index f9ca916..c88f653 100644 --- a/rel-eng/packages/spacecmd +++ b/rel-eng/packages/spacecmd @@ -1 +1 @@ -2.1.1-1 spacecmd/ +2.1.2-1 spacecmd/ diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec index f167795..ecb6b23 100644 --- a/spacecmd/spacecmd.spec +++ b/spacecmd/spacecmd.spec @@ -4,7 +4,7 @@ %endif Name: spacecmd -Version: 2.1.1 +Version: 2.1.2 Release: 1%{?dist} Summary: Command-line interface to Spacewalk and Satellite servers @@ -64,6 +64,9 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py %doc %{_mandir}/man1/spacecmd.1.gz %changelog +* Mon Aug 05 2013 Gregor Gruener <ggruner(a)redhat.com> +- spacecmd - add new function is_monitoringenabled and list_proxies + * Mon Jul 22 2013 Gregor Gruener <ggruner(a)redhat.com> 2.1.1-1 - add new function custominfo_updatekey

10 years, 9 months

1
0
0 / 0

spacecmd/src

by Tomáš Kašpárek

spacecmd/src/lib/misc.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) New commits: commit b734d823d36921e4e36ae165bd1fa3e6122ee098 Author: Gregor Gruener <ggruner(a)redhat.com> Date: Mon Aug 5 11:55:28 2013 +0200 spacecmd - add new function is_monitoringenabled and list_proxies diff --git a/spacecmd/src/lib/misc.py b/spacecmd/src/lib/misc.py index 6273eb4..21d2806 100644 --- a/spacecmd/src/lib/misc.py +++ b/spacecmd/src/lib/misc.py @@ -137,6 +137,27 @@ def do_get_certificateexpiration(self, args): #################### +def help_is_monitoringenabled(self): + print 'is_monitoringenabled: Indicates if monitoring is enabled ' + print " on the satellite " + print 'usage: is_monitoringenabled' + +def do_is_monitoringenabled(self, args): + monitoring = self.client.satellite.isMonitoringEnabled(self.session) + print monitoring + +#################### + +def help_list_proxies(self): + print 'list_proxies: List the proxies wihtin the user\'s organization ' + print 'usage: list_proxies' + +def do_list_proxies(self, args): + proxies = self.client.satellite.listProxies(self.session) + print proxies + +#################### + def help_get_session(self): print 'get_session: Show the current session string' print 'usage: get_session'

10 years, 9 months

1
0
0 / 0

6 commits - backend/common backend/server client/rhel client/tools java/code proxy/changes-notes-v3x.txt proxy/installer proxy/proxy spacewalk/certs-tools web/html web/modules

by Tomáš Kašpárek

backend/common/rhnApache.py | 4 - backend/common/rhnException.py | 16 ++--- backend/server/apacheAuth.py | 2 backend/server/handlers/xmlrpc/proxy.py | 4 - backend/server/rhn.conf.sample | 4 - backend/server/rhnServer/server_route.py | 2 client/rhel/rhn-client-tools/data/rh_register.glade | 6 +- client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py | 4 - client/rhel/yum-rhn-plugin/rhnplugin.py | 2 client/tools/osad/osad-conf/osad.conf | 2 client/tools/rhnpush/rhnpush.py | 4 - java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 4 - java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4 - java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4 - java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4 - java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4 - java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4 - java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 4 - java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 2 java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java | 2 java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 2 java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java | 2 proxy/changes-notes-v3x.txt | 4 - proxy/installer/configure-proxy.sh | 2 proxy/installer/rhn-proxy-activate | 2 proxy/installer/rhn-proxy-activate.sgml | 10 +-- proxy/installer/rhn.conf | 2 proxy/installer/rhn_proxy_activate.py | 26 ++++---- proxy/installer/squid.conf | 2 proxy/proxy/Makefile.proxy | 2 proxy/proxy/apacheHandler.py | 2 proxy/proxy/broker/Makefile | 2 proxy/proxy/broker/rhnBroker.py | 14 ++-- proxy/proxy/broker/rhnRepository.py | 2 proxy/proxy/pm/rhn_package_manager.py | 4 - proxy/proxy/pm/rhn_package_manager.sgml | 2 proxy/proxy/redirect/rhnRedirect.py | 2 proxy/proxy/rhn-conf/Makefile | 2 proxy/proxy/rhnAuthCacheClient.py | 6 +- proxy/proxy/rhnConstants.py | 4 - proxy/proxy/rhnProxyAuth.py | 30 +++++----- proxy/proxy/rhnShared.py | 8 +- spacewalk/certs-tools/rhn-ssl-tool.sgml | 14 ++-- spacewalk/certs-tools/rhn_ssl_tool.py | 10 +-- spacewalk/certs-tools/sslToolCli.py | 2 web/html/network/systems/details/connection.pxt | 8 +- web/html/network/systems/details/proxy-clients.pxt | 2 web/html/network/systems/details/proxy.pxt | 2 web/modules/sniglets/Sniglets/Servers.pm | 4 - 58 files changed, 137 insertions(+), 137 deletions(-) New commits: commit 4058c1f3963686c6c4513421d1ef162c0e995da1 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Mon Aug 5 11:04:13 2013 +0200 Branding clean-up of proxy stuff in web dir diff --git a/web/html/network/systems/details/connection.pxt b/web/html/network/systems/details/connection.pxt index 2dc9ac7..13848cf 100644 --- a/web/html/network/systems/details/connection.pxt +++ b/web/html/network/systems/details/connection.pxt @@ -20,8 +20,8 @@ <div class="page-summary"> <p> - Below is a list of the Red Hat Proxy servers this system connects - through to reach the primary Red Hat Satellite server. The Red Hat Proxy the + Below is a list of the Proxy servers this system connects + through to reach the primary server. The Proxy the system connects directly to, if any, is listed first on this list. </p> @@ -37,13 +37,13 @@ <var name="cfam_id" /> </formvars> - <column name="Red Hat Proxy Order" label="position" width="10%" /> + <column name="Proxy Order" label="position" width="10%" /> <column name="Hostname" label="hostname" align="left"> <url>/rhn/systems/details/Overview.do?sid={column:id}</url> </column> <column name="Entitlement" label="entitlement_level" width="5%"/> - <empty_list_message>This system connects directly and not through an Red Hat Proxy.</empty_list_message> + <empty_list_message>This system connects directly and not through an Proxy.</empty_list_message> </rhn-listview> </grail-canvas-template> diff --git a/web/html/network/systems/details/proxy-clients.pxt b/web/html/network/systems/details/proxy-clients.pxt index ca7826e..8b9b1df 100644 --- a/web/html/network/systems/details/proxy-clients.pxt +++ b/web/html/network/systems/details/proxy-clients.pxt @@ -16,7 +16,7 @@ <pxt-include-late file="/network/components/message_queues/local.pxi"/> - <h2><img src="/img/rhn-icon-proxy.gif"/> Red Hat Proxy Clients</h2> + <h2><img src="/img/rhn-icon-proxy.gif"/>Proxy Clients</h2> <rhn-listview class="Sniglets::ListView::SystemList" mode="clients_through_proxy" alphabar_column="name"> <formvars> diff --git a/web/html/network/systems/details/proxy.pxt b/web/html/network/systems/details/proxy.pxt index 34a6875..36d6d05 100644 --- a/web/html/network/systems/details/proxy.pxt +++ b/web/html/network/systems/details/proxy.pxt @@ -15,7 +15,7 @@ <pxt-include-late file="/network/components/message_queues/local.pxi"/> - <h2><img src="/img/rhn-icon-proxy.gif"/> Red Hat Proxy</h2> + <h2><img src="/img/rhn-icon-proxy.gif"/>Proxy</h2> <rhn-proxy-entitlement-form> <div class="page-summary"> diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm index b65157e..8c9aeb9 100644 --- a/web/modules/sniglets/Sniglets/Servers.pm +++ b/web/modules/sniglets/Sniglets/Servers.pm @@ -162,9 +162,9 @@ sub proxy_entitlement_form { $subs{version} = $version; - $subs{proxy_message} = "This machine is currently a licensed Red Hat Proxy (v$version)."; + $subs{proxy_message} = "This machine is currently a licensed Red Hat Satellite Proxy (v$version)."; } else { - $subs{proxy_message} = "<div class=\"site-alert\">WebUI Red Hat Proxy installer is obsoleted since version 5.3. Please use command line installer from package spacewalk-proxy-installer.</div>"; + $subs{proxy_message} = "<div class=\"site-alert\">WebUI Spacewalk Proxy installer is obsoleted since version 5.3. Please use command line installer from package spacewalk-proxy-installer.</div>"; } $block = PXT::Utils->perform_substitutions($block, \%subs); commit 5c30b42665a9c343c8f859bda9b40909c32ffca7 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Mon Aug 5 11:04:01 2013 +0200 Branding clean-up of proxy stuff in cert-tools dir diff --git a/spacewalk/certs-tools/rhn-ssl-tool.sgml b/spacewalk/certs-tools/rhn-ssl-tool.sgml index 213f23e..95e7b93 100644 --- a/spacewalk/certs-tools/rhn-ssl-tool.sgml +++ b/spacewalk/certs-tools/rhn-ssl-tool.sgml @@ -64,7 +64,7 @@ Generate and maintain SSL keys, certificates and deployment RPMs. web applications.</para> <para>The RHN context of this document is in support of Red Hat Satellite, but - all holds true for Red Hat Proxy as well, so keep that in mind. The most + all holds true for Red Hat Satellite Proxy as well, so keep that in mind. The most current Red Hat Satellite Servers use <emphasis>/root/ssl-build</emphasis> as the default build directory. Older Red Hat Satellites and Proxies used the <emphasis>/etc/sysconfig/rhn/ssl</emphasis> directory, and *very* old @@ -137,7 +137,7 @@ Generate and maintain SSL keys, certificates and deployment RPMs. generated.</para> <para>The web server SSL key and certificate are used solely by the - web application server (apache on an Red Hat Proxy or Satellite Server + web application server (apache on an Red Hat Satellite Proxy or Satellite Server for example).</para> </listitem> @@ -160,7 +160,7 @@ Generate and maintain SSL keys, certificates and deployment RPMs. <para>The <command>--gen-server</command> process generates an RPM that contains the <emphasis>server.key</emphasis> and <emphasis>server.crt</emphasis> files needed to secure your RHN - server (Red Hat Satellite or Red Hat Proxy). It needs to be installed + server (Red Hat Satellite or Red Hat Satellite Proxy). It needs to be installed on the appropriate server. That server then needs to have it's <emphasis>httpd</emphasis> processes restarted <command>/sbin/service httpd restart</command>.</para> @@ -193,7 +193,7 @@ Generate and maintain SSL keys, certificates and deployment RPMs. <para>generate a web server's SSL private key: <command>--gen-server --key-only <replaceable>...</replaceable></command></para> <para>generate a web server's SSL certificate request: <command>--gen-server --cert-req-only <replaceable>...</replaceable></command></para> <para>generate/sign a web server's SSL certificate: <command>--gen-server --cert-only <replaceable>...</replaceable></command></para> - <para>generate a web server's private RPM (and tar archive used for Red Hat Proxy installations): <command>--gen-server --rpm-only <replaceable>...</replaceable></command></para> + <para>generate a web server's private RPM (and tar archive used for Red Hat Satellite Proxy installations): <command>--gen-server --rpm-only <replaceable>...</replaceable></command></para> </listitem> </varlistentry></variablelist> @@ -500,7 +500,7 @@ Generate and maintain SSL keys, certificates and deployment RPMs. <term>--set-hostname=<replaceable>HOSTNAME</replaceable></term> <listitem> <para>set the hostname (FQDN: fully qualified domain name) - of the Red Hat Satellite or Red Hat Proxy (default: build machine's + of the Red Hat Satellite or Red Hat Satellite Proxy (default: build machine's hostname).</para> </listitem> </varlistentry> @@ -508,7 +508,7 @@ Generate and maintain SSL keys, certificates and deployment RPMs. <term>--set-cname=<replaceable>HOSTNAME</replaceable></term> <listitem> <para>set the cname alias (FQDN: fully qualified domain name) - of the Red Hat Satellite or Red Hat Proxy. This will generate certificate + of the Red Hat Satellite or Red Hat Satellite Proxy. This will generate certificate with multiple hostnames. Can be specified multiple times. </para> </listitem> @@ -563,7 +563,7 @@ Generate and maintain SSL keys, certificates and deployment RPMs. <listitem> <para>(rarely changed) name of archive (tarball) of the web server's SSL key set and CA SSL public certificate that is - used solely by the hosted Red Hat Proxy installation + used solely by the hosted Red Hat Satellite Proxy installation routines (the base filename, not filename-version-release.tar).</para> </listitem> </varlistentry> diff --git a/spacewalk/certs-tools/rhn_ssl_tool.py b/spacewalk/certs-tools/rhn_ssl_tool.py index 3eb10e0..d0b1030 100755 --- a/spacewalk/certs-tools/rhn_ssl_tool.py +++ b/spacewalk/certs-tools/rhn_ssl_tool.py @@ -783,7 +783,7 @@ Make the public CA certficate publically available: def genProxyServerTarball_dependencies(d): - """ dependency check for the step that generates the Red Hat Proxy Server's + """ dependency check for the step that generates the Spacewalk Proxy Server's tar archive containing its SSL key set + CA certificate. """ @@ -841,7 +841,7 @@ def getTarballFilename(d, version='1.0', release='1'): def genProxyServerTarball(d, version='1.0', release='1', verbosity=0): - """ generates the Red Hat Proxy Server's tar archive containing its + """ generates the Spacewalk Proxy Server's tar archive containing its SSL key set + CA certificate """ @@ -868,7 +868,7 @@ def genProxyServerTarball(d, version='1.0', release='1', verbosity=0): if verbosity >= 0: print """ -The most current Red Hat Proxy Server installation process against RHN hosted +The most current Spacewalk Proxy Server installation process against RHN hosted requires the upload of an SSL tar archive that contains the CA SSL public certificate and the web server's key set. @@ -1089,7 +1089,7 @@ Generating web server's SSL key pair/set RPM: os.chmod('%s.noarch.rpm' % serverRpmName, 0600) - # generic the tarball necessary for Red Hat Proxy against hosted installations + # generic the tarball necessary for Spacewalk Proxy against hosted installations tarballFilepath = genProxyServerTarball(d, version=ver, release=rel, verbosity=verbosity) @@ -1107,7 +1107,7 @@ Generating web server's SSL key pair/set RPM: Deploy the server's SSL key pair/set RPM: (NOTE: the Red Hat Satellite or Proxy installers may do this step for you.) The "noarch" RPM needs to be deployed to the machine working as a - web server, or Red Hat Satellite, or Red Hat Proxy. + web server, or Red Hat Satellite, or Spacewalk Proxy. Presumably %s.""" % repr(d['--set-hostname']) return "%s.noarch.rpm" % serverRpmName diff --git a/spacewalk/certs-tools/sslToolCli.py b/spacewalk/certs-tools/sslToolCli.py index 873b8ec..0876fe2 100644 --- a/spacewalk/certs-tools/sslToolCli.py +++ b/spacewalk/certs-tools/sslToolCli.py @@ -66,7 +66,7 @@ def _getOptionsTree(defs): _optCaCertRpm = make_option('--ca-cert-rpm', action='store', type="string", help='(rarely changed) RPM name that houses the CA SSL public certificate (the base filename, not filename-version-release.noarch.rpm).') _optServerRpm = make_option('--server-rpm', action='store', type="string", help="(rarely changed) RPM name that houses the web server's SSL key set (the base filename, not filename-version-release.noarch.rpm).") - _optServerTar = make_option('--server-tar', action='store', type="string", help="(rarely changed) name of tar archive of the web server's SSL key set and CA SSL public certificate that is used solely by the hosted Red Hat Proxy installation routines (the base filename, not filename-version-release.tar).") + _optServerTar = make_option('--server-tar', action='store', type="string", help="(rarely changed) name of tar archive of the web server's SSL key set and CA SSL public certificate that is used solely by the hosted Spacewalk Proxy installation routines (the base filename, not filename-version-release.tar).") _optRpmPackager = make_option('--rpm-packager', action='store', type="string", help='(rarely used) packager of the generated RPM, such as "RHN Admin <rhn-admin(a)example.com>".') _optRpmVender = make_option('--rpm-vendor', action='store', type="string", help='(rarely used) vendor of the generated RPM, such as "IS/IT Example Corp.".') commit 3a6aeacc36d17577763ac1643b07ae920426ff87 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Mon Aug 5 11:03:42 2013 +0200 Branding clean-up of proxy stuff in proxy dir diff --git a/proxy/changes-notes-v3x.txt b/proxy/changes-notes-v3x.txt index a3ca0ca..60e78e9 100644 --- a/proxy/changes-notes-v3x.txt +++ b/proxy/changes-notes-v3x.txt @@ -1,8 +1,8 @@ -This document outlines some of the big changes occuring for Red Hat Proxy 3.* +This document outlines some of the big changes occuring for Spacewalk Proxy 3.* ------------------------------------------------------------------------- $Id$ -Changes in the Red Hat Proxy architexture required dramatic changes in the +Changes in the Spacewalk Proxy architexture required dramatic changes in the config files. Most everything was simplified. Simplified the SSL config variable diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh index 7e7cf59..3fb2a74 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -255,7 +255,7 @@ JABBERD_DIR=/etc/jabberd SQUID_DIR=/etc/squid if [ ! -r $SYSCONFIG_DIR/systemid ]; then - echo ERROR: Red Hat Proxy does not appear to be registered + echo ERROR: Spacewalk Proxy does not appear to be registered exit 2 fi diff --git a/proxy/installer/rhn-proxy-activate b/proxy/installer/rhn-proxy-activate index 8ff1e9f..7794158 100755 --- a/proxy/installer/rhn-proxy-activate +++ b/proxy/installer/rhn-proxy-activate @@ -1,5 +1,5 @@ #!/usr/bin/python -u -""" activate an Red Hat Proxy Server v3.6+ +""" activate an Spacewalk Proxy Server v3.6+ Copyright (c) 2004--2013 Red Hat, Inc. All rights reserved. diff --git a/proxy/installer/rhn-proxy-activate.sgml b/proxy/installer/rhn-proxy-activate.sgml index 9d96064..a908e89 100644 --- a/proxy/installer/rhn-proxy-activate.sgml +++ b/proxy/installer/rhn-proxy-activate.sgml @@ -16,7 +16,7 @@ <RefPurpose> Use the WebUI to activate your &RHNPROXY; product. This command should only be used under the direction of Red Hat personnel. - This script allows an admin to activate an Red Hat Proxy via the + This script allows an admin to activate an Spacewalk Proxy via the commandline. </RefPurpose> </RefNameDiv> @@ -60,7 +60,7 @@ should only be used under the direction of Red Hat personnel. The &SCRIPTNAME; (<emphasis>&SCRIPTCOMMAND;</emphasis>) is a utility that will activate an &RHNPROXY; from the commandline of - the Red Hat Proxy itself. + the Spacewalk Proxy itself. </para> <para> Without any command specified, this script will activate Spacewalk Proxy. @@ -79,7 +79,7 @@ <varlistentry> <term>-l, --list-available-versions</term> <listitem> - <para>List available versions of Red Hat Proxy on parent.</para> + <para>List available versions of Spacewalk Proxy on parent.</para> </listitem> </varlistentry> </variablelist> @@ -97,8 +97,8 @@ <term>-s<replaceable>HOSTNAME</replaceable>, --server=<replaceable>HOSTNAME</replaceable></term> <listitem> - <para>parent to this &RHNPROXY;. Either RHN hosted, an - Red Hat Satellite, or another Red Hat Proxy.</para> + <para>parent to this &RHNPROXY;. Either RHN Classic, an + Red Hat Satellite, or another Spacewalk Proxy.</para> </listitem> </varlistentry> <varlistentry> diff --git a/proxy/installer/rhn.conf b/proxy/installer/rhn.conf index c79aac7..e1e5fed 100644 --- a/proxy/installer/rhn.conf +++ b/proxy/installer/rhn.conf @@ -1,4 +1,4 @@ -# Automatically generated Red Hat Proxy Server configuration file. +# Automatically generated Spacewalk Proxy Server configuration file. # ------------------------------------------------------------------------- # SSL CA certificate location diff --git a/proxy/installer/rhn_proxy_activate.py b/proxy/installer/rhn_proxy_activate.py index eaca684..015d11d 100644 --- a/proxy/installer/rhn_proxy_activate.py +++ b/proxy/installer/rhn_proxy_activate.py @@ -12,14 +12,14 @@ # granted to use or replicate Red Hat trademarks that are incorporated # in this software or its documentation. # -""" Activate an Red Hat Proxy 3.x ...not the executable - (original script can activate an Red Hat Proxy version 1.1 to 3.x) +""" Activate a Spacewalk Proxy 3.x ...not the executable + (original script can activate a Spacewalk Proxy version 1.1 to 3.x) USAGE: ./rhn-proxy-activate Author: Todd Warner <taw(a)redhat.com> - NOTE: this file is compatible with RHN Proxies 4.0. It is not guaranteed to - work with older RHN Proxies. + NOTE: this file is compatible with Spacewalk Proxies 4.0. It is not guaranteed to + work with older Spacewalk Proxies. """ ## core lang imports @@ -141,17 +141,17 @@ def _getActivationError(e): "available in your RHN account.") errorCode = 5 elif e.faultString.find('proxy_no_channel_entitlements') != -1: - errorString = ("no Red Hat Proxy entitlements available. There must be " - "at least one free Red Hat Proxy entitlement " + errorString = ("no Spacewalk Proxy entitlements available. There must " + "be at least one free Spacewalk Proxy entitlement " "available in your Red Hat Satellite account.") errorCode = 6 elif e.faultString.find('proxy_no_proxy_child_channel') != -1: - errorString = ("no Red Hat Proxy entitlements available for this " + errorString = ("no Spacewalk Proxy entitlements available for this " "server's version (or requested version) of Red Hat " - "Enterprise Linux.") + "Enterprise nux.") errorCode = 7 elif e.faultString.find('proxy_not_activated') != -1: - errorString = "this server not an activated Red Hat Proxy yet." + errorString = "this server not an activated Spacewalk Proxy yet." errorCode = 8 else: errorString = "unknown error - %s" % str(e) @@ -292,7 +292,7 @@ def _deactivateProxy_api_v3_x(options): else: errorCode = 0 if not options.quiet: - sys.stdout.write("Red Hat Proxy successfully deactivated.\n") + sys.stdout.write("Spacewalk Proxy successfully deactivated.\n") return (errorCode, errorString) def _activateProxy_api_v3_x(options): @@ -329,7 +329,7 @@ def _activateProxy_api_v3_x(options): else: errorCode = 0 if not options.quiet: - sys.stdout.write("Red Hat Proxy successfully activated.\n") + sys.stdout.write("Spacewalk Proxy successfully activated.\n") return (errorCode, errorString) def createMonitoringScout(options): @@ -378,7 +378,7 @@ def activateProxy(options): if errorCode != 0: if not errorString: errorString = ("An unknown error occured. Consult with your Red Hat representative.\n") - sys.stderr.write("\nThere was a problem activating the Red Hat Proxy entitlement:\n%s\n" % errorString) + sys.stderr.write("\nThere was a problem activating the Spacewalk Proxy entitlement:\n%s\n" % errorString) sys.exit(abs(errorCode)) def listAvailableProxyChannels(options): @@ -440,7 +440,7 @@ def processCommandline(): Option('--no-ssl', action='store_true', help='turn off SSL (not advisable), default is on.'), Option('--version', action='store', default=defaultVersion, - help='which X.Y version of the Red Hat Proxy are you upgrading to?' + + help='which X.Y version of the Spacewalk Proxy are you upgrading to?' + ' Default is your current proxy version ('+defaultVersion+')'), Option('-m', '--enable-monitoring', action='store_true', help='enable MonitoringScout on this proxy.'), diff --git a/proxy/installer/squid.conf b/proxy/installer/squid.conf index 08818e5..fc00f0d 100644 --- a/proxy/installer/squid.conf +++ b/proxy/installer/squid.conf @@ -1,5 +1,5 @@ # squid.conf -# To be used for Red Hat Proxy servers. +# To be used for Spacewalk Proxy servers. # http_port 8080 diff --git a/proxy/proxy/Makefile.proxy b/proxy/proxy/Makefile.proxy index 56ccc67..5bf1d29 100644 --- a/proxy/proxy/Makefile.proxy +++ b/proxy/proxy/Makefile.proxy @@ -1,4 +1,4 @@ -# Makefile for building Red Hat Proxy snapshots +# Makefile for building Spacewalk Proxy snapshots # TOP = . diff --git a/proxy/proxy/apacheHandler.py b/proxy/proxy/apacheHandler.py index bc246ea..d418523 100644 --- a/proxy/proxy/apacheHandler.py +++ b/proxy/proxy/apacheHandler.py @@ -43,7 +43,7 @@ def getComponentType(req): """ Are we a 'proxy.broker' or a 'proxy.redirect'. - Checks to see if the last visited Red Hat Proxy was itself. If so, we + Checks to see if the last visited Spacewalk Proxy was itself. If so, we are a 'proxy.redirect'. If not, then we must be a 'proxy.broker'. """ diff --git a/proxy/proxy/broker/Makefile b/proxy/proxy/broker/Makefile index 2f3311d..03f9145 100644 --- a/proxy/proxy/broker/Makefile +++ b/proxy/proxy/broker/Makefile @@ -1,4 +1,4 @@ -# Makefile for the apacheServer.py for Red Hat Proxy Server. +# Makefile for the apacheServer.py for Spacewalk Proxy Server. # TOP = .. diff --git a/proxy/proxy/broker/rhnBroker.py b/proxy/proxy/broker/rhnBroker.py index dc8a5f1..b25f261 100644 --- a/proxy/proxy/broker/rhnBroker.py +++ b/proxy/proxy/broker/rhnBroker.py @@ -43,7 +43,7 @@ _PROXY_VERSION = '5.5.0' # HISTORY: '0.9.7', '3.2.0', '3.5.0', '3.6.0', '4.1.0', class BrokerHandler(SharedHandler): - """ Red Hat Proxy broker specific handler code called by rhnApache. + """ Spacewalk Proxy broker specific handler code called by rhnApache. Workflow is: Client -> Apache:Broker -> Squid -> Apache:Redirect -> Satellite @@ -234,18 +234,18 @@ class BrokerHandler(SharedHandler): # Expired/invalid auth token; go through the loop once again if error == '1003': # invalid token - msg = "Red Hat Proxy Session Token INVALID -- bad!" + msg = "Spacewalk Proxy Session Token INVALID -- bad!" log_error(msg) log_debug(0, msg) elif error == '1004': log_debug(1, - "Red Hat Proxy Session Token expired, acquiring new one.") + "Spacewalk Proxy Session Token expired, acquiring new one.") else: # this should never happen. - msg = "Red Hat Proxy login failed, error code is %s" % error + msg = "Spacewalk Proxy login failed, error code is %s" % error log_error(msg) log_debug(0, msg) raise rhnFault(1000, - _("Red Hat Proxy error (issues with proxy login). " + _("Spacewalk Proxy error (issues with proxy login). " "Please contact your system administrator.")) # Forced refresh of the proxy token @@ -254,7 +254,7 @@ class BrokerHandler(SharedHandler): # The token could not be aquired log_debug(0, "Unable to acquire proxy authentication token") raise rhnFault(1000, - _("Red Hat Proxy error (unable to acquire proxy auth token). " + _("Spacewalk Proxy error (unable to acquire proxy auth token). " "Please contact your system administrator.")) # Support for yum byte-range @@ -442,7 +442,7 @@ class BrokerHandler(SharedHandler): f = rep.get_function(funct) if not f: raise rhnFault(1000, - _("Red Hat Proxy configuration error: invalid function %s") % funct) + _("Spacewalk Proxy configuration error: invalid function %s") % funct) log_debug(3, "Calling %s(%s)" % (funct, params)) if params is None: diff --git a/proxy/proxy/broker/rhnRepository.py b/proxy/proxy/broker/rhnRepository.py index fec2917..4d71316 100644 --- a/proxy/proxy/broker/rhnRepository.py +++ b/proxy/proxy/broker/rhnRepository.py @@ -241,7 +241,7 @@ def listPackages(function, channel, version): return function(channel, version) except xmlrpclib.ProtocolError, e: errcode, errmsg = rpclib.reportError(e.headers) - raise rhnFault(1000, "Red Hat Proxy error (xmlrpclib.ProtocolError): " + raise rhnFault(1000, "SpacewalkProxy error (xmlrpclib.ProtocolError): " "errode=%s; errmsg=%s" % (errcode, errmsg)), None, sys.exc_info()[2] diff --git a/proxy/proxy/pm/rhn_package_manager.py b/proxy/proxy/pm/rhn_package_manager.py index 0480056..e9168e2 100755 --- a/proxy/proxy/pm/rhn_package_manager.py +++ b/proxy/proxy/pm/rhn_package_manager.py @@ -17,9 +17,9 @@ # Todd Warner <taw(a)redhat.com> # """\ -Management tool for the Red Hat proxy. +Management tool for the Spacewalk Proxy. -This script performs various management operations on the Red Hat proxy: +This script performs various management operations on the Spacewalk Proxy: - Creates the local directory structure needed to store local packages - Uploads packages from a given directory to the RHN servers - Optionally, once the packages are uploaded, they can be linked to (one or diff --git a/proxy/proxy/pm/rhn_package_manager.sgml b/proxy/proxy/pm/rhn_package_manager.sgml index f1fa7a9..eb0a366 100644 --- a/proxy/proxy/pm/rhn_package_manager.sgml +++ b/proxy/proxy/pm/rhn_package_manager.sgml @@ -13,7 +13,7 @@ <RefNameDiv> <RefName><command>rhn_package_manager</command></RefName> <RefPurpose> -Manages RPM packages for the Red Hat Proxy +Manages RPM packages for the Spacewalk Proxy </RefPurpose> </RefNameDiv> diff --git a/proxy/proxy/redirect/rhnRedirect.py b/proxy/proxy/redirect/rhnRedirect.py index 0f5c887..50bafe5 100644 --- a/proxy/proxy/redirect/rhnRedirect.py +++ b/proxy/proxy/redirect/rhnRedirect.py @@ -34,7 +34,7 @@ from rhn import connections # Main apache entry point for the proxy. class RedirectHandler(SharedHandler): - """ Red Hat Proxy SSL Redirect specific handler code called by rhnApache. + """ Spacewalk Proxy SSL Redirect specific handler code called by rhnApache. Workflow is: Client -> Apache:Broker -> Squid -> Apache:Redirect -> Satellite diff --git a/proxy/proxy/rhn-conf/Makefile b/proxy/proxy/rhn-conf/Makefile index 348667f..4f3ec29 100644 --- a/proxy/proxy/rhn-conf/Makefile +++ b/proxy/proxy/rhn-conf/Makefile @@ -1,4 +1,4 @@ -# Makefile for installation of the Red Hat Proxy configuration files +# Makefile for installation of the Spacewalk Proxy configuration files # # what is the backend top dir diff --git a/proxy/proxy/rhnAuthCacheClient.py b/proxy/proxy/rhnAuthCacheClient.py index 7b29cfb..d781910 100644 --- a/proxy/proxy/rhnAuthCacheClient.py +++ b/proxy/proxy/rhnAuthCacheClient.py @@ -92,7 +92,7 @@ class Shelf: Make sure it is started on %s""" % str(self.serverAddr)) # FIXME: PROBLEM: this rhnFault will never reach the client raise rhnFault(1000, - _("Red Hat Proxy error (issues connecting to auth cache). " + _("Spacewalk Proxy error (issues connecting to auth cache). " "Please contact your system administrator")), None, sys.exc_info()[2] wfile = sock.makefile("w") @@ -114,7 +114,7 @@ class Shelf: Make sure the authentication cache daemon is started""") # FIXME: PROBLEM: this rhnFault will never reach the client raise rhnFault(1000, - _("Red Hat Proxy error (issues connecting to auth cache). " + _("Spacewalk Proxy error (issues connecting to auth cache). " "Please contact your system administrator")), None, sys.exc_info()[2] wfile.close() @@ -132,7 +132,7 @@ class Shelf: Make sure the authentication cache daemon is started""") # FIXME: PROBLEM: this rhnFault will never reach the client raise rhnFault(1000, - _("Red Hat Proxy error (issues communicating to auth cache). " + _("Spacewalk Proxy error (issues communicating to auth cache). " "Please contact your system administrator")), None, sys.exc_info()[2] except Fault, e: rfile.close() diff --git a/proxy/proxy/rhnConstants.py b/proxy/proxy/rhnConstants.py index 98ffb68..7029a98 100644 --- a/proxy/proxy/rhnConstants.py +++ b/proxy/proxy/rhnConstants.py @@ -13,11 +13,11 @@ # granted to use or replicate Red Hat trademarks that are incorporated # in this software or its documentation. ## -# rhnDefines.py - Constants used throughout the Red Hat Proxy. +# rhnDefines.py - Constants used throughout the Spacewalk Proxy. #----------------------------------------------------------------------------- # -"""Constants used by the Red Hat Proxy""" +"""Constants used by the Spacewalk Proxy""" # HTTP Headers diff --git a/proxy/proxy/rhnProxyAuth.py b/proxy/proxy/rhnProxyAuth.py index d2ca672..0f0599d 100644 --- a/proxy/proxy/rhnProxyAuth.py +++ b/proxy/proxy/rhnProxyAuth.py @@ -1,4 +1,4 @@ -# Red Hat Proxy Server authentication manager. +# Spacewalk Proxy Server authentication manager. # # Copyright (c) 2008--2012 Red Hat, Inc. # @@ -73,7 +73,7 @@ class ProxyAuth: if not os.access(ProxyAuth.__systemid_filename, os.R_OK): log_error("unable to access %s" % ProxyAuth.__systemid_filename) raise rhnFault(1000, - _("Red Hat Proxy error (Red Hat Proxy systemid has wrong permissions?). " + _("Spacewalk Proxy error (Spacewalk Proxy systemid has wrong permissions?). " "Please contact your system administrator.")) mtime = None @@ -82,7 +82,7 @@ class ProxyAuth: except IOError, e: log_error("unable to stat %s: %s" % (ProxyAuth.__systemid_filename, repr(e))) raise rhnFault(1000, - _("Red Hat Proxy error (Red Hat Proxy systemid has wrong permissions?). " + _("Spacewalk Proxy error (Spacewalk Proxy systemid has wrong permissions?). " "Please contact your system administrator.")), None, sys.exc_info()[2] if not self.__systemid_mtime: @@ -99,7 +99,7 @@ class ProxyAuth: except IOError, e: log_error("unable to read %s" % ProxyAuth.__systemid_filename) raise rhnFault(1000, - _("Red Hat Proxy error (Red Hat Proxy systemid has wrong permissions?). " + _("Spacewalk Proxy error (Spacewalk Proxy systemid has wrong permissions?). " "Please contact your system administrator.")), None, sys.exc_info()[2] # get serverid @@ -154,7 +154,7 @@ problems, isn't running, or the token is somehow corrupt. """) % self.__serverid Traceback("ProxyAuth.set_cached_token", extra=text) raise rhnFault(1000, - _("Red Hat Proxy error (auth caching issue). " + _("Spacewalk Proxy error (auth caching issue). " "Please contact your system administrator.")), None, sys.exc_info()[2] log_debug(4, "successfully returning") return token @@ -184,7 +184,7 @@ problems, isn't running, or the token is somehow corrupt. DESIGN NOTES: what is the proxy auth token? ------------------------------------------- - An Red Hat Proxy auth token is a token fetched upon login from + An Spacewalk Proxy auth token is a token fetched upon login from Red Hat Satellite or hosted. It has this format: @@ -197,16 +197,16 @@ problems, isn't running, or the token is somehow corrupt. SIG = signature H = hostname (important later) - Within this function within the Red Hat Proxy Broker we also tag on + Within this function within the Spacewalk Proxy Broker we also tag on the hostname to the end of the token. The token as described above is enough for authentication purposes, but we need a to identify - the exact hostname (as the Red Hat Proxy sees it). So now the token + the exact hostname (as the Spacewalk Proxy sees it). So now the token becomes (token:hostname): 'S:U:ST:EO:SIG:H' DESIGN NOTES: what is X-RHN-Proxy-Auth? ------------------------------------------- - This is where we use the auth token beyond Red Hat Proxy login + This is where we use the auth token beyond Spacewalk Proxy login purposes. This a header used to track request routes through a hierarchy of RHN Proxies. @@ -291,12 +291,12 @@ problems, isn't running, or the token is somehow corrupt. # coming through") raise rhnFault(e.faultCode, e.faultString), None, sys.exc_info()[2] # ok... it's some other fault - Traceback("ProxyAuth.login (Fault) - Red hat Proxy not " + Traceback("ProxyAuth.login (Fault) - Spacewalk Proxy not " "able to log in.") # And raise a Proxy Error - the server made its point loud and # clear raise rhnFault(1000, - _("Red Hat Proxy error (during proxy login). " + _("Spacewalk Proxy error (during proxy login). " "Please contact your system administrator.")), None, sys.exc_info()[2] except Exception, e: token = None @@ -311,11 +311,11 @@ problems, isn't running, or the token is somehow corrupt. if error: if error[0] in ('xmlrpclib.ProtocolError', 'socket.error', 'socket'): raise rhnFault(1000, - _("Red Hat Proxy error (error: %s). " + _("Spacewalk Proxy error (error: %s). " "Please contact your system administrator.") % error[0]) if error[0] in ('rhn.SSL.SSL.Error', 'socket.sslerror'): raise rhnFault(1000, - _("Red Hat Proxy error (SSL issues? Error: %s). " + _("Spacewalk Proxy error (SSL issues? Error: %s). " "Please contact your system administrator.") % error[0]) else: raise rhnFault(1002, err_text='%s' % e) @@ -357,9 +357,9 @@ problems, isn't running, or the token is somehow corrupt. if not os.access(CFG.CA_CHAIN, os.R_OK): log_error('ERROR: missing or cannot access (for ca_chain): %s' % CFG.CA_CHAIN) raise rhnFault(1000, - _("Red Hat Proxy error (file access issues). " + _("Spacewalk Proxy error (file access issues). " "Please contact your system administrator. " - "Please refer to Red Hat Proxy logs.")) + "Please refer to Spacewalk Proxy logs.")) serverObj.add_trusted_cert(CFG.CA_CHAIN) serverObj.add_header('X-RHN-Client-Version', 2) return serverObj diff --git a/proxy/proxy/rhnShared.py b/proxy/proxy/rhnShared.py index 82ddb16..67ffe89 100644 --- a/proxy/proxy/rhnShared.py +++ b/proxy/proxy/rhnShared.py @@ -1,4 +1,4 @@ -# Shared (Red Hat Proxy/Redirect) handler code called by rhnApache. +# Shared (Spacewalk Proxy/Redirect) handler code called by rhnApache. # # Copyright (c) 2008--2012 Red Hat, Inc. # @@ -123,7 +123,7 @@ class SharedHandler: log_error("Error opening connection", self.rhnParent, e) Traceback(mail=0) raise rhnFault(1000, - _("Red Hat Proxy could not successfully connect its RHN parent. " + _("Spacewalk Proxy could not successfully connect its RHN parent. " "Please contact your system administrator.")), None, sys.exc_info()[2] # At this point the server should be okay @@ -207,12 +207,12 @@ class SharedHandler: # XXX: why are we not mailing this out??? Traceback("SharedHandler._serverCommo", self.req, mail=0) raise rhnFault(1000, _( - "Red Hat Proxy error: connection with the RHN server failed")), None, sys.exc_info()[2] + "Súacewalk Proxy error: connection with the Spacewalk server failed")), None, sys.exc_info()[2] except socket.error: # maybe self.req.read() failed? Traceback("SharedHandler._serverCommo", self.req) raise rhnFault(1000, _( - "Red Hat Proxy error: connection with the RHN server failed")), None, sys.exc_info()[2] + "Spacewalk Proxy error: connection with the Spacewalk server failed")), None, sys.exc_info()[2] log_debug(2, "HTTP status code (200 means all is well): %s" % status) commit 07193c5287c5b2796acc68c72a26645c9077bf3a Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Mon Aug 5 11:02:58 2013 +0200 Branding clean-up of proxy stuff in java dir diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java index 3943cce..ddf1c9b 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 @@ -400,7 +400,7 @@ public class DownloadFile extends DownloadAction { KickstartHelper helper = new KickstartHelper(request); if (helper.isProxyRequest()) { // Search/replacing all instances of cobbler host with host - // we pass in, for use with Red Hat Proxy. + // we pass in, for use with Spacewalk Proxy. output = output.replaceAll(ConfigDefaults.get().getCobblerHost(), helper.getForwardedHost()); } diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml index f87e4c4..73ba5ae 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml @@ -20111,8 +20111,8 @@ given channel.</source> <target>@@PRODUCT_NAME@@ ইনস্টলেশন সহায়িকা</target> </trans-unit> <trans-unit id="help.jsp.proxy"> - <source>Detailed information regarding Red Hat Proxy server.</source> - <target>Red Hat Proxy সার্ভার সংক্রান্ত বিস্তারিত তথ্য।</target> + <source>Detailed information regarding @@PRODUCT_NAME@@ Proxy server.</source> + <target>@@PRODUCT_NAME@@ Proxy সার্ভার সংক্রান্ত বিস্তারিত তথ্য।</target> </trans-unit> <trans-unit id="help.jsp.proxy.title"> <source>Proxy Guide</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml index d7a4c0f..ebc3c62 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml @@ -24335,8 +24335,8 @@ für einen angegebenen Channel aufgelistet wird.</target> <target>@@PRODUCT_NAME@@ Installationshandbuch</target> </trans-unit> <trans-unit id="help.jsp.proxy"> - <source>Detailed information regarding Red Hat Proxy server.</source> - <target>Detaillierte Informationen über den Red Hat Proxy Server.</target> + <source>Detailed information regarding @@PRODUCT_NAME@@ Proxy server.</source> + <target>Detaillierte Informationen über den @@PRODUCT_NAME@@ Proxy Server.</target> </trans-unit> <trans-unit id="help.jsp.proxy.title"> <source>Proxy Guide</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml index 9106660..0375634 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml @@ -18642,7 +18642,7 @@ given channel.</source> <source>@@PRODUCT_NAME@@ Installation Guide</source> </trans-unit> <trans-unit id="help.jsp.proxy"> - <source>Detailed information regarding Red Hat Proxy server.</source> + <source>Detailed information regarding @@PRODUCT_NAME@@ Proxy server.</source> </trans-unit> <trans-unit id="help.jsp.proxy.title"> <source>Proxy Guide</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml index 819cc38..80d1b3b 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml @@ -24331,7 +24331,7 @@ given channel.</source> <target>Guía de instalación de @@PRODUCT_NAME@@</target> </trans-unit> <trans-unit id="help.jsp.proxy"> - <source>Detailed information regarding Red Hat Proxy server.</source> + <source>Detailed information regarding @@PRODUCT_NAME@@ Proxy server.</source> <target>Información detallada sobre el servidor proxy de Red Hat.</target> </trans-unit> <trans-unit id="help.jsp.proxy.title"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml index 734777d..ee89f46 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml @@ -24331,7 +24331,7 @@ fois pour un canal donné.</target> <target>Guide d'installation de @@PRODUCT_NAME@@</target> </trans-unit> <trans-unit id="help.jsp.proxy"> - <source>Detailed information regarding Red Hat Proxy server.</source> + <source>Detailed information regarding @@PRODUCT_NAME@@ Proxy server.</source> <target>Informations détaillées sur le serveur proxy @@PRODUCT_NAME@@</target> </trans-unit> <trans-unit id="help.jsp.proxy.title"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml index 81b4412..045f86f 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml @@ -20113,7 +20113,7 @@ given channel.</source> <target>@@PRODUCT_NAME@@ સ્થાપન માર્ગદર્શિકા</target> </trans-unit> <trans-unit id="help.jsp.proxy"> - <source>Detailed information regarding Red Hat Proxy server.</source> + <source>Detailed information regarding @@PRODUCT_NAME@@ Proxy server.</source> <target>Red Hat પ્રોક્સી સર્વરને સંબંધિત વિગતવાર જાણકારી.</target> </trans-unit> <trans-unit id="help.jsp.proxy.title"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml index d83716a..e0f8221 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml @@ -20113,7 +20113,7 @@ given channel.</source> <target>@@PRODUCT_NAME@@ अधिष्ठापन गाइड</target> </trans-unit> <trans-unit id="help.jsp.proxy"> - <source>Detailed information regarding Red Hat Proxy server.</source> + <source>Detailed information regarding @@PRODUCT_NAME@@ Proxy server.</source> <target>Red Hat प्रॉक्सी सर्वर के बारे में विस्तृत सूचना.</target> </trans-unit> <trans-unit id="help.jsp.proxy.title"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml index ed5d069..ca1df39 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml @@ -24263,8 +24263,8 @@ stesso pacchetto in un singolo canale, ciò potrebbe causare però il <target>@@PRODUCT_NAME@@ Installation Guide</target> </trans-unit> <trans-unit id="help.jsp.proxy"> - <source>Detailed information regarding Red Hat Proxy server.</source> - <target>Informazioni dettagliate relative al Red Hat Proxy server.</target> + <source>Detailed information regarding @@PRODUCT_NAME@@ Proxy server.</source> + <target>Informazioni dettagliate relative al @@PRODUCT_NAME@@ Proxy server.</target> </trans-unit> <trans-unit id="help.jsp.proxy.title"> <source>Proxy Guide</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml index f00369d..b83df4d 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml @@ -24304,7 +24304,7 @@ given channel.</source> <target>@@PRODUCT_NAME@@ インストールガイド</target> </trans-unit> <trans-unit id="help.jsp.proxy"> - <source>Detailed information regarding Red Hat Proxy server.</source> + <source>Detailed information regarding @@PRODUCT_NAME@@ Proxy server.</source> <target>Red Hat プロキシサーバーに関しての詳細が記載されています。</target> </trans-unit> <trans-unit id="help.jsp.proxy.title"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml index 3ed8005..4cbabc5 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml @@ -24313,8 +24313,8 @@ given channel.</source> <target>@@PRODUCT_NAME@@ 설치 가이드 </target> </trans-unit> <trans-unit id="help.jsp.proxy"> - <source>Detailed information regarding Red Hat Proxy server.</source> - <target>Red Hat Proxy 서버 관련 상세 정보 </target> + <source>Detailed information regarding @@PRODUCT_NAME@@ Proxy server.</source> + <target>@@PRODUCT_NAME@@ Proxy 서버 관련 상세 정보 </target> </trans-unit> <trans-unit id="help.jsp.proxy.title"> <source>Proxy Guide</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml index 3967a42..bc4f78a 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml @@ -20112,7 +20112,7 @@ given channel.</source> <target>@@PRODUCT_NAME@@ ਇੰਸਟਾਲੇਸ਼ਨ ਗਾਈਡ</target> </trans-unit> <trans-unit id="help.jsp.proxy"> - <source>Detailed information regarding Red Hat Proxy server.</source> + <source>Detailed information regarding @@PRODUCT_NAME@@ Proxy server.</source> <target>Red Hat ਪਰਾਕਸੀ ਸਰਵਰ ਸਬੰਧੀ ਵਿਸਥਾਰ ਜਾਣਕਾਰੀ।</target> </trans-unit> <trans-unit id="help.jsp.proxy.title"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml index f8756e4..7b152a1 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml @@ -24331,8 +24331,8 @@ given channel.</source> <target>Guia de Instalação do @@PRODUCT_NAME@@</target> </trans-unit> <trans-unit id="help.jsp.proxy"> - <source>Detailed information regarding Red Hat Proxy server.</source> - <target>Informações detalhadas a respeito do Red Hat Proxy server</target> + <source>Detailed information regarding @@PRODUCT_NAME@@ Proxy server.</source> + <target>Informações detalhadas a respeito do @@PRODUCT_NAME@@ Proxy server</target> </trans-unit> <trans-unit id="help.jsp.proxy.title"> <source>Proxy Guide</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml index 6710340..f206993 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml @@ -24309,8 +24309,8 @@ given channel.</source> <target>Руководство по установке @@PRODUCT_NAME@@</target> </trans-unit> <trans-unit id="help.jsp.proxy"> - <source>Detailed information regarding Red Hat Proxy server.</source> - <target>Подробная информация о сервере Red Hat Proxy.</target> + <source>Detailed information regarding @@PRODUCT_NAME@@ Proxy server.</source> + <target>Подробная информация о сервере @@PRODUCT_NAME@@ Proxy.</target> </trans-unit> <trans-unit id="help.jsp.proxy.title"> <source>Proxy Guide</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml index 641034a..0bca4dd 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml @@ -20111,7 +20111,7 @@ given channel.</source> <target>@@PRODUCT_NAME@@ நிறுவல் கையேடு</target> </trans-unit> <trans-unit id="help.jsp.proxy"> - <source>Detailed information regarding Red Hat Proxy server.</source> + <source>Detailed information regarding @@PRODUCT_NAME@@ Proxy server.</source> <target>Red Hat பதிலாள் சேவையகம் தொடர்பான விரிவான தகவல்.</target> </trans-unit> <trans-unit id="help.jsp.proxy.title"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml index 153e228..1b3cc88 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml @@ -24324,8 +24324,8 @@ given channel.</source> <target>@@PRODUCT_NAME@@ 安装指南</target> </trans-unit> <trans-unit id="help.jsp.proxy"> - <source>Detailed information regarding Red Hat Proxy server.</source> - <target>有关 Red Hat Proxy 服务器的详细信息。</target> + <source>Detailed information regarding @@PRODUCT_NAME@@ Proxy server.</source> + <target>有关 @@PRODUCT_NAME@@ Proxy 服务器的详细信息。</target> </trans-unit> <trans-unit id="help.jsp.proxy.title"> <source>Proxy Guide</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml index 3972a18..b9bf288 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml @@ -24324,7 +24324,7 @@ given channel.</source> <target>@@PRODUCT_NAME@@ 安裝指南</target> </trans-unit> <trans-unit id="help.jsp.proxy"> - <source>Detailed information regarding Red Hat Proxy server.</source> + <source>Detailed information regarding @@PRODUCT_NAME@@ Proxy server.</source> <target>有關於 Red Hat 代理伺服器上的詳細資訊。</target> </trans-unit> <trans-unit id="help.jsp.proxy.title"> diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java index 80b7789..e31e3ef 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 @@ -97,7 +97,7 @@ public class ProxyHandler extends BaseHandler { User owner = server.getCreator(); SatCluster scout = SatClusterFactory.createSatCluster(owner); - scout.setDescription("Red Hat Proxy" + " " + + scout.setDescription("Proxy" + " " + server.getHostname() + " (" + server.getId() + ")"); scout.setVip(server.getIpAddress()); diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java index 18e3209..9a3fe9a 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java @@ -742,7 +742,7 @@ public class KickstartFormatter { } String up2datehost = REDHAT_MGMT_SERVER; - //check if server going through Red Hat Proxy, if so, register through proxy instead + //check if server going through Spacewalk Proxy, if so, register through proxy instead if (this.session != null && this.session.getSystemRhnHost() != null && !this.session.getSystemRhnHost().equals("unknown")) { diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java index 49f6915..3fb62ff 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java @@ -82,7 +82,7 @@ public class KickstartManager extends BaseManager { public String renderKickstart(String host, String url) { String retval = renderKickstart(url); // Search/replacing all instances of cobbler host with host - // we pass in, for use with Red Hat Proxy. + // we pass in, for use with Spacewalk Proxy. retval = retval.replaceAll(ConfigDefaults.get().getCobblerHost(), host); return retval; } commit 9da78bb54f499f6757ad7cb2b0c7c4d3ec261529 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Mon Aug 5 11:02:49 2013 +0200 Branding clean-up of proxy stuff in client dir diff --git a/client/rhel/rhn-client-tools/data/rh_register.glade b/client/rhel/rhn-client-tools/data/rh_register.glade index 951b773..d3b2ba7 100644 --- a/client/rhel/rhn-client-tools/data/rh_register.glade +++ b/client/rhel/rhn-client-tools/data/rh_register.glade @@ -176,7 +176,7 @@ You may access the software update tool by running <b>Software Update</ <child> <widget class="GtkLabel" id="chooseServerLabel"> <property name="visible">True</property> - <property name="label" translatable="yes">I'd like to register with an Red Hat Satellite or Red Hat Proxy</property> + <property name="label" translatable="yes">I'd like to register with an Red Hat Satellite or Red Hat Satellite Proxy</property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -191,7 +191,7 @@ You may access the software update tool by running <b>Software Update</ <property name="single_line_mode">False</property> <property name="angle">0</property> <accessibility> - <atkproperty name="AtkObject::accessible_name" translatable="yes">I'd like to register with an Red Hat Satellite or Red Hat Proxy</atkproperty> + <atkproperty name="AtkObject::accessible_name" translatable="yes">I'd like to register with an Red Hat Satellite or Red Hat Satellite Proxy</atkproperty> </accessibility> </widget> <packing> @@ -1300,7 +1300,7 @@ You may access the software update tool by running <b>Software Update</ <child> <widget class="GtkLabel" id="label152"> <property name="visible">True</property> - <property name="label" translatable="yes">• The address of an Red Hat Satellite or Red Hat Proxy</property> + <property name="label" translatable="yes">• The address of an Red Hat Satellite or Red Hat Satellite Proxy</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py index 027a27f..1b86b1f 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py @@ -132,7 +132,7 @@ SYSTEM_ALREADY_REGISTERED_CONT = _("Are you sure you would like to continue?") RHSM_SYSTEM_ALREADY_REGISTERED = _("This system has already been registered with RHN Classic/Red Hat Satellite" " using Red Hat certficate-based technology.\n\n" "The tool you are using is attempting to re-register " - "using Red Hat Satellite or Red Hat Proxy technology. Red Hat recommends " + "using Red Hat Satellite or Red Hat Satellite Proxy technology. Red Hat recommends " "(except in a few cases) that customers only register with Red Hat Satellie once.\n\n" "To learn more about RHN Classic/Red Hat Satellite registration and technologies please consult this" " Knowledge Base Article: https://access.redhat.com/kb/docs/DOC-45563") @@ -238,7 +238,7 @@ ACTIVATION_KEY = _("Universal default activation key detected\n" "A universal default activation key was detected in your account. " "This means that a set of properties (software channel subscriptions, " "package installations, system group memberships, etc.) " - "for your system's connection to Red Hat Satellite or Red Hat Proxy" + "for your system's connection to Red Hat Satellite or Red Hat Satellite Proxy" "have been determined by the activation key rather than your " "installation number. " "You may also refer to the RHN Reference Guide, section 6.4.6 for more details " diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py b/client/rhel/yum-rhn-plugin/rhnplugin.py index 0d3e80a..3d33dc3 100644 --- a/client/rhel/yum-rhn-plugin/rhnplugin.py +++ b/client/rhel/yum-rhn-plugin/rhnplugin.py @@ -85,7 +85,7 @@ def init_hook(conduit): proxy_dict = {'HTTPS' : proxy_url} except BadProxyConfig: rhn_enabled = False - PROXY_ERROR = _("There was an error parsing the Red Hat Proxy settings.") + PROXY_ERROR = _("There was an error parsing the Red Hat Satellite Proxy settings.") conduit.error(0, PROXY_ERROR + "\n" + RHN_DISABLED) return diff --git a/client/tools/osad/osad-conf/osad.conf b/client/tools/osad/osad-conf/osad.conf index ab4bbf8..7836437 100644 --- a/client/tools/osad/osad-conf/osad.conf +++ b/client/tools/osad/osad-conf/osad.conf @@ -46,7 +46,7 @@ rhn_check_command = /usr/sbin/rhn_check # By default we only use the first jabber server. # Turn the enable_failover option to 1 if you want the connections -# to try Satellite's jabberd if Red Hat Proxy's is not available. +# to try Satellite's jabberd if Proxy's is not available. enable_failover = 0 # Enable kernel keepalive timer on the osad client side socket diff --git a/client/tools/rhnpush/rhnpush.py b/client/tools/rhnpush/rhnpush.py index 0a8bfe8..5f5fcbd 100755 --- a/client/tools/rhnpush/rhnpush.py +++ b/client/tools/rhnpush/rhnpush.py @@ -16,9 +16,9 @@ # # $Id$ """ -Management tool for the Red Hat Proxy. +Management tool for the Spacewalk Proxy. -This script performs various management operations on the Red Hat Proxy: +This script performs various management operations on the Spacewalk Proxy: - Creates the local directory structure needed to store local packages - Uploads packages from a given directory to the RHN servers - Optionally, once the packages are uploaded, they can be linked to (one or commit 52bf89ca4fc2e4dce7486d67e67d6894c7a2bc9c Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Mon Aug 5 11:02:43 2013 +0200 Branding clean-up of proxy stuff in backend dir diff --git a/backend/common/rhnApache.py b/backend/common/rhnApache.py index 196904b..981bb72 100644 --- a/backend/common/rhnApache.py +++ b/backend/common/rhnApache.py @@ -13,7 +13,7 @@ # in this software or its documentation. # # Code for the shared apache handler class inherited by the -# Red Hat Proxy and server. +# Spacewalk Proxy and server. # # system module imports @@ -124,7 +124,7 @@ class rhnApache: return apache.OK def _set_proxy_info(self, req): - """ Red Hat Proxy stuff. """ + """ Spacewalk Proxy stuff. """ proxyVersion = 'X-RHN-Proxy-Version' if req.headers_in.has_key(proxyVersion): self.proxyVersion = req.headers_in[proxyVersion] diff --git a/backend/common/rhnException.py b/backend/common/rhnException.py index dddae59..a8aaf3d 100644 --- a/backend/common/rhnException.py +++ b/backend/common/rhnException.py @@ -35,7 +35,7 @@ templateValues = { # for the eye of the beholder # DOMAINS: # 0-999: Red Hat client/client-like interaction errors -# 1000-1999: Red Hat Proxy specific interaction errors +# 1000-1999: Proxy specific interaction errors # 2000-2999: Red Hat Satellite specific interation errors FaultArray = { @@ -174,17 +174,17 @@ maximum membership exceeded"), 800: _("System Name cannot be less than 3 characters"), - # 1000-1999: Red Hat Proxy specific errors: - # issued by a Red Hat Proxy to the client - 1000: _("Red Hat Proxy error."), - 1001: _("Red Hat Proxy unable to login."), + # 1000-1999: Proxy specific errors: + # issued by a Proxy to the client + 1000: _("Spacewalk Proxy error."), + 1001: _("Spacewalk Proxy unable to login."), # issued by a Red Hat Server/Satellite to the proxy 1002: _(""" - Red Hat Proxy system ID does not match a Red Hat Proxy Server + Spacewalk Proxy system ID does not match a Spacewalk Proxy Server in the database. """), - 1003: _("Red Hat Proxy session token is invalid."), - 1004: _("Red Hat Proxy session token has expired."), + 1003: _("Spacewalk Proxy session token is invalid."), + 1004: _("Spacewalk Proxy session token has expired."), # 2000-2999: Red Hat Satellite specific errors: diff --git a/backend/server/apacheAuth.py b/backend/server/apacheAuth.py index a3ac614..a33e571 100644 --- a/backend/server/apacheAuth.py +++ b/backend/server/apacheAuth.py @@ -36,7 +36,7 @@ def splitProxyAuthToken(token): hostname = token[-1] token = token[:-1] else: - # Red Hat Proxy v1.1 (route tracking unsupported) + # Spacewalk Proxy v1.1 (route tracking unsupported) hostname = None return token, hostname diff --git a/backend/server/handlers/xmlrpc/proxy.py b/backend/server/handlers/xmlrpc/proxy.py index 0f7fa78..85ea65d 100644 --- a/backend/server/handlers/xmlrpc/proxy.py +++ b/backend/server/handlers/xmlrpc/proxy.py @@ -57,7 +57,7 @@ class rhnProxyHandler(rhnHandler): # we require entitlement for this functionality log_error("Server not entitled for Proxy", self.server_id) raise rhnFault(1002, _( - 'Red Hat Proxy service not enabled for server profile: "%s"') + 'Spacewalk Proxy service not enabled for server profile: "%s"') % server.server["name"]) # we're fine... return server @@ -115,7 +115,7 @@ class Proxy(rhnProxyHandler): """ Login routine for the proxy Return a formatted string of session token information as regards - an Red Hat Proxy. Also sets this information in the headers. + an Spacewalk Proxy. Also sets this information in the headers. NOTE: design description for the auth token format and how it is is used is well documented in the proxy/broker/rhnProxyAuth.py diff --git a/backend/server/rhn.conf.sample b/backend/server/rhn.conf.sample index a2a6750..f7bd346 100644 --- a/backend/server/rhn.conf.sample +++ b/backend/server/rhn.conf.sample @@ -20,7 +20,7 @@ # proxy.traceback_mail = yyy(a)redhat.com # All proxy (broker & redirect) emails # # go to yyy(a)redhat.com now (overriding # # xxx(a)redhat.com). -# proxy.broker.debug = 4 # Red Hat Proxy broker now runs at debug level 4, but +# proxy.broker.debug = 4 # Spacewalk Proxy broker now runs at debug level 4, but # # redirect and auth_cache still run at debug level 3 @@ -117,7 +117,7 @@ web.rhnproc_port = #FIXME # traceback_mail = user0(a)company.com, user1(a)company.com # NOTE: any options with a comma indicates a list of items. # -# quiet_mail - The two main components of the Red Hat Proxy Solution (broker +# quiet_mail - The two main components of the Spacewalk Proxy Solution (broker # and redirect) use Apache extensively. As Apache reuses # processes, sometimes an error may occurs that generates # multiple copies of the same "traceback". The quiet_mail diff --git a/backend/server/rhnServer/server_route.py b/backend/server/rhnServer/server_route.py index c49f20d..a46d413 100644 --- a/backend/server/rhnServer/server_route.py +++ b/backend/server/rhnServer/server_route.py @@ -55,7 +55,7 @@ def store_client_route(server_id): for token in tokens: token, hostname = apacheAuth.splitProxyAuthToken(token) if hostname is None: - log_debug(3, "NOTE: Red Hat Proxy v1.1 detected - route tracking is unsupported") + log_debug(3, "NOTE: Spacewalk Proxy v1.1 detected - route tracking is unsupported") newRoute = [] break newRoute.append((token[0], hostname))

10 years, 9 months

1
0
0 / 0

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

by Tomáš Kašpárek

Tag 'spacewalk-java-2.0.5-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-08-05 07:26 +0000 Tagging package [spacewalk-java] version [2.0.5-1] in directory [java/]. Changes since spacewalk-utils-2.0.3-1: Tomas Kasparek (4): Revert "Automatic commit of package [spacewalk-java] release [2.0.4-1]." Revert "987977 - Fix there-can-be-solaris issue and make Upgrade behave like everything else" Revert "987977 - Fix chaining of pkg-scheduling in SSM" Automatic commit of package [spacewalk-java] release [2.0.5-1]. --- java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml | 15 - java/code/src/com/redhat/rhn/domain/action/script/ScriptAction.java | 4 java/code/src/com/redhat/rhn/frontend/action/schedule/PendingActionsDeleteConfirmAction.java | 40 ++- java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java | 17 - java/code/src/com/redhat/rhn/frontend/events/SsmPackagesAction.java | 90 +++---- java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java | 10 java/code/src/com/redhat/rhn/frontend/taglibs/list/SelectableColumnTag.java | 23 -- java/code/src/com/redhat/rhn/frontend/taglibs/rhn-list.tld | 113 ++++------ java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf | 28 +- java/spacewalk-java.spec | 8 rel-eng/packages/spacewalk-java | 2 11 files changed, 157 insertions(+), 193 deletions(-) ---

10 years, 9 months

1
0
0 / 0

Branch 'SPACEWALK-2.0' - java/spacewalk-java.spec rel-eng/packages

by Tomáš Kašpárek

java/spacewalk-java.spec | 13 ++++++++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) New commits: commit 2d5b2697335d600376eaf3ec81449eda056ff842 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Mon Aug 5 09:26:44 2013 +0200 Automatic commit of package [spacewalk-java] release [2.0.5-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 1963d16..1b49fae 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.0.3 +Version: 2.0.5 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -771,6 +771,17 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Mon Aug 05 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.0.5-1 +- Revert "987977 - Fix chaining of pkg-scheduling in SSM" +- Revert "987977 - Fix there-can-be-solaris issue and make Upgrade behave like + everything else" +- Revert "Automatic commit of package [spacewalk-java] release [2.0.4-1]." + +* Fri Jul 26 2013 Grant Gainey <ggainey(a)redhat.com> 2.0.4-1 +- 987977 - Fix there-can-be-solaris issue and make Upgrade behave like + everything else +- 987977 - Fix chaining of pkg-scheduling in SSM + * Fri Jul 26 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.0.3-1 - ISS: Return LookupException to getDefaultMaster() if there isn't one - 986527 - removing extra semicolon diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 06c6d1e..acd5c69 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.0.3-1 java/ +2.0.5-1 java/

10 years, 9 months

1
0
0 / 0

Branch 'SPACEWALK-2.0' - 3 commits - java/code java/spacewalk-java.spec rel-eng/packages

by Tomáš Kašpárek

java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml | 15 - java/code/src/com/redhat/rhn/domain/action/script/ScriptAction.java | 4 java/code/src/com/redhat/rhn/frontend/action/schedule/PendingActionsDeleteConfirmAction.java | 40 ++- java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java | 17 - java/code/src/com/redhat/rhn/frontend/events/SsmPackagesAction.java | 90 +++---- java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java | 10 java/code/src/com/redhat/rhn/frontend/taglibs/list/SelectableColumnTag.java | 23 -- java/code/src/com/redhat/rhn/frontend/taglibs/rhn-list.tld | 113 ++++------ java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf | 28 +- java/spacewalk-java.spec | 7 rel-eng/packages/spacewalk-java | 2 11 files changed, 151 insertions(+), 198 deletions(-) New commits: commit 42853128137c67b25a796e46b38257374178e73e Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Mon Aug 5 09:22:07 2013 +0200 Revert "987977 - Fix chaining of pkg-scheduling in SSM" This reverts commit 5ad0427f73f8a5b44af489ef7cb236555e4770a0. diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml index 4c51e03..2372097 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml @@ -19,7 +19,7 @@ SELECT EVENT_ID as ID, NULL AS history_status, NULL AS history_type, NULL AS history_type_name, - SH.details + SH.details FROM rhnServerHistory SH WHERE SH.server_id = :sid UNION @@ -31,7 +31,7 @@ SELECT EVENT_ID as ID, AStat.name AS history_status, AType.label AS history_type, AType.name AS history_type_name, - NULL AS details + NULL AS details FROM rhnActionType AType, rhnActionStatus AStat, rhnAction A @@ -94,7 +94,6 @@ order by id desc <query params="user_id, org_id"> SELECT DISTINCT UAO.id AS ID, UAO.earliest_action AS EARLIEST, - A.prerequisite AS PREREQUISITE, UAO.type_name, (CASE UAO.action_name WHEN NULL THEN UAO.type_name ELSE UAO.action_name END) AS ACTION_NAME, UAO.scheduler, @@ -103,13 +102,11 @@ SELECT DISTINCT UAO.id AS ID, (SELECT COUNT(server_id) FROM rhnServerAction WHERE action_id = UAO.id AND status = 2) AS "COMPLETED_SYSTEMS", (SELECT COUNT(server_id) FROM rhnServerAction WHERE action_id = UAO.id AND status = 3) AS "FAILED_SYSTEMS" FROM rhnUserActionOverview UAO left join - web_contact WC on UAO.scheduler = WC.id, - rhnAction A + web_contact WC on UAO.scheduler = WC.id WHERE UAO.org_id = :org_id AND UAO.user_id = :user_id AND UAO.action_status_id IN (0,1) AND UAO.archived = 0 - AND UAO.id = A.id ORDER BY EARLIEST DESC </query> <elaborator name="action_overview_elab" /> @@ -300,9 +297,9 @@ SELECT 1 <query params="parent_id, status_id, tries"> INSERT INTO rhnServerAction (server_id, action_id, status, REMAINING_TRIES) select s.id as server_id, :parent_id as action_id, - :status_id as status, :tries as REMAINING_TRIES - from rhnServer s - where s.id in (%s) + :status_id as status, :tries as REMAINING_TRIES + from rhnServer s + where s.id in (%s) </query> </write-mode> <write-mode name="add_config_rev_to_action"> diff --git a/java/code/src/com/redhat/rhn/domain/action/script/ScriptAction.java b/java/code/src/com/redhat/rhn/domain/action/script/ScriptAction.java index a0e453f..071a5eb 100644 --- a/java/code/src/com/redhat/rhn/domain/action/script/ScriptAction.java +++ b/java/code/src/com/redhat/rhn/domain/action/script/ScriptAction.java @@ -35,9 +35,7 @@ public class ScriptAction extends Action { * @param scriptActionDetailsIn The scriptActionDetails to set. */ public void setScriptActionDetails(ScriptActionDetails scriptActionDetailsIn) { - if (scriptActionDetailsIn != null) { - scriptActionDetailsIn.setParentAction(this); - } + scriptActionDetailsIn.setParentAction(this); scriptActionDetails = scriptActionDetailsIn; } diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/PendingActionsDeleteConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/PendingActionsDeleteConfirmAction.java index 5547a5b..653f856 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/schedule/PendingActionsDeleteConfirmAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/PendingActionsDeleteConfirmAction.java @@ -14,21 +14,7 @@ */ package com.redhat.rhn.frontend.action.schedule; -import java.util.LinkedList; -import java.util.List; - -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 com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.domain.action.Action; -import com.redhat.rhn.domain.action.ActionFactory; import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.rhnset.RhnSetElement; import com.redhat.rhn.domain.user.User; @@ -42,6 +28,18 @@ import com.redhat.rhn.manager.action.ActionManager; 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 org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; + +import java.util.LinkedList; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * PendingActionsConfirmAction * @version $Rev: 101893 $ @@ -67,6 +65,9 @@ public class PendingActionsDeleteConfirmAction extends RhnAction implements List return mapping.findForward(RhnHelper.DEFAULT_FORWARD); } + + + /** * {@inheritDoc} */ @@ -83,6 +84,7 @@ public class PendingActionsDeleteConfirmAction extends RhnAction implements List getSetDecl().getLabel()); } + private ActionForward cancelActions(ActionMapping mapping, HttpServletRequest request) { RequestContext requestContext = new RequestContext(request); StrutsDelegate strutsDelegate = getStrutsDelegate(); @@ -91,12 +93,14 @@ public class PendingActionsDeleteConfirmAction extends RhnAction implements List RhnSet set = getSetDecl().get(user); - List<Action> actionsToCancel = new LinkedList(); + List actionsToCancel = new LinkedList(); for (RhnSetElement element : set.getElements()) { - actionsToCancel.add(ActionFactory.lookupById(element.getElement())); + actionsToCancel.add(element.getElement()); } - ActionManager.cancelActions(user, actionsToCancel); + + ActionManager.removeActions(actionsToCancel); + ActionMessages msgs = new ActionMessages(); // If there was only one action cancelled, display the "action" cancelled @@ -118,6 +122,8 @@ public class PendingActionsDeleteConfirmAction extends RhnAction implements List set.clear(); RhnSetManager.store(set); + return mapping.findForward("success"); + } } diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java index 1369b99..8f7ba0a 100644 --- a/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java +++ b/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.Set; import com.redhat.rhn.domain.action.Action; -import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.action.SetLabels; import com.redhat.rhn.frontend.dto.EssentialServerDto; @@ -44,7 +43,7 @@ public class SsmInstallPackagesAction extends SsmPackagesAction { Long channelId = sipe.getChannelId(); List<EssentialServerDto> servers = SystemManager.systemsSubscribedToChannelInSet( - channelId, u, SetLabels.SYSTEM_LIST); + channelId, u, SetLabels.SYSTEM_LIST); // Create one action for all servers to which the packages are installed List<Long> serverIds = new LinkedList<Long>(); @@ -54,45 +53,28 @@ public class SsmInstallPackagesAction extends SsmPackagesAction { return serverIds; } - protected List<Action> doSchedule(SsmPackageEvent event, User user, List<Long> sids, - Date earliest) { + protected List<Action> doSchedule(SsmPackageEvent event, + User user, + List<Long> sids, + Date earliest) { SsmInstallPackagesEvent sipe = (SsmInstallPackagesEvent) event; Set<String> data = sipe.getPackages(); // Convert the package list to domain objects - List<PackageListItem> pkgListItems = new ArrayList<PackageListItem>(data.size()); + List<PackageListItem> packageListItems = + new ArrayList<PackageListItem>(data.size()); for (String key : data) { - pkgListItems.add(PackageListItem.parse(key)); + packageListItems.add(PackageListItem.parse(key)); } // Convert to list of maps List<Map<String, Long>> packageListData = PackageListItem - .toKeyMaps(pkgListItems); + .toKeyMaps(packageListItems); List<Action> pkgActions = ActionManager.schedulePackageInstall(user, sids, - packageListData, earliest); + packageListData, earliest); return pkgActions; } - protected Action doSchedule(SsmPackageEvent event, User user, Server s, Date earliest) { - SsmInstallPackagesEvent sipe = (SsmInstallPackagesEvent) event; - - Set<String> data = sipe.getPackages(); - // Convert the package list to domain objects - List<PackageListItem> pkgListItems = new ArrayList<PackageListItem>(data.size()); - for (String key : data) { - pkgListItems.add(PackageListItem.parse(key)); - } - - // Convert to list of maps - List<Map<String, Long>> packageListData = PackageListItem - .toKeyMaps(pkgListItems); - - Action pkgAction = ActionManager.schedulePackageInstall(user, s, - packageListData, earliest); - - return pkgAction; - } - } diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/events/SsmPackagesAction.java index 70fc767..7bb4fa9 100644 --- a/java/code/src/com/redhat/rhn/frontend/events/SsmPackagesAction.java +++ b/java/code/src/com/redhat/rhn/frontend/events/SsmPackagesAction.java @@ -14,7 +14,6 @@ */ package com.redhat.rhn.frontend.events; -import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -25,8 +24,6 @@ import com.redhat.rhn.common.messaging.EventMessage; import com.redhat.rhn.domain.action.Action; import com.redhat.rhn.domain.action.script.ScriptActionDetails; import com.redhat.rhn.domain.action.script.ScriptRunAction; -import com.redhat.rhn.domain.server.Server; -import com.redhat.rhn.domain.server.ServerFactory; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.domain.user.UserFactory; import com.redhat.rhn.manager.action.ActionManager; @@ -110,47 +107,46 @@ public abstract class SsmPackagesAction extends AbstractDatabaseAction { List<Long> serverIds = getAffectedServers(event, user); log.debug("Scheduling actions."); - // If we have a remote-cmd, have to correctly order it and the package action(s) if (event.getScriptDetails() != null) { - for (Long sid : serverIds) { - Server s = ServerFactory.lookupById(sid); - List<Long> sidList = new ArrayList<Long>(); - sidList.add(sid); - ScriptActionDetails sad = event.getScriptDetails(); - if (event.isBefore()) { - log.debug("Scheduling remote-action BEFORE."); - - ScriptRunAction sra = ActionManager.scheduleScriptRun(user, sidList, - null, sad, earliest); - ActionManager.storeAction(sra); - - Action pkgAction = doSchedule(event, user, s, earliest); - - Action prevAction = sra; - pkgAction.setPrerequisite(prevAction); - ActionManager.storeAction(pkgAction); - prevAction = pkgAction; - + ScriptActionDetails sad = event.getScriptDetails(); + if (event.isBefore()) { + log.debug("Scheduling remote-action BEFORE."); + + ScriptRunAction sra = ActionManager.scheduleScriptRun(user, serverIds, + null, sad, earliest); + ActionManager.storeAction(sra); + + List<Action> pkgActions = doSchedule(event, user, serverIds, earliest); + + // Might be more than one action from schedPkgActions + Action prevAction = sra; + for (Action a : pkgActions) { + a.setPrerequisite(prevAction); + ActionManager.storeAction(a); + prevAction = a; } - else { - log.debug("Scheduling remote-action AFTER."); - - Action pkgAction = doSchedule(event, user, s, earliest); - ScriptRunAction sra = ActionManager.scheduleScriptRun(user, sidList, - null, sad, earliest); - - // Might be more than one action from schedPkgActions - Action prevAction = null; - if (prevAction != null) { - pkgAction.setPrerequisite(prevAction); - } - ActionManager.storeAction(pkgAction); - prevAction = pkgAction; - - sra.setPrerequisite(prevAction); - ActionManager.storeAction(sra); + + } + else { + log.debug("Scheduling remote-action AFTER."); + + List<Action> pkgActions = doSchedule(event, user, serverIds, earliest); + ScriptRunAction sra = ActionManager.scheduleScriptRun(user, serverIds, + null, sad, earliest); + + // Might be more than one action from schedPkgActions + Action prevAction = null; + for (Action a : pkgActions) { + if (prevAction != null) { + a.setPrerequisite(prevAction); + } + ActionManager.storeAction(a); + prevAction = a; } + + sra.setPrerequisite(prevAction); + ActionManager.storeAction(sra); } } else { // No remote-script to schedule @@ -164,14 +160,9 @@ public abstract class SsmPackagesAction extends AbstractDatabaseAction { protected abstract List<Long> getAffectedServers(SsmPackageEvent event, User u); - protected abstract Action doSchedule(SsmPackageEvent event, + protected abstract List<Action> doSchedule(SsmPackageEvent event, User user, - Server s, + List<Long> sids, Date earliest); - protected abstract List<Action> doSchedule(SsmPackageEvent event, - User user, - List<Long> sid, - Date earliest); - } diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java b/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java index dcfdf92..c17526e 100644 --- a/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java +++ b/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java @@ -24,7 +24,6 @@ import java.util.Set; import org.apache.log4j.Logger; import com.redhat.rhn.domain.action.Action; -import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.dto.PackageListItem; import com.redhat.rhn.manager.action.ActionManager; @@ -117,36 +116,4 @@ public class SsmRemovePackagesAction extends SsmPackagesAction { return actions; } - protected Action doSchedule(SsmPackageEvent event, User user, Server s, Date earliest) { - - SsmRemovePackagesEvent srpe = (SsmRemovePackagesEvent) event; - - List<Map> result = srpe.getResult(); - - Set<PackageListItem> allPackages = new HashSet<PackageListItem>(); - - for (Map data : result) { - - // Get the packages out of the elaborator - List<Map> elabList = (List<Map>) data.get("elaborator0"); - if (elabList != null) { - for (Map elabMap : elabList) { - String idCombo = (String) elabMap.get("id_combo"); - PackageListItem item = PackageListItem.parse(idCombo); - allPackages.add(item); - } - } - } - - List<PackageListItem> allPackagesList = new ArrayList<PackageListItem>(allPackages); - List<Map<String, Long>> packageListData = PackageListItem - .toKeyMaps(allPackagesList); - - Action action = ActionManager.schedulePackageRemoval(user, s, - packageListData, earliest); - - return action; - } - - } diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java b/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java index 84b9491..5620c22 100644 --- a/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java +++ b/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.Map; import com.redhat.rhn.domain.action.Action; -import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.action.ActionManager; @@ -54,11 +53,4 @@ public class SsmUpgradePackagesAction extends SsmPackagesAction { } - protected Action doSchedule(SsmPackageEvent event, User user, Server s, Date earliest) { - - SsmUpgradePackagesEvent supe = (SsmUpgradePackagesEvent) event; - List<Map<String, Long>> packageListItems = supe.getSysPackageSet().get(s.getId()); - - return ActionManager.schedulePackageUpgrade(user, s, packageListItems, earliest); - } } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/SelectableColumnTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/SelectableColumnTag.java index cd0d989..abfe836 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/SelectableColumnTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/SelectableColumnTag.java @@ -53,7 +53,6 @@ public class SelectableColumnTag extends TagSupport { private String headerKey; private String listName; private String rhnSet; - private String hideDisabled; /** * Sets the column width @@ -112,15 +111,6 @@ public class SelectableColumnTag extends TagSupport { } /** - * Expression to determine if we should show disabled checkboxes - * @param expr "true" if we should hide disabled checkboxes, else we show them - */ - public void setHideDisabled(String expr) { - hideDisabled = expr; - } - - - /** * {@inheritDoc} */ public int doStartTag() throws JspException { @@ -230,11 +220,6 @@ public class SelectableColumnTag extends TagSupport { String id = ListTagHelper.getObjectId(getCurrent()); String checkboxId = makeCheckboxId(listName, id); renderHiddenItem(id, value); - - if (isHideDisabled() && isDisabled()) { - return; - } - ListTagUtil.write(pageContext, "<input type=\"checkbox\" "); boolean selected = isSelected(); if (selected) { @@ -414,14 +399,6 @@ public class SelectableColumnTag extends TagSupport { } return false; } - - private boolean isHideDisabled() { - if (hideDisabled != null && hideDisabled.equalsIgnoreCase("true")) { - return true; - } - return false; - } - protected void writeStartingTd() throws JspException { writeStartingTd(pageContext, styleClass, width); } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-list.tld b/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-list.tld index f145ee6..3b99555 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 @@ -16,7 +16,7 @@ <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> - <attribute> + <attribute> <name>legend</name> <required>false</required> <rtexprvalue>true</rtexprvalue> @@ -82,40 +82,40 @@ <rtexprvalue>true</rtexprvalue> </attribute> <attribute> - <name>hidepagenums</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> + <name>hidepagenums</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> <name>parentiselement</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> - <attribute> + <attribute> <name>searchparent</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> - <attribute> + <attribute> <name>searchchild</name> <required>false</required> <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <name>reflink</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <name>reflinkkey</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <name>reflinkkeyarg0</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> + </attribute> + <attribute> + <name>reflink</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>reflinkkey</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>reflinkkeyarg0</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> </tag> <tag> <name>decorator</name> @@ -221,12 +221,12 @@ <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> - <attribute> + <attribute> <name>filterattr</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> - <attribute> + <attribute> <name>filtermessage</name> <required>false</required> <rtexprvalue>true</rtexprvalue> @@ -251,7 +251,7 @@ <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> - <attribute> + <attribute> <name>headerkey</name> <required>false</required> <rtexprvalue>true</rtexprvalue> @@ -271,11 +271,6 @@ <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> - <attribute> - <name>hideDisabled</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> </tag> <tag> <name>radiocolumn</name> @@ -296,7 +291,7 @@ <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> - <attribute> + <attribute> <name>headerkey</name> <required>false</required> <rtexprvalue>true</rtexprvalue> @@ -312,37 +307,37 @@ <rtexprvalue>true</rtexprvalue> </attribute> </tag> - <tag> - <name>csv</name> - <tag-class>com.redhat.rhn.frontend.taglibs.list.CSVTag</tag-class> - <body-content>JSP</body-content> - <attribute> - <name>name</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <name>dataset</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <name>exportColumns</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <name>header</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - </tag> + <tag> + <name>csv</name> + <tag-class>com.redhat.rhn.frontend.taglibs.list.CSVTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <name>name</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>dataset</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>exportColumns</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>header</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> <function> <name>expandable</name> <function-class>com.redhat.rhn.frontend.taglibs.RhnListTagFunctions</function-class> <function-signature>boolean isExpandable(java.lang.Object)</function-signature> </function> - <function> + <function> <name>countChildren</name> <function-class>com.redhat.rhn.frontend.taglibs.RhnListTagFunctions</function-class> <function-signature>int getChildrenCount(java.lang.Object)</function-signature> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf index c0e1a91..a744fa3 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf @@ -1,15 +1,15 @@ <rl:decorator name="PageSizeDecorator"/> - <rl:decorator name="SelectableDecorator"/> + <rl:decorator name="SelectableDecorator"/> <rl:decorator name="ElaborationDecorator"/> + + <rl:selectablecolumn value="${current.selectionKey}" + selected="${current.selected}" + disabled="${not current.selectable}" + headerclass="first-column"/> - <rl:selectablecolumn value="${current.selectionKey}" - selected="${current.selected}" - disabled="${not current.selectable}" - hideDisabled="true" - headerclass="first-column"/> <rl:column sortable="true" bound="false" @@ -20,6 +20,7 @@ <a href="/rhn/schedule/CompletedSystems.do?aid=${current.id}"><c:out value="${current.actionName}" /></a> </rl:column> + <rl:column sortable="true" bound="false" headerkey="actions.jsp.earliest" @@ -29,16 +30,17 @@ <c:out value="${current.earliest}" /> </rl:column> + <rl:column sortable="false" bound="false" headerkey="actions.jsp.succeeded" styleclass="thin-column" > <c:if test="${current.completed != 0}"> - <a href="/rhn/schedule/CompletedSystems.do?aid=${current.id}">${current.completed}</a> + <a href="/rhn/schedule/CompletedSystems.do?aid=${current.id}">${current.completed}</a> </c:if> <c:if test="${current.completed == 0}"> - ${current.completed} + ${current.completed} </c:if> </rl:column> @@ -49,10 +51,10 @@ styleclass="thin-column" > <c:if test="${current.failed != 0}"> - <a href="/rhn/schedule/FailedSystems.do?aid=${current.id}">${current.failed}</a> + <a href="/rhn/schedule/FailedSystems.do?aid=${current.id}">${current.failed}</a> </c:if> <c:if test="${current.failed == 0}"> - ${current.failed} + ${current.failed} </c:if> </rl:column> @@ -64,10 +66,10 @@ styleclass="thin-column" > <c:if test="${current.inProgress != 0}"> - <a href="/rhn/schedule/InProgressSystems.do?aid=${current.id}">${current.inProgress}</a> + <a href="/rhn/schedule/InProgressSystems.do?aid=${current.id}">${current.inProgress}</a> </c:if> <c:if test="${current.inProgress == 0}"> - ${current.inProgress} + ${current.inProgress} </c:if> </rl:column> @@ -76,6 +78,6 @@ bound="false" headerkey="actions.jsp.total" styleclass="thin-column"> - ${current.tally} + ${current.tally} </rl:column> commit aa1831b1bebbd4a0f269416f8b541aa338629dac Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Mon Aug 5 09:21:59 2013 +0200 Revert "987977 - Fix there-can-be-solaris issue and make Upgrade behave like everything else" This reverts commit c1527c5ff6d774e54d6a6c9cc904bd5ea2559906. diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java index afa4b68..1369b99 100644 --- a/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java +++ b/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java @@ -22,6 +22,7 @@ import java.util.Map; import java.util.Set; import com.redhat.rhn.domain.action.Action; +import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.action.SetLabels; import com.redhat.rhn.frontend.dto.EssentialServerDto; @@ -74,4 +75,24 @@ public class SsmInstallPackagesAction extends SsmPackagesAction { return pkgActions; } + protected Action doSchedule(SsmPackageEvent event, User user, Server s, Date earliest) { + SsmInstallPackagesEvent sipe = (SsmInstallPackagesEvent) event; + + Set<String> data = sipe.getPackages(); + // Convert the package list to domain objects + List<PackageListItem> pkgListItems = new ArrayList<PackageListItem>(data.size()); + for (String key : data) { + pkgListItems.add(PackageListItem.parse(key)); + } + + // Convert to list of maps + List<Map<String, Long>> packageListData = PackageListItem + .toKeyMaps(pkgListItems); + + Action pkgAction = ActionManager.schedulePackageInstall(user, s, + packageListData, earliest); + + return pkgAction; + } + } diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/events/SsmPackagesAction.java index dc24937..70fc767 100644 --- a/java/code/src/com/redhat/rhn/frontend/events/SsmPackagesAction.java +++ b/java/code/src/com/redhat/rhn/frontend/events/SsmPackagesAction.java @@ -14,6 +14,7 @@ */ package com.redhat.rhn.frontend.events; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -24,6 +25,7 @@ import com.redhat.rhn.common.messaging.EventMessage; import com.redhat.rhn.domain.action.Action; import com.redhat.rhn.domain.action.script.ScriptActionDetails; import com.redhat.rhn.domain.action.script.ScriptRunAction; +import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.server.ServerFactory; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.domain.user.UserFactory; @@ -105,65 +107,54 @@ public abstract class SsmPackagesAction extends AbstractDatabaseAction { log.debug("Scheduling package actions."); Date earliest = event.getEarliest(); - List<Long> sids = getAffectedServers(event, user); - + List<Long> serverIds = getAffectedServers(event, user); log.debug("Scheduling actions."); - // If we have a remote-cmd, have to correctly order it and the package - // action(s) + // If we have a remote-cmd, have to correctly order it and the package action(s) if (event.getScriptDetails() != null) { - // It's possible to have non-linux servers in the list, and different Actions - // are created for them. Get the separate lists - List<Long> rhelIds = ServerFactory.listLinuxSystems(sids); - List<Long> solarisIds = ServerFactory.listSolarisSystems(sids); - - ScriptActionDetails sad = event.getScriptDetails(); - List<Action> pkgActions = doSchedule(event, user, sids, earliest); - for (Action a : pkgActions) { - + for (Long sid : serverIds) { + Server s = ServerFactory.lookupById(sid); + List<Long> sidList = new ArrayList<Long>(); + sidList.add(sid); + ScriptActionDetails sad = event.getScriptDetails(); if (event.isBefore()) { log.debug("Scheduling remote-action BEFORE."); - if (!rhelIds.isEmpty()) { - ScriptRunAction sra = ActionManager.scheduleScriptRun(user, - rhelIds, null, sad, earliest); - ActionManager.storeAction(sra); - a.setPrerequisite(sra); - ActionManager.storeAction(a); - } - - if (!solarisIds.isEmpty()) { - ScriptRunAction sra = ActionManager.scheduleScriptRun(user, - solarisIds, null, sad, earliest); - ActionManager.storeAction(sra); - a.setPrerequisite(sra); - ActionManager.storeAction(a); - } + ScriptRunAction sra = ActionManager.scheduleScriptRun(user, sidList, + null, sad, earliest); + ActionManager.storeAction(sra); + + Action pkgAction = doSchedule(event, user, s, earliest); + + Action prevAction = sra; + pkgAction.setPrerequisite(prevAction); + ActionManager.storeAction(pkgAction); + prevAction = pkgAction; + } else { log.debug("Scheduling remote-action AFTER."); - if (!rhelIds.isEmpty()) { - ScriptRunAction sra = ActionManager.scheduleScriptRun(user, - rhelIds, null, sad, earliest); - ActionManager.storeAction(a); - sra.setPrerequisite(a); - ActionManager.storeAction(sra); - } - - if (!solarisIds.isEmpty()) { - ScriptRunAction sra = ActionManager.scheduleScriptRun(user, - solarisIds, null, sad, earliest); - ActionManager.storeAction(a); - sra.setPrerequisite(a); - ActionManager.storeAction(sra); - } + Action pkgAction = doSchedule(event, user, s, earliest); + ScriptRunAction sra = ActionManager.scheduleScriptRun(user, sidList, + null, sad, earliest); + + // Might be more than one action from schedPkgActions + Action prevAction = null; + if (prevAction != null) { + pkgAction.setPrerequisite(prevAction); + } + ActionManager.storeAction(pkgAction); + prevAction = pkgAction; + + sra.setPrerequisite(prevAction); + ActionManager.storeAction(sra); } } } else { // No remote-script to schedule - doSchedule(event, user, sids, earliest); + doSchedule(event, user, serverIds, earliest); } log.debug("Done scheduling package actions."); @@ -173,6 +164,10 @@ public abstract class SsmPackagesAction extends AbstractDatabaseAction { protected abstract List<Long> getAffectedServers(SsmPackageEvent event, User u); + protected abstract Action doSchedule(SsmPackageEvent event, + User user, + Server s, + Date earliest); protected abstract List<Action> doSchedule(SsmPackageEvent event, User user, diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java b/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java index c17526e..dcfdf92 100644 --- a/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java +++ b/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java @@ -24,6 +24,7 @@ import java.util.Set; import org.apache.log4j.Logger; import com.redhat.rhn.domain.action.Action; +import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.dto.PackageListItem; import com.redhat.rhn.manager.action.ActionManager; @@ -116,4 +117,36 @@ public class SsmRemovePackagesAction extends SsmPackagesAction { return actions; } + protected Action doSchedule(SsmPackageEvent event, User user, Server s, Date earliest) { + + SsmRemovePackagesEvent srpe = (SsmRemovePackagesEvent) event; + + List<Map> result = srpe.getResult(); + + Set<PackageListItem> allPackages = new HashSet<PackageListItem>(); + + for (Map data : result) { + + // Get the packages out of the elaborator + List<Map> elabList = (List<Map>) data.get("elaborator0"); + if (elabList != null) { + for (Map elabMap : elabList) { + String idCombo = (String) elabMap.get("id_combo"); + PackageListItem item = PackageListItem.parse(idCombo); + allPackages.add(item); + } + } + } + + List<PackageListItem> allPackagesList = new ArrayList<PackageListItem>(allPackages); + List<Map<String, Long>> packageListData = PackageListItem + .toKeyMaps(allPackagesList); + + Action action = ActionManager.schedulePackageRemoval(user, s, + packageListData, earliest); + + return action; + } + + } diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java b/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java index 36cbde5..84b9491 100644 --- a/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java +++ b/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.Map; import com.redhat.rhn.domain.action.Action; +import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.action.ActionManager; @@ -48,15 +49,16 @@ public class SsmUpgradePackagesAction extends SsmPackagesAction { SsmUpgradePackagesEvent supe = (SsmUpgradePackagesEvent) event; Map<Long, List<Map<String, Long>>> packageListItems = supe.getSysPackageSet(); - List<Map<String, Long>> pkgs = new ArrayList<Map<String, Long>>(); - for (List<Map<String, Long>> pkgList : packageListItems.values()) { - for (Map<String, Long> pkg : pkgList) { - pkgs.add(pkg); - } - } - return ActionManager.schedulePackageInstall(user, sids, pkgs, earliest); + return ActionManager.schedulePackageUpgrades(user, packageListItems, earliest); } + protected Action doSchedule(SsmPackageEvent event, User user, Server s, Date earliest) { + + SsmUpgradePackagesEvent supe = (SsmUpgradePackagesEvent) event; + List<Map<String, Long>> packageListItems = supe.getSysPackageSet().get(s.getId()); + + return ActionManager.schedulePackageUpgrade(user, s, packageListItems, earliest); + } } commit c919ecfd703764900581f2918f6bcffe4bbabaf3 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Mon Aug 5 09:21:44 2013 +0200 Revert "Automatic commit of package [spacewalk-java] release [2.0.4-1]." This reverts commit e0621785f7246afe006f3bf9a4462b3d407a4e93. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 109129b..1963d16 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.0.4 +Version: 2.0.3 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -771,11 +771,6 @@ fi %{jardir}/postgresql-jdbc.jar %changelog -* Fri Jul 26 2013 Grant Gainey <ggainey(a)redhat.com> 2.0.4-1 -- 987977 - Fix there-can-be-solaris issue and make Upgrade behave like - everything else -- 987977 - Fix chaining of pkg-scheduling in SSM - * Fri Jul 26 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.0.3-1 - ISS: Return LookupException to getDefaultMaster() if there isn't one - 986527 - removing extra semicolon diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index fc23e6e..06c6d1e 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.0.4-1 java/ +2.0.3-1 java/

10 years, 9 months

1
0
0 / 0

Changes to 'refs/tags/spacewalk-utils-2.0.3-1'

by Tomáš Kašpárek

Tag 'spacewalk-utils-2.0.3-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-08-05 07:08 +0000 Tagging package [spacewalk-utils] version [2.0.3-1] in directory [utils/]. Changes since spacewalk-java-2.0.4-1: Tomas Kasparek (2): adding 2.0 repositories to spacewalk-common-channels Automatic commit of package [spacewalk-utils] release [2.0.3-1]. --- rel-eng/packages/spacewalk-utils | 2 utils/spacewalk-common-channels.ini | 126 ++++++++++++++++++++++++++++++++++++ utils/spacewalk-utils.spec | 5 + 3 files changed, 131 insertions(+), 2 deletions(-) ---

10 years, 9 months

1
0
0 / 0

Branch 'SPACEWALK-2.0' - rel-eng/packages utils/spacewalk-utils.spec

by Tomáš Kašpárek

rel-eng/packages/spacewalk-utils | 2 +- utils/spacewalk-utils.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 336178738609e12672e378fa69a929624788e7a5 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Mon Aug 5 09:08:03 2013 +0200 Automatic commit of package [spacewalk-utils] release [2.0.3-1]. diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils index 3b322fb..c546698 100644 --- a/rel-eng/packages/spacewalk-utils +++ b/rel-eng/packages/spacewalk-utils @@ -1 +1 @@ -2.0.2-1 utils/ +2.0.3-1 utils/ diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec index e77d32a..d38b0c9 100644 --- a/utils/spacewalk-utils.spec +++ b/utils/spacewalk-utils.spec @@ -1,7 +1,7 @@ %define rhnroot %{_prefix}/share/rhn Name: spacewalk-utils -Version: 2.0.2 +Version: 2.0.3 Release: 1%{?dist} Summary: Utilities that may be run against a Spacewalk server. @@ -88,6 +88,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot} %changelog +* Mon Aug 05 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.0.3-1 +- adding 2.0 repositories to spacewalk-common-channels + * Thu Jul 18 2013 Jiri Mikulka <jmikulka(a)redhat.com> 2.0.2-1 - dropping support for Fedora 17 in Spacewalk nightly

10 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits August 2013