spacewalk-commits April 2013

spacewalk-commits@lists.fedorahosted.org

12 participants
275 discussions

Changes to 'refs/tags/spacewalk-reports-1.10.4-1'
by Tomáš Kašpárek 09 Apr '13

09 Apr '13

Tag 'spacewalk-reports-1.10.4-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-04-09 13:51 +0000 Tagging package [spacewalk-reports] version [1.10.4-1] in directory [reporting/]. Changes since spacewalk-backend-1.10.17-1: Tomas Kasparek (1): Automatic commit of package [spacewalk-reports] release [1.10.4-1]. --- rel-eng/packages/spacewalk-reports | 2 +- reporting/spacewalk-reports.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages reporting/spacewalk-reports.spec
by Tomáš Kašpárek 09 Apr '13

09 Apr '13

rel-eng/packages/spacewalk-reports | 2 +- reporting/spacewalk-reports.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit f4b2b810b6a73aaf4620213a876e68a11b303c39 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Apr 9 15:51:07 2013 +0200 Automatic commit of package [spacewalk-reports] release [1.10.4-1]. diff --git a/rel-eng/packages/spacewalk-reports b/rel-eng/packages/spacewalk-reports index 8bdd20f..898669e 100644 --- a/rel-eng/packages/spacewalk-reports +++ b/rel-eng/packages/spacewalk-reports @@ -1 +1 @@ -1.10.3-1 reporting/ +1.10.4-1 reporting/ diff --git a/reporting/spacewalk-reports.spec b/reporting/spacewalk-reports.spec index f2c805d..54fbddc 100644 --- a/reporting/spacewalk-reports.spec +++ b/reporting/spacewalk-reports.spec @@ -2,7 +2,7 @@ Name: spacewalk-reports Summary: Script based reporting Group: Applications/Internet License: GPLv2 -Version: 1.10.3 +Version: 1.10.4 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING %changelog +* Tue Apr 09 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.4-1 +- moving system currency config defaults from separate file to rhn_java.conf + * Wed Mar 20 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.3-1 - making system-currency work on postgres - making system-crash-details work on postgres

1 0

Changes to 'refs/tags/spacewalk-backend-1.10.17-1'
by Tomáš Kašpárek 09 Apr '13

09 Apr '13

Tag 'spacewalk-backend-1.10.17-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-04-09 13:49 +0000 Tagging package [spacewalk-backend] version [1.10.17-1] in directory [backend/]. Changes since spacewalk-java-1.10.48-1: Jan Dobes (1): Removing unnecessary else. Tomas Kasparek (2): moving system currency config defaults from separate file to rhn_java.conf Automatic commit of package [spacewalk-backend] release [1.10.17-1]. --- backend/rhn-conf/rhn_sc.conf | 21 ----------- backend/spacewalk-backend.spec | 6 ++- java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 12 +++--- java/code/src/com/redhat/rhn/common/util/StringUtil.java | 5 -- java/conf/rhn_java.conf | 21 +++++++++++ rel-eng/packages/spacewalk-backend | 2 - reporting/reports/data/system-currency | 12 +++--- 7 files changed, 39 insertions(+), 40 deletions(-) ---

1 0

backend/spacewalk-backend.spec rel-eng/packages
by Tomáš Kašpárek 09 Apr '13

09 Apr '13

