February 2014 - spacewalk-commits - Fedora Mailing-Lists

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

by mkollar

Tag 'spacewalk-java-2.1.155-1' created by Matej Kollar <mkollar(a)redhat.com> at 2014-02-18 16:02 +0000 Tagging package [spacewalk-java] version [2.1.155-1] in directory [java/]. Changes since spacewalk-backend-2.1.51-1: Matej Kollar (5): Simple attempt to find problematic things in jsps Fixing unclosed meta Fixing unclosed br Fixing unclosed hr Automatic commit of package [spacewalk-java] release [2.1.155-1]. Tomas Kasparek (1): correct grammar --- java/buildconf/apidoc/singlepage/apiindex.txt | 2 java/code/src/com/redhat/rhn/frontend/dto/monitoring/ServerProbeDto.java | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java | 12 ++--- java/code/src/com/redhat/rhn/frontend/taglibs/FormatDateTag.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java | 4 - java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java | 10 ++-- java/code/webapp/WEB-INF/decorators/layout_head.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp | 4 - java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp | 4 - java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp | 4 - java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp | 2 java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp | 4 - java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp | 6 +- java/code/webapp/WEB-INF/pages/profiles/details.jsp | 2 java/code/webapp/WEB-INF/pages/rhnpackage/changelog.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp | 2 java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp | 8 +-- java/code/webapp/WEB-INF/pages/systems/probes/details.jsp | 2 java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp | 2 java/code/webapp/WEB-INF/pages/systems/sdc/rebootsystem.jsp | 2 java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp | 2 java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp | 2 java/licenses/mx4j.html | 6 +- java/scripts/jsp-check-helper.sed | 9 ++++ java/scripts/jsp-check.sh | 21 ++++++++++ java/spacewalk-java.spec | 10 ++++ rel-eng/packages/spacewalk-java | 2 37 files changed, 94 insertions(+), 56 deletions(-) ---

10 years, 4 months

1
0
0 / 0

java/spacewalk-java.spec rel-eng/packages

by mkollar

