3 commits - client/rhel client/tools
by Miroslav Suchý
client/rhel/rhn-client-tools/src/actions/up2date_config.py | 12 +++++++++---
client/tools/rhncfg/config_common/transactions.py | 8 ++++----
client/tools/rhncfg/rhncfg.spec | 2 ++
3 files changed, 15 insertions(+), 7 deletions(-)
New commits:
commit dc2a2027bbb14b1966fed1f6de21c15d0e68279d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 21 11:39:56 2010 +0200
code style - expand tabs to space
diff --git a/client/tools/rhncfg/config_common/transactions.py b/client/tools/rhncfg/config_common/transactions.py
index ca5a3f0..cc1ca01 100644
--- a/client/tools/rhncfg/config_common/transactions.py
+++ b/client/tools/rhncfg/config_common/transactions.py
@@ -256,10 +256,10 @@ class DeployTransaction:
log_debug(3, "deploying transaction")
- # 0. handle any dirs we need to create first
- # a) if the dir exists, then just change the mode and owners,
- # else create it and then make sure the mode and owners are correct.
- # b) if there are files, then continue
+ # 0. handle any dirs we need to create first
+ # a) if the dir exists, then just change the mode and owners,
+ # else create it and then make sure the mode and owners are correct.
+ # b) if there are files, then continue
# 1. write new version (tmp)
# a) if anything breaks, remove all tmp versions and error out
# 2. rename old version to backup
commit d1c3f21962e313b12e5383093005216a2963e415
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 21 11:33:22 2010 +0200
let declare that we own directory where rhncfg put backup files
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 2f13864..f7e255c 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -65,6 +65,7 @@ rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/%{rhnroot}
make -f Makefile.rhncfg install PREFIX=$RPM_BUILD_ROOT ROOT=%{rhnroot} \
MANDIR=%{_mandir}
+mkdir -p $RPM_BUILD_ROOT/%{_sharedstatedir}/rhncfg/backups
%clean
rm -rf $RPM_BUILD_ROOT
@@ -72,6 +73,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{rhnroot}/config_common
+%{_sharedstatedir}/rhncfg/backups
%doc LICENSE PYTHON-LICENSES.txt
%files client
commit dedf547a0c39fba13f379e64b43d9bafe28a4385
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jul 21 11:12:35 2010 +0200
add parameter cache_only to up2date_config.* actions
diff --git a/client/rhel/rhn-client-tools/src/actions/up2date_config.py b/client/rhel/rhn-client-tools/src/actions/up2date_config.py
index d9b60fa..6acdb3a 100644
--- a/client/rhel/rhn-client-tools/src/actions/up2date_config.py
+++ b/client/rhel/rhn-client-tools/src/actions/up2date_config.py
@@ -20,8 +20,10 @@ __rhnexport__ = [
'get']
argVerbose = 0
-def update(configdict):
+def update(configdict, cache_only=None):
"""Invoke this to change the ondisk configuration of up2date"""
+ if cache_only:
+ return (0, "no-ops for caching", {})
if argVerbose > 1:
print "called update_up2date_config"
@@ -48,8 +50,10 @@ def update(configdict):
return (0, "config updated", {})
-def get():
+def get(cache_only=None):
"""Reterieve the current configuration of up2date"""
+ if cache_only:
+ return (0, "no-ops for caching", {})
if argVerbose > 1:
print "called get_up2date_config"
@@ -59,7 +63,9 @@ def get():
return (0, "configuration retrived", {'data' : ret})
-def rpmmacros(macroName, macroValue):
+def rpmmacros(macroName, macroValue, cache_only):
+ if cache_only:
+ return (0, "no-ops for caching", {})
writeUp2dateMacro(macroName, macroValue)
return (0, "%s set to %s" % (macroName, macroValue), {})
13 years, 10 months
java/code
by Partha Aji
java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 2c8de587ac39135877836cd4ecb8f74442b1e8bf
Author: Partha Aji <paji(a)redhat.com>
Date: Tue Jul 20 18:16:38 2010 -0400
Updated a query to use coalesce instead of nvl to improv evaluation..
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
index 8ad97e8..1258710 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
@@ -1811,7 +1811,7 @@ ORDER BY SCC.position ASC
</query>
<elaborator params="sid">
SELECT CC.id, CC.label,
- NVL( (
+ COALESCE( (
SELECT COUNT(CF.id)
FROM rhnConfigFile CF
INNER JOIN rhnConfigRevision CR ON CR.id = CF.latest_config_revision_id
@@ -1820,7 +1820,7 @@ SELECT CC.id, CC.label,
AND CF.latest_config_revision_id IS NOT NULL
AND CFT.LABEL = 'file'
), 0) AS files_only_count,
- NVL( (
+ COALESCE( (
SELECT COUNT(CF.id)
FROM rhnConfigFile CF
INNER JOIN rhnConfigRevision CR ON CR.id = CF.latest_config_revision_id
@@ -1829,7 +1829,7 @@ SELECT CC.id, CC.label,
AND CF.latest_config_revision_id IS NOT NULL
AND CFT.LABEL = 'symlink'
), 0) AS symlinks_only_count,
- NVL( (
+ COALESCE( (
SELECT COUNT(CF.id)
FROM rhnConfigFile CF
INNER JOIN rhnConfigRevision CR ON CR.id = CF.latest_config_revision_id
@@ -1842,7 +1842,7 @@ SELECT CC.id, CC.label,
FROM rhnConfigFile CF, rhnConfigFileName CFN
WHERE CF.config_channel_id = CC.id
AND CF.config_file_name_id = CFN.id
- AND CC.id = ( SELECT NVL( ( SELECT CC.id
+ AND CC.id = ( SELECT COALESCE( ( SELECT CC.id
FROM rhnConfigChannel CC, rhnConfigChannelType CCT,
rhnServerConfigChannel SCCX, rhnConfigFile CF
WHERE SCCX.server_id = :sid
@@ -1852,7 +1852,7 @@ SELECT CC.id, CC.label,
AND CC.confchan_type_id = CCT.id
AND CCT.label = 'local_override' ) ,
( SELECT SCCX.config_channel_id
- FROM rhnServerConfigChannel SCCX, rhnConfigFile CF
+ FROM rhnServerConfigChannel SCCX, rhnConfigFile CF
WHERE CF.config_file_name_id = CFNX.id
AND CF.config_channel_id = SCCX.config_channel_id
AND SCCX.server_id = :sid
13 years, 10 months
Changes to 'refs/tags/spacewalk-java-1.1.33-1'
by Justin Sherrill
Tag 'spacewalk-java-1.1.33-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2010-07-20 22:43 +0000
Tagging package [spacewalk-java] version [1.1.33-1] in directory [java/].
Changes since spacewalk-java-1.1.32-1:
Aron Parsons (2):
temporarily update the command prompt to tell the user when caches are being generated
don't print an empty line if there are no results from package_search
Justin Sherrill (3):
making the devel setup use asm instead of objectweb-asm if it exists
fixing unit test where blob being zero length would result in a null value within oracle
Automatic commit of package [spacewalk-java] release [1.1.33-1].
Partha Aji (1):
Initial set of changes to show the 'files' include info on dirs and symlinks
Shannon Hughes (1):
updated the ivy repo url for search server
---
java/buildconf/build-props.xml | 3
java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml | 30 +++++-
java/code/src/com/redhat/rhn/domain/kickstart/KickstartScript.java | 5 -
java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigActionHelper.java | 12 +-
java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/OverviewAction.java | 5 -
java/code/src/com/redhat/rhn/frontend/dto/ConfigChannelDto.java | 12 ++
java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp | 7 -
java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp | 11 --
java/spacewalk-java.spec | 6 +
rel-eng/packages/spacewalk-java | 2
search-server/spacewalk-search/build.properties | 2
spacecmd/src/lib/misc.py | 46 ++++++++--
spacecmd/src/lib/package.py | 3
spacecmd/src/lib/shell.py | 1
14 files changed, 107 insertions(+), 38 deletions(-)
---
13 years, 10 months
java/spacewalk-java.spec rel-eng/packages
by Justin Sherrill
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 1c0cf47bf75c2a2c5a99ca967f268d6969515062
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Jul 20 18:43:24 2010 -0400
Automatic commit of package [spacewalk-java] release [1.1.33-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index d9309a3..0ed1c06 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -19,7 +19,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.1.32
+Version: 1.1.33
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -321,6 +321,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Jul 20 2010 Justin Sherrill <jsherril(a)redhat.com> 1.1.33-1
+- Initial set of changes to show the 'files' include info on dirs and symlinks
+ (paji(a)redhat.com)
+- Making spacewalk-java build correctly for fedora 13 (jsherril(a)redhat.com)
* Tue Jul 20 2010 Justin Sherrill <jsherril(a)redhat.com> 1.1.32-1
- fixing java build scripts to use objectweb-asm library if it exists versus
the normal asm (jsherril(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 5e72898..8c7df9c 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.1.32-1 java/
+1.1.33-1 java/
13 years, 10 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/domain/kickstart/KickstartScript.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 677960a8472766f13873d3e26c0020d3232f4631
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Jul 20 18:22:56 2010 -0400
fixing unit test where blob being zero length would result in a null value within oracle
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartScript.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartScript.java
index 31f1572..9bee435 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartScript.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartScript.java
@@ -135,7 +135,7 @@ public class KickstartScript implements Comparable<KickstartScript> {
* @return String version of the pre contents
*/
public String getDataContents() {
- return HibernateFactory.getByteArrayContents(this.data);
+ return HibernateFactory.getByteArrayContents(this.getData());
}
/**
@@ -191,6 +191,9 @@ public class KickstartScript implements Comparable<KickstartScript> {
* @return the data
*/
public byte[] getData() {
+ if (data == null) {
+ return new byte[0];
+ }
return data;
}
13 years, 10 months
2 commits - spacecmd/src
by aparsons
spacecmd/src/lib/misc.py | 46 ++++++++++++++++++++++++++++++++++++++------
spacecmd/src/lib/package.py | 3 +-
spacecmd/src/lib/shell.py | 1
3 files changed, 43 insertions(+), 7 deletions(-)
New commits:
commit 192b4418aef760fa8bd7a8d24e7a677e60b25ee5
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Tue Jul 20 17:53:22 2010 -0400
don't print an empty line if there are no results from package_search
diff --git a/spacecmd/src/lib/package.py b/spacecmd/src/lib/package.py
index a567120..7916cb2 100644
--- a/spacecmd/src/lib/package.py
+++ b/spacecmd/src/lib/package.py
@@ -127,7 +127,8 @@ def do_package_search(self, args, doreturn = False):
if doreturn:
return packages
else:
- print '\n'.join(sorted(packages))
+ if len(packages):
+ print '\n'.join(sorted(packages))
####################
commit 901039ed982602d2f8f89e176c26c19d748fcd6d
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Tue Jul 20 17:52:59 2010 -0400
temporarily update the command prompt to tell the user when caches are being generated
diff --git a/spacecmd/src/lib/misc.py b/spacecmd/src/lib/misc.py
index 0125240..22a25e7 100644
--- a/spacecmd/src/lib/misc.py
+++ b/spacecmd/src/lib/misc.py
@@ -20,6 +20,7 @@
# NOTE: the 'self' variable is an instance of SpacewalkShell
+import readline
from getpass import getpass
from spacecmd.utils import *
@@ -409,8 +410,8 @@ def generate_errata_cache(self, force=False):
if not force and datetime.now() < self.errata_cache_expire:
return
- if logging.getLogger().getEffectiveLevel() == logging.DEBUG: print
- logging.debug('Regenerating internal errata cache')
+ # tell the user what's going on
+ self.replace_line_buffer('** Generating errata cache **')
channels = self.client.channel.listSoftwareChannels(self.session)
channels = [c.get('label') for c in channels]
@@ -432,6 +433,9 @@ def generate_errata_cache(self, force=False):
self.save_errata_cache()
+ # restore the original line buffer
+ self.replace_line_buffer()
+
def save_errata_cache(self):
save_cache(self.errata_cache_file,
@@ -451,8 +455,8 @@ def generate_package_cache(self, force=False):
if not force and datetime.now() < self.package_cache_expire:
return
- if logging.getLogger().getEffectiveLevel() == logging.DEBUG: print
- logging.debug('Regenerating internal package cache')
+ # tell the user what's going on
+ self.replace_line_buffer('** Generating package cache **')
channels = self.client.channel.listSoftwareChannels(self.session)
channels = [c.get('label') for c in channels]
@@ -479,6 +483,9 @@ def generate_package_cache(self, force=False):
self.save_package_caches()
+ # restore the original line buffer
+ self.replace_line_buffer()
+
def save_package_caches(self):
# store the cache to disk to speed things up
@@ -533,8 +540,8 @@ def generate_system_cache(self, force=False):
if not force and datetime.now() < self.system_cache_expire:
return
- if logging.getLogger().getEffectiveLevel() == logging.DEBUG: print
- logging.debug('Regenerating internal system cache')
+ # tell the user what's going on
+ self.replace_line_buffer('** Generating system cache **')
systems = self.client.system.listSystems(self.session)
@@ -547,6 +554,9 @@ def generate_system_cache(self, force=False):
self.save_system_cache()
+ # restore the original line buffer
+ self.replace_line_buffer()
+
def save_system_cache(self):
save_cache(self.system_cache_file,
@@ -774,4 +784,28 @@ def check_api_version(self, want):
# compare the whole value
return float(self.api_version) >= float(want)
+
+# replace the current line buffer
+def replace_line_buffer(self, msg = None):
+ # restore the old buffer if we weren't given a new line
+ if not msg:
+ msg = readline.get_line_buffer()
+
+ # don't print a prompt if there wasn't one to begin with
+ if len(readline.get_line_buffer()):
+ new_line = '%s%s' % (self.prompt, msg)
+ else:
+ new_line = '%s' % msg
+
+ # clear the current line
+ self.stdout.write('\r'.ljust(len(self.current_line) + 1))
+ self.stdout.flush()
+
+ # write the new line
+ self.stdout.write('\r%s' % new_line)
+ self.stdout.flush()
+
+ # keep track of what is displayed so we can clear it later
+ self.current_line = new_line
+
# vim:ts=4:expandtab:
diff --git a/spacecmd/src/lib/shell.py b/spacecmd/src/lib/shell.py
index 071075f..3c4d057 100644
--- a/spacecmd/src/lib/shell.py
+++ b/spacecmd/src/lib/shell.py
@@ -51,6 +51,7 @@ Type: 'help' for a list of commands
completekey = 'tab'
stdout = sys.stdout
prompt_template = 'spacecmd {SSM:##}> '
+ current_line = ''
# do nothing on an empty line
emptyline = lambda self: None
13 years, 10 months
java/code
by Partha Aji
java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml | 30 +++++++++-
java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigActionHelper.java | 12 ++--
java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/OverviewAction.java | 5 +
java/code/src/com/redhat/rhn/frontend/dto/ConfigChannelDto.java | 12 +++-
java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp | 7 --
java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp | 11 ---
6 files changed, 52 insertions(+), 25 deletions(-)
New commits:
commit c37b7e2804b9aceeea217d6a589dfcb3d7968fac
Author: Partha Aji <paji(a)redhat.com>
Date: Tue Jul 20 17:50:36 2010 -0400
Initial set of changes to show the 'files' include info on dirs and symlinks
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
index 83dba69..8ad97e8 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
@@ -1811,9 +1811,33 @@ ORDER BY SCC.position ASC
</query>
<elaborator params="sid">
SELECT CC.id, CC.label,
- ( SELECT count(CF.id)
- FROM rhnConfigFile CF
- WHERE CF.config_channel_id = CC.id ) AS file_count,
+ NVL( (
+ SELECT COUNT(CF.id)
+ FROM rhnConfigFile CF
+ INNER JOIN rhnConfigRevision CR ON CR.id = CF.latest_config_revision_id
+ INNER JOIN rhnConfigFileType CFT ON CFT.ID = CR.CONFIG_FILE_TYPE_ID
+ WHERE CF.config_channel_id = CC.id
+ AND CF.latest_config_revision_id IS NOT NULL
+ AND CFT.LABEL = 'file'
+ ), 0) AS files_only_count,
+ NVL( (
+ SELECT COUNT(CF.id)
+ FROM rhnConfigFile CF
+ INNER JOIN rhnConfigRevision CR ON CR.id = CF.latest_config_revision_id
+ INNER JOIN rhnConfigFileType CFT ON CFT.ID = CR.CONFIG_FILE_TYPE_ID
+ WHERE CF.config_channel_id = CC.id
+ AND CF.latest_config_revision_id IS NOT NULL
+ AND CFT.LABEL = 'symlink'
+ ), 0) AS symlinks_only_count,
+ NVL( (
+ SELECT COUNT(CF.id)
+ FROM rhnConfigFile CF
+ INNER JOIN rhnConfigRevision CR ON CR.id = CF.latest_config_revision_id
+ INNER JOIN rhnConfigFileType CFT ON CFT.ID = CR.CONFIG_FILE_TYPE_ID
+ WHERE CF.config_channel_id = CC.id
+ AND CF.latest_config_revision_id IS NOT NULL
+ AND CFT.LABEL = 'directory'
+ ), 0) AS dirs_only_count,
( SELECT count(CF.id)
FROM rhnConfigFile CF, rhnConfigFileName CFN
WHERE CF.config_channel_id = CC.id
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigActionHelper.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigActionHelper.java
index 6407866..df007e1 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigActionHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigActionHelper.java
@@ -259,11 +259,13 @@ public abstract class ConfigActionHelper {
* @param count the ConfigFileCount object,
* that stores info on the number of files and directories
* @param url the url to wrap the messages if so desired
+ * @param includeAddUrlForEmpty include "Add" section for empty
* @return the properly formatted File & Directories helper messages ..
*/
public static String makeFileCountsMessage(ConfigFileCount count,
- String url) {
- return makeFileCountsMessage(count, url, false);
+ String url,
+ boolean includeAddUrlForEmpty) {
+ return makeFileCountsMessage(count, url, false, includeAddUrlForEmpty);
}
/**
@@ -284,11 +286,13 @@ public abstract class ConfigActionHelper {
* return "0 files and 1 directory and 0 symlinks"
* else
* return "1 directory"
+ * @param includeAddUrlForEmpty include "Add" section for empty
* @return the properly formatted File & Directories helper messages ..
*/
public static String makeFileCountsMessage(ConfigFileCount count,
String url,
- boolean includeEmptyFilesAndDirs) {
+ boolean includeEmptyFilesAndDirs,
+ boolean includeAddUrlForEmpty) {
long fileCount = count.getFiles(), dirCount = count.getDirectories(),
symlinkCount = count.getSymlinks();
int fileSuffix = getSuffix(fileCount);
@@ -300,7 +304,7 @@ public abstract class ConfigActionHelper {
"_symlinks_" + symlinkSuffix;
if (fileSuffix == NONE && dirSuffix == NONE && symlinkSuffix == NONE) {
- if (url != null) {
+ if (includeAddUrlForEmpty && url != null) {
key += "_url";
return service.getMessage(key, new Object[] {url});
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/OverviewAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/OverviewAction.java
index a64288c..d4cb3d5 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/OverviewAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/OverviewAction.java
@@ -97,6 +97,7 @@ public class OverviewAction extends RhnAction {
/**
* {@inheritDoc}
*/
+ @Override
public ActionForward execute(ActionMapping mapping,
ActionForm formIn,
HttpServletRequest request,
@@ -155,7 +156,7 @@ public class OverviewAction extends RhnAction {
url = ADD_FILES_URL + "?sid=" + server.getId();
}
context.getRequest().setAttribute(key,
- ConfigActionHelper.makeFileCountsMessage(info, url));
+ ConfigActionHelper.makeFileCountsMessage(info, url, true));
}
@@ -241,7 +242,7 @@ public class OverviewAction extends RhnAction {
Object [] params = new Object[2];
params[0] = ConfigActionHelper.makeFileCountsMessage(total,
- null, true);
+ null, true, true);
params[1] = ACTION_DETAILS_URL +
"?hid=" + ca.getId() + "&sid=" + server.getId();
String messageKey;
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/ConfigChannelDto.java b/java/code/src/com/redhat/rhn/frontend/dto/ConfigChannelDto.java
index 26d1df0..b01f87d 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/ConfigChannelDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/ConfigChannelDto.java
@@ -167,6 +167,15 @@ public class ConfigChannelDto extends BaseDto {
return fileCount;
}
+
+ /**
+ * Makes a nice looking file counts message
+ * @return the file description
+ */
+ public String getFileCountsMessage() {
+ return getFilesAndDirsDisplayString();
+ }
+
/**
* @param fileCountIn The fileCount to set.
*/
@@ -177,6 +186,7 @@ public class ConfigChannelDto extends BaseDto {
/**
* @return Returns the id.
*/
+ @Override
public Long getId() {
return id;
}
@@ -413,7 +423,7 @@ public class ConfigChannelDto extends BaseDto {
symlinks = symlinksOnlyCount.intValue();
}
ConfigFileCount count = ConfigFileCount.create(files, dirs, symlinks);
- return ConfigActionHelper.makeFileCountsMessage(count, null);
+ return ConfigActionHelper.makeFileCountsMessage(count, null, false, false);
}
/**
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp
index f3a70a3..09f2f76 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp
@@ -41,12 +41,7 @@
<rhn:column header="globalconfiglist.jsp.files"
url="/rhn/configuration/ChannelFiles.do?ccid=${current.id}"
renderUrl="${current.fileCount > 0}">
- <c:if test="${current.fileCount == 1}">
- <bean:message key="config.common.onefile" />
- </c:if>
- <c:if test="${current.fileCount != 1}">
- <bean:message key="config.common.numfiles" arg0="${current.fileCount}"/>
- </c:if>
+ <c:out value="${current.fileCountsMessage}"/>
</rhn:column>
<rhn:column header="globalconfiglist.jsp.systems"
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp
index 2418961..1955a11 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp
@@ -37,15 +37,8 @@
${current.label}
</rhn:column>
- <rhn:column header="sdc.configlist.jsp.files"
- url="/rhn/configuration/ChannelFiles.do?ccid=${current.id}"
- renderUrl="${current.fileCount > 0}">
- <c:if test="${current.fileCount == 1}">
- <bean:message key="config.common.onefile" />
- </c:if>
- <c:if test="${current.fileCount != 1}">
- <bean:message key="config.common.numfiles" arg0="${current.fileCount}"/>
- </c:if>
+ <rhn:column header="sdc.configlist.jsp.files">
+ ${current.fileCountsMessage}
</rhn:column>
<rhn:column header="sdc.configlist.jsp.deployablefiles">
13 years, 10 months
java/buildconf
by Justin Sherrill
java/buildconf/build-props.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 719203097e732dc321d86e8cf8a5690777da1917
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Jul 20 17:47:31 2010 -0400
making the devel setup use asm instead of objectweb-asm if it exists
diff --git a/java/buildconf/build-props.xml b/java/buildconf/build-props.xml
index 9694e15..dc3ec66 100644
--- a/java/buildconf/build-props.xml
+++ b/java/buildconf/build-props.xml
@@ -91,9 +91,8 @@
</else>
</if>
-
<property name="run.jar.dependencies"
- value="antlr ${asm} cglib c3p0 commons-discovery dom4j ehcache jaf jta
+ value="antlr asm cglib c3p0 commons-discovery dom4j ehcache jaf jta
ojdbc14 oscache sitemesh taglibs-standard xalan-j2 xerces-j2
xml-commons-apis ${common.jar.dependencies}" />
13 years, 10 months
search-server/spacewalk-search
by Shannon Hughes
search-server/spacewalk-search/build.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 58407d7337943b0652a290e0cb843dc30059e50c
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Tue Jul 20 16:07:52 2010 -0400
updated the ivy repo url for search server
diff --git a/search-server/spacewalk-search/build.properties b/search-server/spacewalk-search/build.properties
index b8fd474..b03455e 100644
--- a/search-server/spacewalk-search/build.properties
+++ b/search-server/spacewalk-search/build.properties
@@ -9,7 +9,7 @@ dist.dir=dist
jar.name=spacewalk-search
jar.version=1.0
jar.file.name=${jar.name}-${jar.version}.jar
-ivyserver= http://jmrodri.fedorapeople.org
+ivyserver= http://partha.fedorapeople.org
ivy.log.module.when.found=false
ivy.log.resolved.revision=false
# Checkstyle config entries
13 years, 10 months
Changes to 'refs/tags/spacewalk-java-1.1.32-1'
by Justin Sherrill
Tag 'spacewalk-java-1.1.32-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2010-07-20 19:32 +0000
Tagging package [spacewalk-java] version [1.1.32-1] in directory [java/].
Changes since rhn-virtualization-5.4.14-1:
Justin Sherrill (2):
fixing java build scripts to use objectweb-asm library if it exists versus the normal asm
Automatic commit of package [spacewalk-java] release [1.1.32-1].
Miroslav Suchý (2):
enable caching for action packages.fullUpdate
enable caching for action errata.update
---
client/rhel/rhn-client-tools/src/actions/errata.py | 4 ---
client/rhel/yum-rhn-plugin/actions/packages.py | 5 ----
java/build.xml | 1
java/buildconf/build-props.xml | 24 ++++++++++++++++++---
java/buildconf/build-taskdefs.xml | 4 ---
java/spacewalk-java.spec | 9 +++++++
rel-eng/packages/spacewalk-java | 2 -
7 files changed, 33 insertions(+), 16 deletions(-)
---
13 years, 10 months