backend/spacewalk-backend.spec | 5 ++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit c6f426aee96147044919ffab237ccfedc46fb94d Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Apr 9 15:49:16 2013 +0200 Automatic commit of package [spacewalk-backend] release [1.10.17-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 24586cd..662bb46 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -12,7 +12,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 1.10.16 +Version: 1.10.17 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -637,6 +637,9 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Tue Apr 09 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.17-1 +- moving system currency config defaults from separate file to rhn_java.conf + * Fri Apr 05 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.16-1 - 929238 - fixed local path for file:// repos - 918333 - reflect schema change diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 05795be..dd57fd1 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.10.16-1 backend/ +1.10.17-1 backend/

1 0

backend/rhn-conf backend/spacewalk-backend.spec java/code java/conf reporting/reports
by Tomáš Kašpárek 09 Apr '13

09 Apr '13

backend/rhn-conf/rhn_sc.conf | 21 ----------- backend/spacewalk-backend.spec | 1 java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 12 +++--- java/conf/rhn_java.conf | 21 +++++++++++ reporting/reports/data/system-currency | 12 +++--- 5 files changed, 33 insertions(+), 34 deletions(-) New commits: commit a9d861a0e7be5f7f8ddeeb33ac16b7db83990472 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Apr 9 15:41:56 2013 +0200 moving system currency config defaults from separate file to rhn_java.conf diff --git a/backend/rhn-conf/rhn_sc.conf b/backend/rhn-conf/rhn_sc.conf deleted file mode 100644 index d689e70..0000000 --- a/backend/rhn-conf/rhn_sc.conf +++ /dev/null @@ -1,21 +0,0 @@ -# default values for system currency multipliers -# needed by spacewalk-report for system currency report -# these values are also hardcoded in java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java - -# multiplier for critical security errata -sc.crit = 32 - -# multiplier for important security errata -sc.imp = 16 - -# multiplier for moderate important security errata -sc.mod = 8 - -# multiplier for low important security errata -sc.low = 4 - -# multiplier for bugfix errra -sc.bug = 2 - -# multiplier for ehnancement errata -sc.enh = 1 diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 8c94d31..24586cd 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -530,7 +530,6 @@ rm -f %{rhnconf}/rhnSecret.py* %dir %{rhnroot}/server/handlers/config %{rhnroot}/server/handlers/config/* %attr(644,root,apache) %{rhnconfigdefaults}/rhn_server_config-management.conf -%attr(644,root,apache) %{rhnconfigdefaults}/rhn_sc.conf %attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-config-management.conf %config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-config-files diff --git a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java index ccb27db..7eeef6f 100644 --- a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java +++ b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java @@ -156,12 +156,12 @@ public class ConfigDefaults { /** * System Currency defaults */ - public static final String SYSTEM_CURRENCY_CRIT = "sc.crit"; - public static final String SYSTEM_CURRENCY_IMP = "sc.imp"; - public static final String SYSTEM_CURRENCY_MOD = "sc.mod"; - public static final String SYSTEM_CURRENCY_LOW = "sc.low"; - public static final String SYSTEM_CURRENCY_BUG = "sc.bug"; - public static final String SYSTEM_CURRENCY_ENH = "sc.enh"; + public static final String SYSTEM_CURRENCY_CRIT = "java.sc_crit"; + public static final String SYSTEM_CURRENCY_IMP = "java.sc_imp"; + public static final String SYSTEM_CURRENCY_MOD = "java.sc_mod"; + public static final String SYSTEM_CURRENCY_LOW = "java.sc_low"; + public static final String SYSTEM_CURRENCY_BUG = "java.sc_bug"; + public static final String SYSTEM_CURRENCY_ENH = "java.sc_enh"; private ConfigDefaults() { } diff --git a/java/conf/rhn_java.conf b/java/conf/rhn_java.conf index 2b0bc02..282a781 100644 --- a/java/conf/rhn_java.conf +++ b/java/conf/rhn_java.conf @@ -53,3 +53,24 @@ java.custom_footer = # text to be displayed on the login page # (join long lines with \, HTML is okay to use) java.login_banner = + +# default values for system currency multipliers +# needed by spacewalk-report for system currency report + +# multiplier for critical security errata +java.sc_crit = 32 + +# multiplier for important security errata +java.sc_imp = 16 + +# multiplier for moderate important security errata +java.sc_mod = 8 + +# multiplier for low important security errata +java.sc_low = 4 + +# multiplier for bugfix errra +java.sc_bug = 2 + +# multiplier for ehnancement errata +java.sc_enh = 1 diff --git a/reporting/reports/data/system-currency b/reporting/reports/data/system-currency index a8cd59d..82d97ec 100644 --- a/reporting/reports/data/system-currency +++ b/reporting/reports/data/system-currency @@ -22,12 +22,12 @@ columns: params: - p_crit sc.crit - p_imp sc.imp - p_mod sc.mod - p_low sc.low - p_bug sc.bug - p_enh sc.enh + p_crit java.sc_crit + p_imp java.sc_imp + p_mod java.sc_mod + p_low java.sc_low + p_bug java.sc_bug + p_enh java.sc_enh sql:

1 0

java/code
by Jan Dobes 09 Apr '13

09 Apr '13

java/code/src/com/redhat/rhn/common/util/StringUtil.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit f841ba3af8edd01c7c7bfeb61118fee57d04e815 Author: Jan Dobes <jdobes(a)redhat.com> Date: Tue Apr 9 11:49:21 2013 +0200 Removing unnecessary else. diff --git a/java/code/src/com/redhat/rhn/common/util/StringUtil.java b/java/code/src/com/redhat/rhn/common/util/StringUtil.java index 9d3a97b..44687b4 100644 --- a/java/code/src/com/redhat/rhn/common/util/StringUtil.java +++ b/java/code/src/com/redhat/rhn/common/util/StringUtil.java @@ -825,13 +825,10 @@ public class StringUtil { if (bytes.length > length) { return new String(Arrays.copyOf(bytes, length), "UTF-8"); } - else { - return str; - } } catch (UnsupportedEncodingException e) { logger.warn("Unable to convert to UTF-8 bytes."); - return str; } + return str; } }