java/spacewalk-java.spec | 10 +++++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) New commits: commit a0b0f4e939c03436bb7a4069a82ef59616dc6d03 Author: Matej Kollar <mkollar(a)redhat.com> Date: Tue Feb 18 17:02:02 2014 +0100 Automatic commit of package [spacewalk-java] release [2.1.155-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index f2f724a..aeb1960 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.1.154 +Version: 2.1.155 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -801,6 +801,14 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Tue Feb 18 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.155-1 +- correct grammar +- Fixing unclosed hr +- Fixing unclosed br +- Fixing unclosed meta +- Simple attempt to find problematic things in jsps +- don't add & twice to the parameters of the url + * Mon Feb 17 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.154-1 - 1064573 - make sidenav html valid diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 7cd8d7d..4888449 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.154-1 java/ +2.1.155-1 java/

10 years, 4 months

1
0
0 / 0

java/code

by Tomáš Kašpárek

java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f5f14c667c5e0f274d5345a3b2aa1cac2fa688e9 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Feb 18 16:40:39 2014 +0100 correct grammar 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 5ace5ac..7565856 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 @@ -15082,7 +15082,7 @@ any of these revisions. Are you sure you want to do this?</source> <source>Script does not contain shell definition.</source> </trans-unit> <trans-unit id="stringutil.scriptcheck.error.noscript"> - <source>Script is does not seems like doing anything.</source> + <source>Script does not seem doing anything.</source> </trans-unit>  <trans-unit id="ssm.patches.list.header">

10 years, 4 months

1
0
0 / 0

4 commits - java/buildconf java/code java/licenses java/scripts

by mkollar

java/buildconf/apidoc/singlepage/apiindex.txt | 2 java/code/src/com/redhat/rhn/frontend/dto/monitoring/ServerProbeDto.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java | 12 ++--- java/code/src/com/redhat/rhn/frontend/taglibs/FormatDateTag.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java | 4 - java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java | 10 ++-- java/code/webapp/WEB-INF/decorators/layout_head.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp | 4 - java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp | 4 - java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp | 4 - java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp | 2 java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp | 4 - java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp | 6 +- java/code/webapp/WEB-INF/pages/profiles/details.jsp | 2 java/code/webapp/WEB-INF/pages/rhnpackage/changelog.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp | 2 java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp | 8 +-- java/code/webapp/WEB-INF/pages/systems/probes/details.jsp | 2 java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp | 2 java/code/webapp/WEB-INF/pages/systems/sdc/rebootsystem.jsp | 2 java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp | 2 java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp | 2 java/licenses/mx4j.html | 6 +- java/scripts/jsp-check-helper.sed | 9 ++++ java/scripts/jsp-check.sh | 21 ++++++++++ 34 files changed, 83 insertions(+), 53 deletions(-) New commits: commit fe17c57dfa73ad7bc12423c8a3d374c4833897ae Author: Matej Kollar <mkollar(a)redhat.com> Date: Tue Feb 18 16:21:17 2014 +0100 Fixing unclosed hr diff --git a/java/buildconf/apidoc/singlepage/apiindex.txt b/java/buildconf/apidoc/singlepage/apiindex.txt index cca8bbd..407a64a 100644 --- a/java/buildconf/apidoc/singlepage/apiindex.txt +++ b/java/buildconf/apidoc/singlepage/apiindex.txt @@ -4,4 +4,4 @@ <li><a href="#${handler.name}">$handler.name</a></li> #end </ul> -<hr> +<hr /> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp index bb0a1b6..1104d1c 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp @@ -55,7 +55,7 @@ <html:hidden property="suite_id" value="${probeSuite.id}"/> <c:if test="${not empty pageList}"> <div class="text-right"> - <hr> + <hr /> <html:submit property="dispatch"> <bean:message key="probesuitesystems.jsp.detachsystem"/> </html:submit> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp index 059d0cd..c4f1468 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp @@ -35,7 +35,7 @@ <html:hidden property="suite_id" value="${probeSuite.id}"/> <c:if test="${not empty pageList}"> <div class="text-right"> - <hr><bean:message key="probesuitesystemsedit.jsp.monscouttouse"/> + <hr /><bean:message key="probesuitesystemsedit.jsp.monscouttouse"/> <select name="satCluster"> <c:forEach items="${satClusters}" var="cluster"> <option value="${cluster.id}">${cluster.description}</option> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp index d8a1ce4..2cdb954 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp @@ -52,7 +52,7 @@ function modifyUploadCheckbox(checkbox) { </div> <div class="panel-body"> <p><bean:message key="orgconfig.jsp.description"/></p> - <hr> + <hr /> <form method="post" class="form-horizontal" action="/rhn/admin/multiorg/OrgConfigDetails.do"> diff --git a/java/code/webapp/WEB-INF/pages/profiles/details.jsp b/java/code/webapp/WEB-INF/pages/profiles/details.jsp index 28303a4..4b79638 100644 --- a/java/code/webapp/WEB-INF/pages/profiles/details.jsp +++ b/java/code/webapp/WEB-INF/pages/profiles/details.jsp @@ -15,7 +15,7 @@ <bean:message key="profile.details.summary"/> </div> - <hr> + <hr /> <table class="details"> <tr> diff --git a/java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp b/java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp index 2e4d85a..90cbd9d 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp @@ -60,7 +60,7 @@ </tbody> </table> <html:hidden property="submitted" value="true"/> - <div class="text-right"><hr> + <div class="text-right"><hr /> <input type="submit" name="schedule_remote_command" value="<bean:message key='ssm.operations.provisioning.remotecommand.form.submit'/>"> <input type="hidden" name="use_date" value="true" /> </div> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp b/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp index cfce89c..1d2f733 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp @@ -27,7 +27,7 @@ <html:hidden property="sid" value="${system.id}"/> <html:hidden property="submitted" value="true"/> </table> - <hr> + <hr /> <div class="text-right"><html:submit><bean:message key="kickstart.session_cancel.jsp.cancel"/></html:submit></div> </html:form> </body> diff --git a/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp b/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp index 9cb5b05..2ceda65 100644 --- a/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp +++ b/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp @@ -20,7 +20,7 @@ <p> <bean:message key="your_edit_address.jsp.summary" /> </p> - <hr> + <hr /> <html:form action="/account/EditAddressSubmit" styleClass="form-horizontal"> <rhn:csrf /> <%@ include file="/WEB-INF/pages/common/fragments/user/edit_address_form.jspf" %> diff --git a/java/licenses/mx4j.html b/java/licenses/mx4j.html index a895cd4..f0e71f0 100644 --- a/java/licenses/mx4j.html +++ b/java/licenses/mx4j.html @@ -1,4 +1,4 @@ -<html><head><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>License</title><link href="styles.css" rel="stylesheet" type="text/css"><meta content="DocBook XSL Stylesheets V1.66.1" name="generator"><link rel="start" href="index.html" title="MX4J English Documentation"><link rel="up" href="ch01.html" title="Chapter 1. MX4J and JMX Overview"><link rel="prev" href="ch01.html" title="Chapter 1. MX4J and JMX Overview"><link rel="next" href="ch02.html" title="Chapter 2. JMX 1.2 Explained"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">License</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="ch01.html">Prev</a> </td><th align="center" width="60%">Chapter 1. MX4J and JMX Overview</th><td align="right" width="20%"> <a accesskey="n" href="ch02.h tml">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="N10070"></a>License</h2></div></div></div><p> +<html><head><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>License</title><link href="styles.css" rel="stylesheet" type="text/css"><meta content="DocBook XSL Stylesheets V1.66.1" name="generator"><link rel="start" href="index.html" title="MX4J English Documentation"><link rel="up" href="ch01.html" title="Chapter 1. MX4J and JMX Overview"><link rel="prev" href="ch01.html" title="Chapter 1. MX4J and JMX Overview"><link rel="next" href="ch02.html" title="Chapter 2. JMX 1.2 Explained"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">License</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="ch01.html">Prev</a> </td><th align="center" width="60%">Chapter 1. MX4J and JMX Overview</th><td align="right" width="20%"> <a accesskey="n" href="ch02.h tml">Next</a></td></tr></table><hr /></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="N10070"></a>License</h2></div></div></div><p> MX4J is released under an Apache-style license. In practice this means that you can do almost anything you want with the code, including its use in commercial software. <br /> @@ -57,4 +57,4 @@ individuals on behalf of MX4J. For more information on MX4J, please see <a href="http://mx4j.sourceforge.net" target="_top">http://mx4j.sourceforge.net</a> </pre> - </p></div><div class="navfooter"><hr><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="ch01.html">Prev</a> </td><td align="center" width="20%"><a accesskey="u" href="ch01.html">Up</a></td><td align="right" width="40%"> <a accesskey="n" href="ch02.html">Next</a></td></tr><tr><td valign="top" align="left" width="40%">Chapter 1. MX4J and JMX Overview </td><td align="center" width="20%"><a accesskey="h" href="index.html">Home</a></td><td valign="top" align="right" width="40%"> Chapter 2. JMX 1.2 Explained</td></tr></table></div></body></html> \ No newline at end of file + </p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="ch01.html">Prev</a> </td><td align="center" width="20%"><a accesskey="u" href="ch01.html">Up</a></td><td align="right" width="40%"> <a accesskey="n" href="ch02.html">Next</a></td></tr><tr><td valign="top" align="left" width="40%">Chapter 1. MX4J and JMX Overview </td><td align="center" width="20%"><a accesskey="h" href="index.html">Home</a></td><td valign="top" align="right" width="40%"> Chapter 2. JMX 1.2 Explained</td></tr></table></div></body></html> \ No newline at end of file commit c87d9c091ff968b1971b59f77d85b108273ac6f7 Author: Matej Kollar <mkollar(a)redhat.com> Date: Tue Feb 18 16:20:21 2014 +0100 Fixing unclosed br diff --git a/java/code/src/com/redhat/rhn/frontend/dto/monitoring/ServerProbeDto.java b/java/code/src/com/redhat/rhn/frontend/dto/monitoring/ServerProbeDto.java index f782406..6beea08 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/monitoring/ServerProbeDto.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/monitoring/ServerProbeDto.java @@ -77,7 +77,7 @@ public class ServerProbeDto extends CheckProbeDto { } /** - * Get a HTML friendly status string. Replaces \n and \r\n with <br> + * Get a HTML friendly status string. Replaces \n and \r\n with <br /> * @return HTML friendly string */ public String getStateOutputString() { diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java index 5af7c6e..ac53522 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java @@ -32,7 +32,7 @@ import org.apache.commons.lang.StringUtils; * <rhn:address type=MAILING> * </pre> * This outputs a table row tag containing a Header column, address info - * and a link to edit the address.<br> + * and a link to edit the address.<br /> * <pre> * Mailing: 444 Castro * Mountain View, CA 94043 @@ -178,10 +178,10 @@ public class AddressTag extends TagSupport { result.append("<address>"); // Address 1 and 2 result.append(address.getAddress1()); - result.append("<br>"); + result.append("<br />"); if (StringUtils.isNotBlank(address.getAddress2())) { result.append(address.getAddress2()); - result.append("<br>"); + result.append("<br />"); } // City @@ -193,18 +193,18 @@ public class AddressTag extends TagSupport { result.append(" "); result.append(address.getZip()); - result.append("<br>"); + result.append("<br />"); // Phones result.append(ls.getMessage("phone")); result.append(": "); result.append(address.getPhone()); - result.append("<br>"); + result.append("<br />"); if (StringUtils.isNotBlank(address.getFax())) { result.append(ls.getMessage("fax")); result.append(": "); result.append(address.getFax()); - result.append("<br>"); + result.append("<br />"); } result.append("</address>"); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/FormatDateTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/FormatDateTag.java index a485584..aa5cd33 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/FormatDateTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/FormatDateTag.java @@ -36,7 +36,7 @@ import javax.servlet.jsp.tagext.TagSupport; * Displays a value in a human format (eg. 3 minutes ago) * <pre> * <rhn:human-value value="${bean.value}"> - * </pre> Outputs a human readable text for the value relative to now.<br> + * </pre> Outputs a human readable text for the value relative to now.<br /> * */ public class FormatDateTag extends TagSupport { diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java index b8afaee..f846605 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java @@ -31,7 +31,7 @@ import com.redhat.rhn.manager.acl.AclManager; * <rhn:toolbar base="h1" img="/img/somegraphic.gif"> * </pre> * <p> - * Basic Attributes:<br> + * Basic Attributes:<br /> * <ul> * <li>base - base html tag for wrapping the toolbar. * <li>icon - name of the icon (css class) to be displayed to the left of the page title @@ -41,7 +41,7 @@ import com.redhat.rhn.manager.acl.AclManager; * <li>helpUrl - link to the help pages. * </ul> * <P> - * Action Attributes:<br> + * Action Attributes:<br /> * <ul> * <li>create button * <ul> diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java index 9ca2f20..d215be6 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java @@ -90,11 +90,11 @@ public class AddressTagTest extends RhnBaseTestCase { private String getPopulatedReturnValue(HttpServletRequest req, Long uid) { return "<strong>Mailing Address</strong>" + - "<address>444 Castro<br>" + - "#1<br>" + - "Mountain View, CA 94043<br>" + - "Phone: 650-555-1212<br>" + - "Fax: 650-555-1212<br>" + + "<address>444 Castro<br />" + + "#1<br />" + + "Mountain View, CA 94043<br />" + + "Phone: 650-555-1212<br />" + + "Fax: 650-555-1212<br />" + "</address>" + "<p>" + "<a class=\"btn btn-primary\" href=\"/EditAddress.do?type=M&uid=" + diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp index c2075c2..b726717 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp @@ -26,7 +26,7 @@ <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/filters.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - <br> + <br /> <rhn:list pageList="${requestScope.pageList}" noDataText="filters.jsp.nofilters"> <%-- There is only one list, but we have to define the same columns diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp index ad64684..2011d92 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp @@ -30,7 +30,7 @@ <table class="details" width="80%"> - <tr><bean:message key="channel.manage.errata.custommsg"/><br><br></tr> + <tr><bean:message key="channel.manage.errata.custommsg"/><br /><br /></tr> <tr> <th>Package Association:</th> @@ -73,7 +73,7 @@ </table> - <br><br> + <br /><br /> <c:choose> <c:when test="${pageList != null}"> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp index 7cbcc3b..96d5111 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp @@ -30,7 +30,7 @@ <table class="details" width="80%"> - <tr><bean:message key="channel.manage.errata.redhatmsg" /><br><br></tr> + <tr><bean:message key="channel.manage.errata.redhatmsg" /><br /><br /></tr> <tr> <th>Package Association:</th> @@ -95,7 +95,7 @@ </table> - <br><br> + <br /><br /> <c:choose> <c:when test="${pageList != null}"> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp index 5e760dd..359cb82 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp @@ -11,9 +11,9 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> -<br><br> +<br /><br /> <bean:message key="channel.manage.errata.confirmmsg"/> -<br><br> +<br /><br /> <rl:listset name="packageConfirm"> <rhn:csrf /> <rhn:submitted /> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf index 5142e5b..3844b28 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf @@ -11,7 +11,7 @@ <c:if test= "${not empty param.summary}"> <p><bean:message key="${param.summary}"/></p> </c:if> - <br> + <br /> <html:form method="post" action="${param.post_url}"> <rhn:csrf /> <table class="details"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp index 0e434b2..ab8a3c4 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp @@ -30,7 +30,7 @@ <rhn:require acl="user_role(org_admin)"> <li class="list-group-item"> <rhn:icon type="nav-bullet" /> <bean:message - key="yourrhn.jsp.task.manage_subscriptions" /> <br> + key="yourrhn.jsp.task.manage_subscriptions" /> <br /> &ensp; &ensp;<a href="/rhn/systems/SystemEntitlements.do"> <bean:message key="header.jsp.my_organization" /> </a> <strong>|</strong> <a diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp index 4b7127d..bd65ca8 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp @@ -81,7 +81,7 @@ /> </rl:column> </rl:list> - <br> + <br /> <c:import url="/WEB-INF/pages/common/fragments/configuration/sdc/viewmodifyfileactions.jspf"/> </rl:listset> </body> diff --git a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp index 725dc7b..67b260b 100644 --- a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp @@ -213,7 +213,7 @@ <rhn:highlight tag="strong" text="${search_string}"> <c:out value="${name}"/> </rhn:highlight> - <br> + <br /> </c:forEach> </rl:column> </c:when> @@ -241,7 +241,7 @@ ${cve.name} </rhn:highlight> </a> - <br> + <br /> </c:forEach> </rl:column> </c:when> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp index f0d0653..e00cea5 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp @@ -29,7 +29,7 @@ </div> </div> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/currently-kickstarted-systems.jspf" %> -<br><br> +<br /><br /> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/systems-tobe-kickstarted.jspf" %> </rl:listset> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp b/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp index f0ea006..5441b6e 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp @@ -66,7 +66,7 @@ function clickNewestTree() { property="value" labelProperty="label" /> </html:select> - <br><span class="small-text"><bean:message key="softwareedit.jsp.tip" /></span><br> + <br /><span class="small-text"><bean:message key="softwareedit.jsp.tip" /></span><br /> </td> </tr> <tr> @@ -83,10 +83,10 @@ function clickNewestTree() { </c:forEach> </c:when> <c:otherwise> - <br><b><bean:message key="softwareedit.jsp.nochildchannels" /></b><br> + <br /><b><bean:message key="softwareedit.jsp.nochildchannels" /></b><br /> </c:otherwise> </c:choose> - <br><span class="small-text"><bean:message key="softwareedit.jsp.warning" arg0="${ksdata.id}"/></span><br> + <br /><span class="small-text"><bean:message key="softwareedit.jsp.warning" arg0="${ksdata.id}"/></span><br /> </td> </tr> <tr> diff --git a/java/code/webapp/WEB-INF/pages/rhnpackage/changelog.jsp b/java/code/webapp/WEB-INF/pages/rhnpackage/changelog.jsp index 4f29828..31b8d84 100644 --- a/java/code/webapp/WEB-INF/pages/rhnpackage/changelog.jsp +++ b/java/code/webapp/WEB-INF/pages/rhnpackage/changelog.jsp @@ -18,7 +18,7 @@ <c:if test="${changelog != null}"> <c:forEach items="${changelog}" var="line"> - ${line}<br> + ${line}<br /> </c:forEach> </c:if> <c:if test="${changelog == null}"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp index 79313a1..7c845ed 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp @@ -35,7 +35,7 @@ </rhn:column> <rhn:column header="packagelist.jsp.packagesaffected"> <c:forEach var="item" items="${current.elabNvre}"> - ${item}<br> + ${item}<br /> </c:forEach> </rhn:column> </rhn:listdisplay> diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp index 6e00ea1..325bb53 100644 --- a/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp @@ -56,16 +56,16 @@ <p> <bean:message key="physicalhosts.jsp.para2" /> </p> - <br> + <br /> - <strong><bean:message key="physicalhosts.jsp.guestsofknown" /></strong><br> + <strong><bean:message key="physicalhosts.jsp.guestsofknown" /></strong><br /> <p> <ul> <li><bean:message key="physicalhosts.jsp.knownnote" /></li> <li><bean:message key="physicalhosts.jsp.note3" /></li> </ul> </p> - <strong><bean:message key="physicalhosts.jsp.guestsofunknown" /></strong><br> + <strong><bean:message key="physicalhosts.jsp.guestsofunknown" /></strong><br /> <p> <bean:message key="physicalhosts.jsp.unknownnote" /> <ul> @@ -73,7 +73,7 @@ <li><bean:message key="physicalhosts.jsp.note3" /></li> </ul> </p> - <strong><bean:message key="physicalhosts.jsp.guestsofnonredhat" /></strong><br> + <strong><bean:message key="physicalhosts.jsp.guestsofnonredhat" /></strong><br /> <p> <bean:message key="physicalhosts.jsp.nonredhatnote" /> </p> diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp b/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp index 6352437..af9888a 100644 --- a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp @@ -140,7 +140,7 @@ <c:if test="${requestScope.show_graph}"> <h2><bean:message key="probedetails.jsp.graph"/></h2> <img src="/rhn/systems/details/probes/ProbeGraph.do?${requestScope.l10ned_selected_metrics_string}${requestScope.selected_metrics_string}startts=${requestScope.startts}&endts=${requestScope.endts}&sid=${system.id}&probe_id=${probe.id}"/> - <br><a href="/rhn/systems/details/probes/ProbeGraph.do?lde=1&${requestScope.l10ned_selected_metrics_string}${requestScope.selected_metrics_string}startts=${requestScope.startts}&endts=${requestScope.endts}&sid=${system.id}&probe_id=${probe.id}"><rhn:icon type="item-download-csv" /><bean:message key="listdisplay.csv"/></a> + <br /><a href="/rhn/systems/details/probes/ProbeGraph.do?lde=1&${requestScope.l10ned_selected_metrics_string}${requestScope.selected_metrics_string}startts=${requestScope.startts}&endts=${requestScope.endts}&sid=${system.id}&probe_id=${probe.id}"><rhn:icon type="item-download-csv" /><bean:message key="listdisplay.csv"/></a> </c:if> <c:if test="${requestScope.show_log}"> <h2><bean:message key="probedetails.jsp.eventlog"/></h2> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp index 5f3c27e..ac890f4 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp @@ -6,7 +6,7 @@ <html:html > <body> -<br> +<br /> <div> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/rebootsystem.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/rebootsystem.jsp index 6e03b4a..e619a39 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/rebootsystem.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/rebootsystem.jsp @@ -21,7 +21,7 @@ </div> <div class="panel-body"> <bean:message key="reboot.jsp.summary" /> - <br> + <br /> <bean:message key="reboot.jsp.widgetsummary"/> <form action="/rhn/systems/details/RebootSystem.do?sid=${sid}" method="post" class="form-horizontal"> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp index 420d8c1..23f7849 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp @@ -8,7 +8,7 @@ <html:html > <body> -<br> +<br /> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> diff --git a/java/licenses/mx4j.html b/java/licenses/mx4j.html index 22a13da..a895cd4 100644 --- a/java/licenses/mx4j.html +++ b/java/licenses/mx4j.html @@ -1,7 +1,7 @@ <html><head><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>License</title><link href="styles.css" rel="stylesheet" type="text/css"><meta content="DocBook XSL Stylesheets V1.66.1" name="generator"><link rel="start" href="index.html" title="MX4J English Documentation"><link rel="up" href="ch01.html" title="Chapter 1. MX4J and JMX Overview"><link rel="prev" href="ch01.html" title="Chapter 1. MX4J and JMX Overview"><link rel="next" href="ch02.html" title="Chapter 2. JMX 1.2 Explained"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">License</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="ch01.html">Prev</a> </td><th align="center" width="60%">Chapter 1. MX4J and JMX Overview</th><td align="right" width="20%"> <a accesskey="n" href="ch02.h tml">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="N10070"></a>License</h2></div></div></div><p> MX4J is released under an Apache-style license. In practice this means that you can do almost anything you want with the code, including its - use in commercial software. <br> + use in commercial software. <br /> The actual text of the license is included below: </p><p> <pre class="literallayout"> commit 945556006501408526aa3bd00eba46616c107b8e Author: Matej Kollar <mkollar(a)redhat.com> Date: Tue Feb 18 16:12:39 2014 +0100 Fixing unclosed meta diff --git a/java/code/webapp/WEB-INF/decorators/layout_head.jsp b/java/code/webapp/WEB-INF/decorators/layout_head.jsp index f03a3fa..54a106a 100644 --- a/java/code/webapp/WEB-INF/decorators/layout_head.jsp +++ b/java/code/webapp/WEB-INF/decorators/layout_head.jsp @@ -27,7 +27,7 @@ <link rel="stylesheet" href="/fonts/font-awesome/css/font-awesome.css" /> <link rel="stylesheet" href="/fonts/font-spacewalk/css/spacewalk-font.css" /> - <meta name="viewport" content="initial-scale=1"> + <meta name="viewport" content="initial-scale=1" /> <rhn:require acl="is(development_environment)"> <link rel="stylesheet/less" type="text/css" href="/css/spacewalk.less" /> commit 0e2a644ade8e5c488715d3fea7daef94b7a95e61 Author: Matej Kollar <mkollar(a)redhat.com> Date: Tue Feb 18 16:10:28 2014 +0100 Simple attempt to find problematic things in jsps work in progress diff --git a/java/scripts/jsp-check-helper.sed b/java/scripts/jsp-check-helper.sed new file mode 100644 index 0000000..6065489 --- /dev/null +++ b/java/scripts/jsp-check-helper.sed @@ -0,0 +1,9 @@ +s/<%\@\s\+$taglib\|page$ $[^%]\|%[^>]$*%>//g +s/<%$[^%]\|%[^>]$*%>/aaa/g +s/<bean:message [^>]*\/>/bean text/g +s/<decorator:getProperty [^>]*\/>/something/g +s/<c:out [^>]*\/>/out something/g +s/<$\/\?[^:> ]*$:/<\1_/g +s/^/<xml>/ +s/$/<\/xml>/ +s/<!DOCTYPE [^>]*>// diff --git a/java/scripts/jsp-check.sh b/java/scripts/jsp-check.sh new file mode 100644 index 0000000..170e4ef --- /dev/null +++ b/java/scripts/jsp-check.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +SCRIPTDIR=$( dirname $( readlink --canonicalize $0 ) ) +SED_HELPER=$SCRIPTDIR/jsp-check-helper.sed + +# Run me in Spacewalk git root... + +# | xargs -n 1 bash -c "tr '\\n' ' ' < \$1 | sed -f $SED_HELPER | xmllint - >& /dev/null ; if [[ \$? -ne 0 ]]; then echo \$1; fi" -- + +echo "Potential problems:" >&2 +git locate '*.jsp*' \ +| grep 'jspf\?$' \ +| while read; do + FILE=$REPLY + tr '\n' ' ' < "$FILE" \ + | sed -f "$SED_HELPER" \ + | xmllint - >& /dev/null + if [[ $? -ne 0 ]]; then + echo "$FILE" + fi +done

10 years, 4 months

1
0
0 / 0

Changes to 'refs/tags/spacewalk-backend-2.1.51-1'

by Michael Mraka

Tag 'spacewalk-backend-2.1.51-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2014-02-18 15:20 +0000 Tagging package [spacewalk-backend] version [2.1.51-1] in directory [backend/]. Changes since spacewalk-schema-2.1.47-1: Jan Pazdziora (1): 1064296 - rename variable so it doesn't colide with reserved word Michael Mraka (1): Automatic commit of package [spacewalk-backend] release [2.1.51-1]. --- backend/satellite_tools/reposync.py | 4 ++-- backend/spacewalk-backend.spec | 5 ++++- rel-eng/packages/spacewalk-backend | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) ---

