proxy/proxy rel-eng/packages
by Miroslav Suchý
proxy/proxy/spacewalk-proxy.spec | 6 +++++-
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit d4fea44eecad2eaf48617c574747e4e16c0354d1
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Aug 20 16:38:15 2009 +0200
Automatic commit of package [spacewalk-proxy] release [0.7.1-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 09d48b1..518fac5 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 0.7.0
+Version: 0.7.1
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -293,6 +293,10 @@ fi
%changelog
+* Thu Aug 20 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.1-1
+- 503187 - do not automaticaly download rhn_proxy.conf
+- 516624 - allow upgrade proxy using CLI to 5.3 from 5.0
+
* Tue Jul 21 2009 John Matthews <jmatthew(a)redhat.com> 0.6.8-1
- 503187 - rewrite old config during upgrade, old file will be saved as
.rpmorig (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index d7096c3..d7add8f 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-0.6.8-1 proxy/proxy/
+0.7.1-1 proxy/proxy/
14 years, 8 months
Changes to 'refs/tags/spacewalk-web-0.7.1-1'
by Miroslav Suchý
Tag 'spacewalk-web-0.7.1-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-08-20 14:34 +0000
Tagging package [spacewalk-web] version [0.7.1-1] in directory [web/].
Changes since rhncfg-5.9.9-1:
Miroslav Suchý (1):
Automatic commit of package [spacewalk-web] release [0.7.1-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
---
14 years, 8 months
Changes to 'refs/tags/rhncfg-5.9.9-1'
by Miroslav Suchý
Tag 'rhncfg-5.9.9-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-08-20 14:32 +0000
Tagging package [rhncfg] version [5.9.9-1] in directory [client/tools/rhncfg/].
Changes since NPalert-1.126.10-1:
Miroslav Suchý (1):
Automatic commit of package [rhncfg] release [5.9.9-1].
---
client/tools/rhncfg/rhncfg.spec | 5 ++++-
rel-eng/packages/rhncfg | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
14 years, 8 months
Changes to 'refs/tags/NPalert-1.126.10-1'
by Miroslav Suchý
Tag 'NPalert-1.126.10-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-08-20 14:30 +0000
Tagging package [NPalert] version [1.126.10-1] in directory [monitoring/NPalert/].
Changes since spacewalk-java-0.7.1-1:
Miroslav Suchý (2):
fix an ISE relating to config management w/selinux
Automatic commit of package [NPalert] release [1.126.10-1].
---
backend/server/configFilesHandler.py | 4 +++-
client/tools/rhncfg/config_common/repository.py | 9 +++++++++
monitoring/NPalert/NPalert.spec | 5 ++++-
rel-eng/packages/NPalert | 2 +-
web/modules/rhn/RHN/AppInstall/ActionHandler/ActionRunner.pm | 2 ++
web/modules/rhn/RHN/DB/ConfigRevision.pm | 4 ++--
web/modules/rhn/RHN/ProxyInstall.pm | 2 ++
7 files changed, 23 insertions(+), 5 deletions(-)
---
14 years, 8 months
rel-eng/packages web/spacewalk-web.spec
by Miroslav Suchý
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 3933fa9ee900de6b3cba875b071847f3212e1a5c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Aug 20 16:34:42 2009 +0200
Automatic commit of package [spacewalk-web] release [0.7.1-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 6416cdb..a078a0d 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-0.6.19-1 web/
+0.7.1-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index e09e4b3..36b0b0f 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.7.0
+Version: 0.7.1
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -317,6 +317,11 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu Aug 20 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.7.1-1
+- fix an ISE relating to config management w/selinux (Joshua Roys)
+- allow users to chat with spacewalk members on IRC via the web. (jesusr(a)redhat.com)
+- 516608 - redirect output of rhn-ssl-tool to apache error log
+
* Wed Aug 05 2009 John Matthews <jmatthew(a)redhat.com> 0.6.19-1
- 515580 - remove hard links to scooby.rdu (shughes(a)redhat.com)
14 years, 8 months
2 commits - client/tools monitoring/NPalert rel-eng/packages
by Miroslav Suchý
client/tools/rhncfg/rhncfg.spec | 5 ++++-
monitoring/NPalert/NPalert.spec | 5 ++++-
rel-eng/packages/NPalert | 2 +-
rel-eng/packages/rhncfg | 2 +-
4 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 58ff4d42920f23caeac7bd3d27743164058ca48c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Aug 20 16:32:02 2009 +0200
Automatic commit of package [rhncfg] release [5.9.9-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index c278b6e..6ac01f6 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.9.8
+Version: 5.9.9
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu Aug 20 2009 Miroslav Suchy <msuchy(a)redhat.com> 5.9.9-1
+- fix an ISE relating to config management w/selinux
+
* Tue Aug 11 2009 Pradeep Kilambi <pkilambi(a)redhat.com> 5.9.8-1
- 516889 - adding rhncfgcli_elist module to makefile
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index 2b6d4a6..965c438 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.9.8-1 client/tools/rhncfg/
+5.9.9-1 client/tools/rhncfg/
commit 8ef24e20a3e86990416e5e1f36b3e257b7d31821
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Aug 20 16:30:13 2009 +0200
Automatic commit of package [NPalert] release [1.126.10-1].
diff --git a/monitoring/NPalert/NPalert.spec b/monitoring/NPalert/NPalert.spec
index 30db192..87c53d9 100644
--- a/monitoring/NPalert/NPalert.spec
+++ b/monitoring/NPalert/NPalert.spec
@@ -9,7 +9,7 @@ Name: NPalert
Summary: NOCpulse notification system
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.126.9
+Version: 1.126.10
Release: 1%{?dist}
BuildArch: noarch
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -129,6 +129,9 @@ fi
rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Aug 20 2009 Miroslav Suchý <msuchy(a)redhat.com> 1.126.10-1
+- avoid deadlock when we have problem after acquiring lock
+
* Thu May 14 2009 Milan Zazrivec <mzazrivec(a)redhat.com> 1.126.9-1
- fix package upgrade %post section
diff --git a/rel-eng/packages/NPalert b/rel-eng/packages/NPalert
index af101c5..0e0d527 100644
--- a/rel-eng/packages/NPalert
+++ b/rel-eng/packages/NPalert
@@ -1 +1 @@
-1.126.9-1 monitoring/NPalert/
+1.126.10-1 monitoring/NPalert/
14 years, 8 months
backend/server client/tools web/modules
by Miroslav Suchý
backend/server/configFilesHandler.py | 4 +++-
client/tools/rhncfg/config_common/repository.py | 9 +++++++++
web/modules/rhn/RHN/AppInstall/ActionHandler/ActionRunner.pm | 2 ++
web/modules/rhn/RHN/DB/ConfigRevision.pm | 4 ++--
web/modules/rhn/RHN/ProxyInstall.pm | 2 ++
5 files changed, 18 insertions(+), 3 deletions(-)
New commits:
commit e38cfbaa329ea8814ea12014ffacb3b61d6bcbb9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Aug 20 10:08:34 2009 +0200
fix an ISE relating to config management w/selinux
Contributed by Joshua Roys:
Attached is a patch to kill another bug in the configuration management w/selinux. Specifically, backend/server/configFilesHandler.py ended up calling the old version of lookup_config_info, which caused all file uploads to fail in an ISE. In fixing this, I also added functionality to upload the selinux context of files to spacewalk in client/tools/rhncfg/config_common/repository.py . The other changes are for completeness, as they look like they could cause problems in the future.
diff --git a/backend/server/configFilesHandler.py b/backend/server/configFilesHandler.py
index 996d221..f00a937 100644
--- a/backend/server/configFilesHandler.py
+++ b/backend/server/configFilesHandler.py
@@ -158,6 +158,8 @@ class ConfigFilesHandler(rhnHandler):
file['username'] = file['user']
file['groupname'] = file['group']
file['file_mode'] = file['mode']
+ if not file.has_key('selinux_ctx'):
+ file['selinux_ctx'] = ''
result = {}
@@ -321,7 +323,7 @@ class ConfigFilesHandler(rhnHandler):
lob.write(file_contents)
_query_lookup_config_info = rhnSQL.Statement("""
- select lookup_config_info(:username, :groupname, :file_mode) id
+ select lookup_config_info(:username, :groupname, :file_mode, :selinux_ctx) id
from dual
""")
diff --git a/client/tools/rhncfg/config_common/repository.py b/client/tools/rhncfg/config_common/repository.py
index f49f750..78abc9e 100644
--- a/client/tools/rhncfg/config_common/repository.py
+++ b/client/tools/rhncfg/config_common/repository.py
@@ -27,6 +27,13 @@ import utils
from rhn_log import log_debug, die
#from rhn_rpc import rpclib
+try:
+ from selinux import getfilecon
+except:
+ # on rhel4 we do not support selinux
+ def getfilecon(path):
+ return [0, ''];
+
#6/29/05 rpc_wrapper implements the failover logic.
import rpc_wrapper
@@ -125,6 +132,8 @@ class Repository:
ret['group'] = gr_name
self._gid_cache[gid] = gr_name
+ ret['selinux_ctx'] = getfilecon(path)[1]
+
return ret
def _make_file_info(self, remote_path, local_path=None, delim_start=None,
diff --git a/web/modules/rhn/RHN/AppInstall/ActionHandler/ActionRunner.pm b/web/modules/rhn/RHN/AppInstall/ActionHandler/ActionRunner.pm
index d19c1ca..0dff388 100644
--- a/web/modules/rhn/RHN/AppInstall/ActionHandler/ActionRunner.pm
+++ b/web/modules/rhn/RHN/AppInstall/ActionHandler/ActionRunner.pm
@@ -205,6 +205,7 @@ sub generate_config_file {
groupname => { default => 'root' },
mode => { default => '770' },
new_only => { default => 0 },
+ selinux_ctx => { default => '' },
});
my $template_file = File::Spec->catfile($session->get_app_instance->get_app_dir(), $params{template});
@@ -239,6 +240,7 @@ sub generate_config_file {
$new_revision->groupname($params{groupname});
$new_revision->filemode($params{mode});
$new_revision->contents($contents);
+ $new_revision->selinux_ctx($params{selinux_ctx});
eval {
$new_revision->commit;
diff --git a/web/modules/rhn/RHN/DB/ConfigRevision.pm b/web/modules/rhn/RHN/DB/ConfigRevision.pm
index 1765b9c..3575fb7 100644
--- a/web/modules/rhn/RHN/DB/ConfigRevision.pm
+++ b/web/modules/rhn/RHN/DB/ConfigRevision.pm
@@ -30,7 +30,7 @@ our @ISA = qw/RHN::SimpleStruct/;
our @core_fields = qw/id revision config_file_id config_content_id
config_info_id delim_start delim_end created
modified username groupname filemode latest_id latest path
- md5sum file_size org_id config_channel_id filetype/;
+ md5sum file_size org_id config_channel_id filetype selinux_ctx/;
our @transient_fields = qw/__contents__ is_binary/;
our @simple_struct_fields = (@core_fields, @transient_fields);
@@ -154,7 +154,7 @@ sub commit {
}
my $dbh = RHN::DB->connect;
- my $ciid = $dbh->call_function('lookup_config_info', $self->username, $self->groupname, $self->filemode);
+ my $ciid = $dbh->call_function('lookup_config_info', $self->username, $self->groupname, $self->filemode, $self->selinux_ctx);
my $ccid = $self->config_content_id;
my $cftid = getFileTypeId($self->filetype);
diff --git a/web/modules/rhn/RHN/ProxyInstall.pm b/web/modules/rhn/RHN/ProxyInstall.pm
index 4079add..505a506 100644
--- a/web/modules/rhn/RHN/ProxyInstall.pm
+++ b/web/modules/rhn/RHN/ProxyInstall.pm
@@ -370,6 +370,7 @@ sub import_file {
username => { default => 'root' },
groupname => { default => 'root' },
mode => { default => 770 },
+ selinux_ctx => { default => '' },
});
my $cc = $params{config_channel};
@@ -394,6 +395,7 @@ sub import_file {
$new_revision->groupname($params{groupname});
$new_revision->filemode($params{mode});
$new_revision->contents($params{content});
+ $new_revision->selinux_ctx($params{selinux_ctx});
$new_revision->commit;
14 years, 8 months
Changes to 'refs/tags/spacewalk-java-0.7.1-1'
by Jesus M. Rodriguez
Tag 'spacewalk-java-0.7.1-1' created by jesus m. rodriguez <jesusr(a)redhat.com> at 2009-08-20 00:13 +0000
Tagging package [spacewalk-java] version [0.7.1-1] in directory [java/].
Changes since spacewalk-schema-0.7.1-1:
Devan Goodwin (1):
516863 - Fix Schedule page date sorting.
Jason Dobies (2):
518262 - Fixed select all buttons when selecting erratum packages to push to a channel.
Checkstyle fix
Jeff Ortel (1):
494409 - Update TrustAction to removed shared subscriptions before removing trusts
Justin Sherrill (7):
unit test
517551 - fixing issue where a migrated system couldnt provision a guest
517567 - fixing issue with ISE with page sort on org trust page
517876 - fixing spacewalk-koan so it doesnt require up2date on Fedora 11
adding support for child channel repos during kickstart
adding config option for disabling the ability to access child channel repo through kickstart
518342 - adding workaround for RHEL5u4 bug failing to register when dbus and hal are not running
Milan Zazrivec (1):
517867 - insert solaris data only if these do not exist
Miroslav Suchý (2):
503187 - do not automaticaly download rhn_proxy.conf
avoid deadlock when we have problem after acquiring lock
Pradeep Kilambi (1):
migration of system profile should be able to run as non root now that it can run on any client and not just satellite.
jesus m. rodriguez (5):
517421 - allow shared channels as parents to child channels
fix typo Planing -> Planning
allow users to chat with spacewalk members on IRC via the web.
add the Chat graphic as an advertisement to the layouts.
Automatic commit of package [spacewalk-java] release [0.7.1-1].
---
branding/img/chat.png |binary
branding/templates/c.pxt | 7 +
client/tools/spacewalk-koan/spacewalk-koan.spec | 4
java/code/src/com/redhat/rhn/common/util/MD5Sum.java | 2
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 11 +
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 2
java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 50 +++++++
java/code/src/com/redhat/rhn/frontend/action/errata/PackagePushSetupAction.java | 10 -
java/code/src/com/redhat/rhn/frontend/action/multiorg/TrustAction.java | 2
java/code/src/com/redhat/rhn/frontend/dto/OrgTrust.java | 9 +
java/code/src/com/redhat/rhn/frontend/nav/DialognavRenderer.java | 9 +
java/code/src/com/redhat/rhn/frontend/nav/NavDigester.java | 3
java/code/src/com/redhat/rhn/frontend/nav/NavNode.java | 18 ++
java/code/src/com/redhat/rhn/frontend/nav/SidenavRenderer.java | 7 -
java/code/src/com/redhat/rhn/frontend/nav/TopnavRenderer.java | 9 -
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml | 7 +
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/test/ChannelHandlerTest.java | 3
java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/test/OrgTrustHandlerTest.java | 4
java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 16 ++
java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelper.java | 15 ++
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java | 4
java/code/src/com/redhat/rhn/manager/org/MigrationManager.java | 8 +
java/code/webapp/WEB-INF/decorators/layout_c.jsp | 2
java/code/webapp/WEB-INF/includes/advertisements.jsp | 8 +
java/code/webapp/WEB-INF/includes/advertisements/chat-advertisement.jsp | 4
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 2
java/code/webapp/WEB-INF/nav/sitenav.xml | 2
java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp | 2
java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf | 2
java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp | 1
java/code/webapp/WEB-INF/pages/errata/packagepush.jsp | 1
java/code/webapp/WEB-INF/struts-config.xml | 4
java/spacewalk-java.spec | 65 +++++++++-
monitoring/NPalert/scripts/notif-launcher | 2
proxy/proxy/spacewalk-proxy.spec | 4
rel-eng/packages/spacewalk-java | 2
schema/spacewalk/spacewalk-schema-upgrade | 2
schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2/006-rhnServerPackageArchCompat_data-solaris-sun4v.sql | 15 +-
schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2/009-rhnServerPackageArchCompat_data-solaris-sun4u.sql | 49 +++++--
utils/migrate-system-profile | 8 -
web/html/nav/sitenav-authenticated.xml | 2
web/html/nav/sitenav.xml | 2
web/modules/sniglets/Sniglets/Navi/Node.pm | 14 ++
web/modules/sniglets/Sniglets/Navi/Parser.pm | 2
web/modules/sniglets/Sniglets/Navi/Style.pm | 4
45 files changed, 337 insertions(+), 62 deletions(-)
---
14 years, 8 months
java/spacewalk-java.spec rel-eng/packages
by Jesus M. Rodriguez
java/spacewalk-java.spec | 65 +++++++++++++++++++++++++++++++++++++++-
rel-eng/packages/spacewalk-java | 2 -
2 files changed, 65 insertions(+), 2 deletions(-)
New commits:
commit c832e3381763ca8fcf252ed9f89d04b0520e1c8a
Author: jesus m. rodriguez <jesusr(a)redhat.com>
Date: Wed Aug 19 20:13:51 2009 -0400
Automatic commit of package [spacewalk-java] release [0.7.1-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 700cb67..d8b7a99 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -12,7 +12,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.7.0
+Version: 0.7.1
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,69 @@ fi
%attr(644, root, root) %{_datadir}/rhn/lib/rhn.jar
%changelog
+* Wed Aug 19 2009 jesus m. rodriguez <jesusr(a)redhat.com> 0.7.1-1
+- add the Chat graphic as an advertisement to the layouts. (jesusr(a)redhat.com)
+- allow users to chat with spacewalk members on IRC via the web.
+ (jesusr(a)redhat.com)
+- 518342 - adding workaround for RHEL5u4 bug failing to register when dbus and
+ hal are not running (jsherril(a)redhat.com)
+- Checkstyle fix (jason.dobies(a)redhat.com)
+- 518262 - Fixed select all buttons when selecting erratum packages to push to
+ a channel. (jason.dobies(a)redhat.com)
+- 516863 - Fix Schedule page date sorting. (dgoodwin(a)redhat.com)
+- adding config option for disabling the ability to access child channel repo
+ through kickstart (jsherril(a)redhat.com)
+- adding support for child channel repos during kickstart (jsherril(a)redhat.com)
+- 517567 - fixing issue with ISE with page sort on org trust page
+ (jsherril(a)redhat.com)
+- 517551 - fixing issue where a migrated system couldnt provision a guest
+ (jsherril(a)redhat.com)
+- unit test (jsherril(a)redhat.com)
+- 517421 - allow shared channels as parents to child channels
+ (jesusr(a)redhat.com)
+- 494409 - Update TrustAction to removed shared subscriptions before removing
+ trusts (jortel(a)redhat.com)
+- fixing the cloned channel creation to use the original channels checksum type
+ and set to db. Once the cloned logic is converted from perl to java we can do
+ this more nicely. (pkilambi(a)redhat.com)
+- 509430 - fixing issue where the provisioning tab would ISE on 2.1 systems
+ (jsherril(a)redhat.com)
+- 517076 - Added association of servers in the SSM to the package upgrade task
+ log. See comment in the code for more information. (jason.dobies(a)redhat.com)
+- 517086 - Added note to indicate the types of SSM tasks to expect to see on
+ that page to minimize confusion. (jason.dobies(a)redhat.com)
+- 514305 - switching the algorithm for reading the file into memory.
+ (mmccune(a)redhat.com)
+- 517074 - Systems were pulled from the SSM rhnSet without being scoped to a
+ specific user ID. Updated the query to take user IDs into account.
+ (jason.dobies(a)redhat.com)
+- Fixed typo. (jason.dobies(a)redhat.com)
+- 483606 - Added clause to SSM system retrieval query to filter out proxies.
+ (jason.dobies(a)redhat.com)
+- fixing checkstyle (pkilambi(a)redhat.com)
+- fixing unit test breakage (pkilambi(a)redhat.com)
+- 509364 - Fix to show Package Arch name correctly in SSM Package isntall
+ (paji(a)redhat.com)
+- 516220 - Fixed bug in SSM query that was looking for systems in any set, not
+ just the SSM specific rhnSet. (jason.dobies(a)redhat.com)
+- Reapplying accidentally reverted commit: "Revert "478397 - fixing issue where
+ rhnpush would schedule a taskomatic task to regenerate needed cache and was
+ using a query that didnt generate for all channels (even though it was
+ deleting from all channels)"" (jason.dobies(a)redhat.com)
+- 443500 - Made sure the call to complete the SSM async operation always takes
+ place. Added hook to associate servers with the operation.
+ (jason.dobies(a)redhat.com)
+- Revert "478397 - fixing issue where rhnpush would schedule a taskomatic task
+ to regenerate needed cache and was using a query that didnt generate for all
+ channels (even though it was deleting from all channels)"
+ (jason.dobies(a)redhat.com)
+- 478397 - fixing issue where rhnpush would schedule a taskomatic task to
+ regenerate needed cache and was using a query that didnt generate for all
+ channels (even though it was deleting from all channels)
+ (jsherril(a)redhat.com)
+- adding reposync task to taskomatic config (jsherril(a)redhat.com)
+- bumping versions to 0.7.0 (jmatthew(a)redhat.com)
+
* Wed Aug 05 2009 John Matthews <jmatthew(a)redhat.com> 0.6.41-1
- 509474 - make sure we symlink to stringtree-json (mmccune(a)redhat.com)
- 509474 - fixing NPE (joshua.roys(a)gtri.gatech.edu)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 21418a0..85fb15d 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.6.41-1 java/
+0.7.1-1 java/
14 years, 8 months
2 commits - branding/img branding/templates java/code web/html web/modules
by Jesus M. Rodriguez
branding/img/chat.png |binary
branding/templates/c.pxt | 7 +++
java/code/src/com/redhat/rhn/frontend/nav/DialognavRenderer.java | 9 +++--
java/code/src/com/redhat/rhn/frontend/nav/NavDigester.java | 3 +
java/code/src/com/redhat/rhn/frontend/nav/NavNode.java | 18 +++++++++-
java/code/src/com/redhat/rhn/frontend/nav/SidenavRenderer.java | 7 ++-
java/code/src/com/redhat/rhn/frontend/nav/TopnavRenderer.java | 9 +++--
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml | 7 +++
java/code/webapp/WEB-INF/decorators/layout_c.jsp | 2 +
java/code/webapp/WEB-INF/includes/advertisements.jsp | 8 ++++
java/code/webapp/WEB-INF/includes/advertisements/chat-advertisement.jsp | 4 ++
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 2 +
java/code/webapp/WEB-INF/nav/sitenav.xml | 2 +
web/html/nav/sitenav-authenticated.xml | 2 +
web/html/nav/sitenav.xml | 2 +
web/modules/sniglets/Sniglets/Navi/Node.pm | 14 +++++++
web/modules/sniglets/Sniglets/Navi/Parser.pm | 2 -
web/modules/sniglets/Sniglets/Navi/Style.pm | 4 +-
18 files changed, 90 insertions(+), 12 deletions(-)
New commits:
commit f59b567718c02cbac12dd0f8ab0d8251009dfddf
Author: jesus m. rodriguez <jesusr(a)redhat.com>
Date: Wed Aug 19 20:09:23 2009 -0400
add the Chat graphic as an advertisement to the layouts.
diff --git a/branding/templates/c.pxt b/branding/templates/c.pxt
index 1e254b6..c587ec0 100644
--- a/branding/templates/c.pxt
+++ b/branding/templates/c.pxt
@@ -34,6 +34,13 @@
</grail-canvas>
</rhn-browser-css-compliance>
+ <rhn-require acl="global_config(chat_enabled)">
+ <br/>
+ <a href="http://webchat.freenode.net?channels=#spacewalk" target="_blank">
+ <img src="/img/chat.png" alt=""/>
+ </a>
+ </rhn-require>
+
</td>
<td class="page-content" width="100%">
<pxt-include-late file="/network/components/message_queues/site.pxi" />
diff --git a/java/code/webapp/WEB-INF/decorators/layout_c.jsp b/java/code/webapp/WEB-INF/decorators/layout_c.jsp
index e4f8ad2..1187aa3 100644
--- a/java/code/webapp/WEB-INF/decorators/layout_c.jsp
+++ b/java/code/webapp/WEB-INF/decorators/layout_c.jsp
@@ -31,6 +31,8 @@
<jsp:include page="/WEB-INF/includes/legends.jsp" />
+ <jsp:include page="/WEB-INF/includes/advertisements.jsp" />
+
</td>
<td class="page-content">
<html:errors/>
diff --git a/java/code/webapp/WEB-INF/includes/advertisements.jsp b/java/code/webapp/WEB-INF/includes/advertisements.jsp
new file mode 100644
index 0000000..63c337c
--- /dev/null
+++ b/java/code/webapp/WEB-INF/includes/advertisements.jsp
@@ -0,0 +1,8 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
+
+<!-- TODO make this more generic -->
+<rhn:require acl="is(web.chat_enabled);">
+ <jsp:include page="/WEB-INF/includes/advertisements/chat-advertisement.jsp"/>
+</rhn:require>
+
diff --git a/java/code/webapp/WEB-INF/includes/advertisements/chat-advertisement.jsp b/java/code/webapp/WEB-INF/includes/advertisements/chat-advertisement.jsp
new file mode 100644
index 0000000..7f0b6a5
--- /dev/null
+++ b/java/code/webapp/WEB-INF/includes/advertisements/chat-advertisement.jsp
@@ -0,0 +1,4 @@
+<br/>
+<a href="http://webchat.freenode.net?channels=#spacewalk" target="_blank">
+ <img src="/img/chat.png" alt=""/>
+</a>
commit a59589b198b7c0a7d921947b80c245f0b21790af
Author: jesus m. rodriguez <jesusr(a)redhat.com>
Date: Tue Aug 18 22:23:57 2009 -0400
allow users to chat with spacewalk members on IRC via the web.
diff --git a/branding/img/chat.png b/branding/img/chat.png
new file mode 100644
index 0000000..969b0d3
Binary files /dev/null and b/branding/img/chat.png differ
diff --git a/java/code/src/com/redhat/rhn/frontend/nav/DialognavRenderer.java b/java/code/src/com/redhat/rhn/frontend/nav/DialognavRenderer.java
index cd61ec8..95cccd8 100644
--- a/java/code/src/com/redhat/rhn/frontend/nav/DialognavRenderer.java
+++ b/java/code/src/com/redhat/rhn/frontend/nav/DialognavRenderer.java
@@ -141,7 +141,7 @@ public class DialognavRenderer extends Renderable {
href += formVars.toString();
}
- li.addBody(aHref(href, node.getName(), cssLinkClass));
+ li.addBody(aHref(href, node.getName(), cssLinkClass, node.getTarget()));
sb.append(li.render());
sb.append("\n");
}
@@ -179,11 +179,16 @@ public class DialognavRenderer extends Renderable {
return false;
}
- private static String aHref(String url, String text, String style) {
+ private static String aHref(String url, String text, String style, String target) {
HtmlTag a = new HtmlTag("a");
if (style != null && !style.equals("")) {
a.setAttribute("class", style);
}
+
+ if (target != null && !target.equals("")) {
+ a.setAttribute("target", target);
+ }
+
a.setAttribute("href", url);
a.addBody(text);
return a.render();
diff --git a/java/code/src/com/redhat/rhn/frontend/nav/NavDigester.java b/java/code/src/com/redhat/rhn/frontend/nav/NavDigester.java
index 9081822..26c344f 100644
--- a/java/code/src/com/redhat/rhn/frontend/nav/NavDigester.java
+++ b/java/code/src/com/redhat/rhn/frontend/nav/NavDigester.java
@@ -55,6 +55,9 @@ public class NavDigester {
digester.addSetProperties("*/rhn-tab",
"inactive-image",
"inactiveImage");
+ digester.addSetProperties("*/rhn-tab",
+ "target",
+ "target");
digester.addCallMethod("*/rhn-tab",
"addPrimaryURL",
diff --git a/java/code/src/com/redhat/rhn/frontend/nav/NavNode.java b/java/code/src/com/redhat/rhn/frontend/nav/NavNode.java
index 70595f2..74c85ca 100644
--- a/java/code/src/com/redhat/rhn/frontend/nav/NavNode.java
+++ b/java/code/src/com/redhat/rhn/frontend/nav/NavNode.java
@@ -34,6 +34,7 @@ public class NavNode {
private String label;
private String name;
private String acl;
+ private String target;
private boolean dominant;
private boolean invisible;
private boolean overrideSidenav;
@@ -374,6 +375,21 @@ public class NavNode {
public boolean isLast() {
return last;
}
-}
+ /**
+ * Sets the target of the url.
+ * @param tgt link target
+ */
+ public void setTarget(String tgt) {
+ target = tgt;
+ }
+
+ /**
+ * returns the target for the url
+ * @return the target for the url
+ */
+ public String getTarget() {
+ return target;
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/nav/SidenavRenderer.java b/java/code/src/com/redhat/rhn/frontend/nav/SidenavRenderer.java
index 1d1844f..16d8b6e 100644
--- a/java/code/src/com/redhat/rhn/frontend/nav/SidenavRenderer.java
+++ b/java/code/src/com/redhat/rhn/frontend/nav/SidenavRenderer.java
@@ -100,7 +100,7 @@ public class SidenavRenderer extends Renderable {
li.setAttribute("class", cssClass);
}
- li.addBody(aHref(node.getPrimaryURL(), node.getName()));
+ li.addBody(aHref(node.getPrimaryURL(), node.getName(), node.getTarget()));
sb.append(li.render());
sb.append("\n");
}
@@ -126,9 +126,12 @@ public class SidenavRenderer extends Renderable {
return true;
}
- private static String aHref(String url, String text) {
+ private static String aHref(String url, String text, String target) {
HtmlTag a = new HtmlTag("a");
a.setAttribute("href", url);
+ if (target != null && !target.equals("")) {
+ a.setAttribute("target", target);
+ }
a.addBody(text);
return a.render();
}
diff --git a/java/code/src/com/redhat/rhn/frontend/nav/TopnavRenderer.java b/java/code/src/com/redhat/rhn/frontend/nav/TopnavRenderer.java
index 17e604d..a96173a 100644
--- a/java/code/src/com/redhat/rhn/frontend/nav/TopnavRenderer.java
+++ b/java/code/src/com/redhat/rhn/frontend/nav/TopnavRenderer.java
@@ -81,7 +81,7 @@ public class TopnavRenderer extends Renderable {
// no class
}
liTag.addBody(getLink(node.getPrimaryURL(),
- node.getName(), classStr));
+ node.getName(), classStr, node.getTarget()));
sb.append(liTag.render());
sb.append("\n");
}
@@ -107,7 +107,7 @@ public class TopnavRenderer extends Renderable {
classStr = "mainLastLink";
}
liTag.addBody(getLink(node.getPrimaryURL(),
- node.getName(), classStr));
+ node.getName(), classStr, node.getTarget()));
sb.append(liTag.render());
sb.append("\n");
}
@@ -130,12 +130,15 @@ public class TopnavRenderer extends Renderable {
return true;
}
- private String getLink(String url, String name, String classStr) {
+ private String getLink(String url, String name, String classStr, String target) {
HtmlTag a = new HtmlTag("a");
a.setAttribute("href", url);
if (classStr != null && !"".equals(classStr)) {
a.setAttribute("class", classStr);
}
+ if (target != null && !"".equals(target)) {
+ a.setAttribute("target", target);
+ }
a.addBody(name);
return a.render();
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
index 78e7dc8..2c06667 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
@@ -1081,6 +1081,13 @@ http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd"
</context-group>
</trans-unit>
+ <trans-unit id="Chat">
+ <source>Chat</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/help/about.pxt</context>
+ </context-group>
+ </trans-unit>
+
<trans-unit id="Base Channels">
<source>Base Channels</source>
<context-group name="ctx">
diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
index c40e4a6..f7608ac 100644
--- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
+++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
@@ -290,6 +290,8 @@
<rhn-tab name="Sample Scripts" url="/rhn/apidoc/scripts.jsp" />
</rhn-tab>
<rhn-tab name="Search" url="/rhn/help/Search.do" />
+ <rhn-tab name="Chat" url="http://webchat.freenode.net/?channels=#spacewalk"
+ target="_blank" />
</rhn-tab>
</rhn-navi-tree>
diff --git a/java/code/webapp/WEB-INF/nav/sitenav.xml b/java/code/webapp/WEB-INF/nav/sitenav.xml
index a589188..a7ae39f 100644
--- a/java/code/webapp/WEB-INF/nav/sitenav.xml
+++ b/java/code/webapp/WEB-INF/nav/sitenav.xml
@@ -35,6 +35,8 @@
<rhn-tab name="Sample Scripts" url="/rhn/apidoc/scripts.jsp" />
</rhn-tab>
<rhn-tab name="Search" url="/rhn/help/Search.do" />
+ <rhn-tab name="Chat"
+ url="http://webchat.freenode.net?channels=#spacewalk" target="_blank" />
</rhn-tab>
diff --git a/web/html/nav/sitenav-authenticated.xml b/web/html/nav/sitenav-authenticated.xml
index 273fdea..d1ba70e 100644
--- a/web/html/nav/sitenav-authenticated.xml
+++ b/web/html/nav/sitenav-authenticated.xml
@@ -250,6 +250,8 @@
</rhn-tab>
<rhn-tab name="API" url="/rhn/apidoc/index.jsp" />
<rhn-tab name="Search" url="/rhn/help/Search.do" />
+ <rhn-tab name="Chat" url="http://webchat.freenode.net/?channels=#spacewalk"
+ target="_blank" />
</rhn-tab>
</rhn-navi-tree>
diff --git a/web/html/nav/sitenav.xml b/web/html/nav/sitenav.xml
index 51426f0..6d9e3fa 100644
--- a/web/html/nav/sitenav.xml
+++ b/web/html/nav/sitenav.xml
@@ -35,6 +35,8 @@
<rhn-tab name="Sample Scripts" url="/rhn/apidoc/scripts.jsp" />
</rhn-tab>
<rhn-tab name="Search" url="/rhn/help/Search.do" />
+ <rhn-tab name="Chat"
+ url="http://webchat.freenode.net?channels=#spacewalk" target="_blank" />
</rhn-tab>
diff --git a/web/modules/sniglets/Sniglets/Navi/Node.pm b/web/modules/sniglets/Sniglets/Navi/Node.pm
index f725191..1d422dc 100644
--- a/web/modules/sniglets/Sniglets/Navi/Node.pm
+++ b/web/modules/sniglets/Sniglets/Navi/Node.pm
@@ -23,7 +23,8 @@ use Sniglets::Lists;
my %allowed_params = map { $_ => 1 }
qw/name url acl dominant invisible override_sidenav hide_all_children_unless_active
- perm_fail_redirect active-image inactive-image node-id on-click dynamic-children/;
+ perm_fail_redirect active-image inactive-image node-id on-click dynamic-children
+ target/;
sub new {
my $class = shift;
@@ -39,6 +40,8 @@ sub new {
if ($p eq 'formvar') {
$self->add_formvar($params{$p});
next;
+ } elsif ($p eq 'target') {
+ $self->set_target($params{$p});
}
die "Invalid param to $class->new: '$p'"
@@ -62,6 +65,7 @@ sub active_image { return $_[0]->{'active-image'} }
sub inactive_image { return $_[0]->{'inactive-image'} }
sub acl { return $_[0]->{acl} }
sub perm_fail_redirect { return $_[0]->{perm_fail_redirect} }
+sub target { return $_[0]->{target} }
# any children
sub hide_all_children_unless_active { return $_[0]->{hide_all_children_unless_active} }
@@ -131,6 +135,14 @@ sub id {
return $self->{id};
}
+sub set_target {
+ my $self = shift;
+
+ confess "node target already defined for node" if defined $self->{target};
+
+ $self->{target} = shift;
+}
+
sub set_id {
my $self = shift;
diff --git a/web/modules/sniglets/Sniglets/Navi/Parser.pm b/web/modules/sniglets/Sniglets/Navi/Parser.pm
index 749183c..eb192a2 100644
--- a/web/modules/sniglets/Sniglets/Navi/Parser.pm
+++ b/web/modules/sniglets/Sniglets/Navi/Parser.pm
@@ -46,7 +46,7 @@ sub parse_navfile {
my %tree_attr;
- foreach (qw/label formvar acl_mixins/) {
+ foreach (qw/label formvar acl_mixins target/) {
$tree_attr{$_} = $root->getAttribute($_);
}
diff --git a/web/modules/sniglets/Sniglets/Navi/Style.pm b/web/modules/sniglets/Sniglets/Navi/Style.pm
index b466e4c..29b5afc 100644
--- a/web/modules/sniglets/Sniglets/Navi/Style.pm
+++ b/web/modules/sniglets/Sniglets/Navi/Style.pm
@@ -146,7 +146,7 @@ sub render_link {
$url .= join("&", map { qq{$_=} . PXT::Utils->escapeURI($form_params{$_}) } keys %form_params);
}
- return PXT::HTML->link($url, PXT::Utils->escapeHTML($node->name), $css_style);
+ return PXT::HTML->link($url, PXT::Utils->escapeHTML($node->name), $css_style, $node->target);
}
@@ -414,7 +414,7 @@ sub render_link {
$url .= join("&", map { qq{$_=} . PXT::Utils->escapeURI($form_params{$_}) } keys %form_params);
}
- return PXT::HTML->link($url, PXT::Utils->escapeHTML($node->name), $css_style);
+ return PXT::HTML->link($url, PXT::Utils->escapeHTML($node->name), $css_style, $node->target);
}
14 years, 8 months