1 0

Changes to 'refs/tags/spacewalk-java-1.10.48-1'
by Jan Dobes 08 Apr '13

08 Apr '13

Tag 'spacewalk-java-1.10.48-1' created by Jan Dobes <jdobes(a)redhat.com> at 2013-04-08 17:23 +0000 Tagging package [spacewalk-java] version [1.10.48-1] in directory [java/]. Changes since spacewalk-java-1.10.47-1: Jan Dobes (2): Fixed truncating of strings to work with UTF-8 characters properly. Automatic commit of package [spacewalk-java] release [1.10.48-1]. --- java/code/src/com/redhat/rhn/common/util/StringUtil.java | 24 +++++++++++ java/code/src/com/redhat/rhn/domain/action/Action.java | 31 ++++++++------- java/spacewalk-java.spec | 5 +- rel-eng/packages/spacewalk-java | 2 4 files changed, 47 insertions(+), 15 deletions(-) ---

1 0

2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Jan Dobes 08 Apr '13

08 Apr '13

java/code/src/com/redhat/rhn/common/util/StringUtil.java | 24 +++++++++++ java/code/src/com/redhat/rhn/domain/action/Action.java | 31 ++++++++------- java/spacewalk-java.spec | 5 +- rel-eng/packages/spacewalk-java | 2 4 files changed, 47 insertions(+), 15 deletions(-) New commits: commit 2ce476518ca0b718b6dbe9274ad59ebfbb74074d Author: Jan Dobes <jdobes(a)redhat.com> Date: Mon Apr 8 19:23:45 2013 +0200 Automatic commit of package [spacewalk-java] release [1.10.48-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index dde7cc3..b75d25a 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: 1.10.47 +Version: 1.10.48 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -678,6 +678,9 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Mon Apr 08 2013 Jan Dobes 1.10.48-1 +- Fixed truncating of strings to work with UTF-8 characters properly. + * Mon Apr 08 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.47-1 - set emptykey for errata lists diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 929ccd8..6503a00 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.10.47-1 java/ +1.10.48-1 java/ commit 823981c10a211ea49424142c2fe76a0177bc9d68 Author: Jan Dobes <jdobes(a)redhat.com> Date: Mon Apr 8 16:59:34 2013 +0200 Fixed truncating of strings to work with UTF-8 characters properly. diff --git a/java/code/src/com/redhat/rhn/common/util/StringUtil.java b/java/code/src/com/redhat/rhn/common/util/StringUtil.java index 6a5d8d9..9d3a97b 100644 --- a/java/code/src/com/redhat/rhn/common/util/StringUtil.java +++ b/java/code/src/com/redhat/rhn/common/util/StringUtil.java @@ -15,7 +15,9 @@ package com.redhat.rhn.common.util; +import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; @@ -810,4 +812,26 @@ public class StringUtil { } return Boolean.FALSE; } + + /** + * Tests String byte-length and eventually truncates + * @param str input String + * @param length target length + * @return truncated String + */ + public static String getBytesTruncatedString(String str, int length) { + try { + byte[] bytes = str.getBytes("UTF-8"); + if (bytes.length > length) { + return new String(Arrays.copyOf(bytes, length), "UTF-8"); + } + else { + return str; + } + } + catch (UnsupportedEncodingException e) { + logger.warn("Unable to convert to UTF-8 bytes."); + return str; + } + } } diff --git a/java/code/src/com/redhat/rhn/domain/action/Action.java b/java/code/src/com/redhat/rhn/domain/action/Action.java index f9dc977..084b2fd 100644 --- a/java/code/src/com/redhat/rhn/domain/action/Action.java +++ b/java/code/src/com/redhat/rhn/domain/action/Action.java @@ -14,19 +14,20 @@ */ package com.redhat.rhn.domain.action; -import com.redhat.rhn.domain.BaseDomainHelper; -import com.redhat.rhn.domain.action.server.ServerAction; -import com.redhat.rhn.domain.org.Org; -import com.redhat.rhn.domain.user.User; - -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; - import java.io.Serializable; import java.util.Date; import java.util.HashSet; import java.util.Set; +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; + +import com.redhat.rhn.common.util.StringUtil; +import com.redhat.rhn.domain.BaseDomainHelper; +import com.redhat.rhn.domain.action.server.ServerAction; +import com.redhat.rhn.domain.org.Org; +import com.redhat.rhn.domain.user.User; + /** * Action - Class representation of the table rhnAction. * @version $Rev$ @@ -118,11 +119,8 @@ public class Action extends BaseDomainHelper implements Serializable { * @param nameIn to set */ public void setName(String nameIn) { - if (nameIn != null && nameIn.length() > NAME_LENGTH_LIMIT) { - this.name = nameIn.substring(0, NAME_LENGTH_LIMIT); - } - else { - this.name = nameIn; + if (nameIn != null) { + this.name = StringUtil.getBytesTruncatedString(nameIn, NAME_LENGTH_LIMIT); } } @@ -194,6 +192,7 @@ public class Action extends BaseDomainHelper implements Serializable { * Getter for created * @return Date to get */ + @Override public Date getCreated() { return this.created; } @@ -202,6 +201,7 @@ public class Action extends BaseDomainHelper implements Serializable { * Setter for created * @param createdIn to set */ + @Override public void setCreated(Date createdIn) { this.created = createdIn; } @@ -210,6 +210,7 @@ public class Action extends BaseDomainHelper implements Serializable { * Getter for modified * @return Date to get */ + @Override public Date getModified() { return this.modified; } @@ -218,6 +219,7 @@ public class Action extends BaseDomainHelper implements Serializable { * Setter for modified * @param modifiedIn to set */ + @Override public void setModified(Date modifiedIn) { this.modified = modifiedIn; } @@ -333,6 +335,7 @@ public class Action extends BaseDomainHelper implements Serializable { /** * {@inheritDoc} */ + @Override public boolean equals(final Object other) { if (other == null || !(other instanceof Action)) { return false; @@ -356,6 +359,7 @@ public class Action extends BaseDomainHelper implements Serializable { /** * {@inheritDoc} */ + @Override public int hashCode() { return new HashCodeBuilder().append(this.getId()).append(this.getOrg()) .append(this.getName()) @@ -371,6 +375,7 @@ public class Action extends BaseDomainHelper implements Serializable { /** * {@inheritDoc} */ + @Override public String toString() { StringBuffer result = new StringBuffer(); result.append(id);

1 0

Changes to 'refs/tags/spacewalk-java-1.10.47-1'
by Tomas Lestach 08 Apr '13

08 Apr '13

Tag 'spacewalk-java-1.10.47-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-04-08 15:11 +0000 Tagging package [spacewalk-java] version [1.10.47-1] in directory [java/]. Changes since spacewalk-utils-1.10.4-1: Tomas Lestach (2): set emptykey for errata lists Automatic commit of package [spacewalk-java] release [1.10.47-1]. --- java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf | 2 +- java/code/webapp/WEB-INF/pages/errata/all.jsp | 1 + java/code/webapp/WEB-INF/pages/errata/relevant.jsp | 1 + java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 5 files changed, 8 insertions(+), 3 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach 08 Apr '13

08 Apr '13

java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit c76b1a0512cf8f4209554f57cd2c613576b458af Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Apr 8 17:11:46 2013 +0200 Automatic commit of package [spacewalk-java] release [1.10.47-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 6b0cb2f..dde7cc3 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: 1.10.46 +Version: 1.10.47 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -678,6 +678,9 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Mon Apr 08 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.47-1 +- set emptykey for errata lists + * Mon Apr 08 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.46-1 - cleaned obsoleted trans-units diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 8ca6ead..929ccd8 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.10.46-1 java/ +1.10.47-1 java/

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits April 2013