10 years, 4 months

1
0
0 / 0

2 commits - backend/satellite_tools backend/spacewalk-backend.spec rel-eng/packages

by Michael Mraka

backend/satellite_tools/reposync.py | 4 ++-- backend/spacewalk-backend.spec | 5 ++++- rel-eng/packages/spacewalk-backend | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) New commits: commit d00f25d216b544890fd176fb2e67ee1307fdc9a8 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Feb 18 16:20:22 2014 +0100 Automatic commit of package [spacewalk-backend] release [2.1.51-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index ba654c8..f746f1d 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -11,7 +11,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 2.1.50 +Version: 2.1.51 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -632,6 +632,9 @@ rm -f %{rhnconf}/rhnSecret.py* %{pythonrhnroot}/satellite_tools/exporter/xmlWriter.py* %changelog +* Tue Feb 18 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.51-1 +- 1064296 - rename variable so it doesn't colide with reserved word + * Fri Feb 14 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.50-1 - query should not end with semicolon in oracle diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index c110da5..8ffd429 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -2.1.50-1 backend/ +2.1.51-1 backend/ commit fe9029fe397336c561f1be28deb5d9a2ad9fe6e7 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Feb 18 16:17:05 2014 +0100 1064296 - rename variable so it doesn't colide with reserved word diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py index f3e2352..d336a88 100644 --- a/backend/satellite_tools/reposync.py +++ b/backend/satellite_tools/reposync.py @@ -620,7 +620,7 @@ class RepoSync(object): insert_h = rhnSQL.prepare(""" insert into rhnKSTreeFile (kstree_id, relative_filename, checksum_id, file_size, last_modified, created, modified) - values (:id, :path, lookup_checksum('sha256', :checksum), :size, epoch_seconds_to_timestamp_tz(:st_time), current_timestamp, current_timestamp) + values (:id, :path, lookup_checksum('sha256', :checksum), :st_size, epoch_seconds_to_timestamp_tz(:st_time), current_timestamp, current_timestamp) """) dirs = [ '' ] while len(dirs) > 0: @@ -646,7 +646,7 @@ class RepoSync(object): print "Retrieving %s" % d + s plug.get_file(d + s, os.path.join(CFG.MOUNT_POINT, ks_path)) st = os.stat(local_path) - insert_h.execute(id = ks_id, path = d + s, checksum = getFileChecksum('sha256', local_path), size = st.st_size, st_time = st.st_mtime) + insert_h.execute(id = ks_id, path = d + s, checksum = getFileChecksum('sha256', local_path), st_size = st.st_size, st_time = st.st_mtime) rhnSQL.commit()

10 years, 4 months

1
0
0 / 0

Changes to 'refs/tags/spacewalk-schema-2.1.47-1'

by Milan Zazrivec

Tag 'spacewalk-schema-2.1.47-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2014-02-18 13:33 +0000 Tagging package [spacewalk-schema] version [2.1.47-1] in directory [schema/spacewalk/]. Changes since spacewalk-java-2.1.154-1: Jan Dobes (1): do not use fixed size Milan Zazrivec (2): 1063821 - update rhnServer after queue_server to avoid a deadlock Automatic commit of package [spacewalk-schema] release [2.1.47-1]. Tomas Kasparek (2): add space after alphabar result sign don't add & twice to the parameters of the url --- branding/css/spacewalk-tables.less | 2 branding/css/spacewalk-theme.less | 1 java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java | 2 rel-eng/packages/spacewalk-schema | 2 schema/spacewalk/oracle/packages/rhn_channel.pkb | 34 ++-------- schema/spacewalk/postgres/packages/rhn_channel.pkb | 29 ++------ schema/spacewalk/spacewalk-schema.spec | 5 + schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.oracle | 34 ++-------- schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.postgresql | 28 ++------ 9 files changed, 42 insertions(+), 95 deletions(-) ---

10 years, 4 months

1
0
0 / 0

2 commits - rel-eng/packages schema/spacewalk

by Milan Zazrivec

rel-eng/packages/spacewalk-schema | 2 schema/spacewalk/oracle/packages/rhn_channel.pkb | 34 ++-------- schema/spacewalk/postgres/packages/rhn_channel.pkb | 29 ++------ schema/spacewalk/spacewalk-schema.spec | 5 + schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.oracle | 34 ++-------- schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.postgresql | 28 ++------ 6 files changed, 40 insertions(+), 92 deletions(-) New commits: commit e105488077adcd94986f59772416e9d97b38ea81 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Feb 18 14:33:28 2014 +0100 Automatic commit of package [spacewalk-schema] release [2.1.47-1]. diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index 24217df..7bfff01 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -2.1.46-1 schema/spacewalk/ +2.1.47-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index 83986ab..61721cd 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.46 +Version: 2.1.47 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz @@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-sql* %changelog +* Tue Feb 18 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.47-1 +- 1063821 - update rhnServer after queue_server to avoid a deadlock + * Mon Feb 17 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.46-1 - 1063821 - fix ORA-01422 error when removing a channel commit 062bebf04d5a627a4bcf646a58aa4f41d54eadb8 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Feb 18 14:28:31 2014 +0100 1063821 - update rhnServer after queue_server to avoid a deadlock There's no need to be locking rhnServerNeededCache, as long as we move update rhnServer after rhnServerNeededCache modification (to enforce serialization). diff --git a/schema/spacewalk/oracle/packages/rhn_channel.pkb b/schema/spacewalk/oracle/packages/rhn_channel.pkb index c0f5482..c03b667 100644 --- a/schema/spacewalk/oracle/packages/rhn_channel.pkb +++ b/schema/spacewalk/oracle/packages/rhn_channel.pkb @@ -61,7 +61,6 @@ IS consenting_user NUMBER; allowed number := 0; is_fve CHAR(1) := 'N'; - update_lock number; BEGIN if user_id_in is not null then allowed := rhn_channel.user_role_check(channel_id_in, user_id_in, 'subscribe'); @@ -156,23 +155,16 @@ IS where c.id = channel_id_in ); - begin - select min(1) - into update_lock - from rhnServerNeededCache - where server_id = server_id_in - for update; - exception WHEN no_data_found THEN - null; - end; - - UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in; INSERT INTO rhnServerChannel (server_id, channel_id, is_fve) VALUES (server_id_in, channel_id_in, is_fve); IF recalcfamily_in > 0 THEN rhn_channel.update_family_counts(channel_family_id_val, server_org_id_val); END IF; queue_server(server_id_in, immediate_in); + + update rhnServer + set channels_changed = current_timestamp + where id = server_id_in; ELSE rhn_exception.raise_exception('channel_family_no_subscriptions'); END IF; @@ -464,7 +456,6 @@ IS server_org_id_val NUMBER; available_subscriptions NUMBER; server_already_in_chan BOOLEAN; - update_lock number; cursor channel_family_is_proxy(channel_family_id_in in number) is select 1 from rhnChannelFamily @@ -516,7 +507,6 @@ IS END IF; if deleting_server = 0 then - insert into rhnServerHistory (id,server_id,summary,details) ( select rhn_event_id_seq.nextval, server_id_in, @@ -525,24 +515,16 @@ IS from rhnChannel c where c.id = channel_id_in ); - - begin - select min(1) - into update_lock - from rhnServerNeededCache - where server_id = server_id_in - for update; - exception when no_data_found then - null; - end; - - UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in; end if; DELETE FROM rhnServerChannel WHERE server_id = server_id_in AND channel_id = channel_id_in; if deleting_server = 0 then queue_server(server_id_in, immediate_in); + + update rhnServer + set channels_changed = current_timestamp + where id = server_id_in; end if; channel_family_id_val := rhn_channel.family_for_channel(channel_id_in); diff --git a/schema/spacewalk/postgres/packages/rhn_channel.pkb b/schema/spacewalk/postgres/packages/rhn_channel.pkb index 02c998b..307d618 100644 --- a/schema/spacewalk/postgres/packages/rhn_channel.pkb +++ b/schema/spacewalk/postgres/packages/rhn_channel.pkb @@ -1,4 +1,4 @@ --- oracle equivalent source sha1 5abe0e2ce13d05c06619611ef8e25e443de89d1d +-- oracle equivalent source sha1 2e2fac296f948ee69f0ab14fec74b664eca814b5 -- -- Copyright (c) 2008--2013 Red Hat, Inc. -- @@ -65,7 +65,6 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ consenting_user NUMERIC; allowed numeric; is_fve_char char(1) := 'N'; - update_lock numeric; BEGIN if user_id_in is not null then allowed := rhn_channel.user_role_check(channel_id_in, user_id_in, 'subscribe'); @@ -149,19 +148,17 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ where c.id = channel_id_in ); - select min(1) - into update_lock - from rhnServerNeededCache - where server_id = server_id_in - for update; - - UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in; INSERT INTO rhnServerChannel (server_id, channel_id, is_fve) VALUES (server_id_in, channel_id_in, is_fve_char); IF recalcfamily_in > 0 THEN perform rhn_channel.update_family_counts(channel_family_id_val, server_org_id_val); END IF; + perform queue_server(server_id_in, immediate_in); + + update rhnServer + set channels_changed = current_timestamp + where id = server_id_in; ELSE perform rhn_exception.raise_exception('channel_family_no_subscriptions'); END IF; @@ -491,7 +488,6 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ server_org_id_val NUMERIC; available_subscriptions NUMERIC; server_already_in_chan BOOLEAN; - update_lock numeric; channel_family_is_proxy cursor(channel_family_id_in numeric) for select 1 from rhnChannelFamily @@ -534,7 +530,6 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ END IF; if deleting_server = 0 then - insert into rhnServerHistory (id,server_id,summary,details) ( select nextval('rhn_event_id_seq'), server_id_in, @@ -543,20 +538,16 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ from rhnChannel c where c.id = channel_id_in ); - - select min(1) - into update_lock - from rhnServerNeededCache - where server_id = server_id_in - for update; - - UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in; end if; DELETE FROM rhnServerChannel WHERE server_id = server_id_in AND channel_id = channel_id_in; if deleting_server = 0 then perform queue_server(server_id_in, immediate_in); + + update rhnServer + set channels_changed = current_timestamp + where id = server_id_in; end if; channel_family_id_val := rhn_channel.family_for_channel(channel_id_in); diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.oracle index 80f5511..06f91e8 100644 --- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.oracle +++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.oracle @@ -61,7 +61,6 @@ IS consenting_user NUMBER; allowed number := 0; is_fve CHAR(1) := 'N'; - update_lock number; BEGIN if user_id_in is not null then allowed := rhn_channel.user_role_check(channel_id_in, user_id_in, 'subscribe'); @@ -156,23 +155,16 @@ IS where c.id = channel_id_in ); - begin - select min(1) - into update_lock - from rhnServerNeededCache - where server_id = server_id_in - for update; - exception WHEN no_data_found THEN - null; - end; - - UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in; INSERT INTO rhnServerChannel (server_id, channel_id, is_fve) VALUES (server_id_in, channel_id_in, is_fve); IF recalcfamily_in > 0 THEN rhn_channel.update_family_counts(channel_family_id_val, server_org_id_val); END IF; queue_server(server_id_in, immediate_in); + + update rhnServer + set channels_changed = current_timestamp + where id = server_id_in; ELSE rhn_exception.raise_exception('channel_family_no_subscriptions'); END IF; @@ -464,7 +456,6 @@ IS server_org_id_val NUMBER; available_subscriptions NUMBER; server_already_in_chan BOOLEAN; - update_lock number; cursor channel_family_is_proxy(channel_family_id_in in number) is select 1 from rhnChannelFamily @@ -516,7 +507,6 @@ IS END IF; if deleting_server = 0 then - insert into rhnServerHistory (id,server_id,summary,details) ( select rhn_event_id_seq.nextval, server_id_in, @@ -525,24 +515,16 @@ IS from rhnChannel c where c.id = channel_id_in ); - - begin - select min(1) - into update_lock - from rhnServerNeededCache - where server_id = server_id_in - for update; - exception when no_data_found then - null; - end; - - UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in; end if; DELETE FROM rhnServerChannel WHERE server_id = server_id_in AND channel_id = channel_id_in; if deleting_server = 0 then queue_server(server_id_in, immediate_in); + + update rhnServer + set channels_changed = current_timestamp + where id = server_id_in; end if; channel_family_id_val := rhn_channel.family_for_channel(channel_id_in); diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.postgresql index 7baba7b..ecfb421 100644 --- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.postgresql +++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.postgresql @@ -1,4 +1,4 @@ --- oracle equivalent source sha1 c32b134834133c1642e86f58782416d79004b52b +-- oracle equivalent source sha1 ff46072fee2cd6e7793a2fd52e16526ec6e4d062 -- -- Copyright (c) 2008--2013 Red Hat, Inc. -- @@ -65,7 +65,6 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ consenting_user NUMERIC; allowed numeric; is_fve_char char(1) := 'N'; - update_lock numeric; BEGIN if user_id_in is not null then allowed := rhn_channel.user_role_check(channel_id_in, user_id_in, 'subscribe'); @@ -149,19 +148,16 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ where c.id = channel_id_in ); - select min(1) - into update_lock - from rhnServerNeededCache - where server_id = server_id_in - for update; - - UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in; INSERT INTO rhnServerChannel (server_id, channel_id, is_fve) VALUES (server_id_in, channel_id_in, is_fve_char); IF recalcfamily_in > 0 THEN perform rhn_channel.update_family_counts(channel_family_id_val, server_org_id_val); END IF; perform queue_server(server_id_in, immediate_in); + + update rhnServer + set channels_changed = current_timestamp + where id = server_id_in; ELSE perform rhn_exception.raise_exception('channel_family_no_subscriptions'); END IF; @@ -491,7 +487,6 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ server_org_id_val NUMERIC; available_subscriptions NUMERIC; server_already_in_chan BOOLEAN; - update_lock numeric; channel_family_is_proxy cursor(channel_family_id_in numeric) for select 1 from rhnChannelFamily @@ -534,7 +529,6 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ END IF; if deleting_server = 0 then - insert into rhnServerHistory (id,server_id,summary,details) ( select nextval('rhn_event_id_seq'), server_id_in, @@ -543,20 +537,16 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ from rhnChannel c where c.id = channel_id_in ); - - select min(1) - into update_lock - from rhnServerNeededCache - where server_id = server_id_in - for update; - - UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in; end if; DELETE FROM rhnServerChannel WHERE server_id = server_id_in AND channel_id = channel_id_in; if deleting_server = 0 then perform queue_server(server_id_in, immediate_in); + + update rhnServer + set channels_changed = current_timestamp + where id = server_id_in; end if; channel_family_id_val := rhn_channel.family_for_channel(channel_id_in);

10 years, 4 months

1
0
0 / 0

java/code

by Tomáš Kašpárek

java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fc2206ef6af0ab07b369e241bf71df7c3044d214 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Feb 18 13:57:13 2014 +0100 don't add & twice to the parameters of the url addressing following line: WARNING: Parameters: Invalid chunk '' ignored. line 189: params.append("&"); line 204: if (params.length() > 1) { params.append("&"); params weren't empty so another & was added diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java index 7eee746..2489341 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java @@ -186,7 +186,7 @@ public class ListTagUtil { params.append("?"); } else if (url.indexOf('?') != url.length() - 1) { - params.append("&"); + url += "&"; } for (Enumeration<String> en = request.getParameterNames(); en.hasMoreElements();) {

10 years, 4 months

1
0
0 / 0

branding/css

by Jan Dobes

branding/css/spacewalk-theme.less | 1 - 1 file changed, 1 deletion(-) New commits: commit 63a5b26f9b5cbdc41fa8e05aedf82185f90e957a Author: Jan Dobes <jdobes(a)redhat.com> Date: Tue Feb 18 13:06:34 2014 +0100 do not use fixed size to display whole number in pagination lists, in certain browsers were displayed just 2 digits diff --git a/branding/css/spacewalk-theme.less b/branding/css/spacewalk-theme.less index dc3edfa..1eaa230 100644 --- a/branding/css/spacewalk-theme.less +++ b/branding/css/spacewalk-theme.less @@ -292,7 +292,6 @@ header { .display-number{ .input-sm; display: inline-block; - width: 5em; border: 1px solid #dddddd; } .view-systems-registered{

10 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits February 2014