spacewalk-commits December 2013

spacewalk-commits@lists.fedorahosted.org

11 participants
227 discussions

java/spacewalk-java.spec rel-eng/packages
by Tomáš Kašpárek 17 Dec '13

17 Dec '13

java/spacewalk-java.spec | 6 +++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit ff5d6af02905eb238dff2677d84e70b0a9488060 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Dec 17 16:55:31 2013 +0100 Automatic commit of package [spacewalk-java] release [2.1.102-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index f0a3ce2..ac69461 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.101 +Version: 2.1.102 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -785,6 +785,10 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Tue Dec 17 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.102-1 +- delete ConfigSystemTag as these things are easily handled in jsp +- Local variables need not to be synchronized + * Tue Dec 17 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.101-1 - updated links to system group delete page - converted system group > delete page from pxt to java diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 71f5297..fb46ee4 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.101-1 java/ +2.1.102-1 java/

1 0

java/code
by Tomáš Kašpárek 17 Dec '13

17 Dec '13

java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigSystemTag.java | 149 ---------- java/code/src/com/redhat/rhn/frontend/configuration/tags/test/ConfigSystemTagTest.java | 114 ------- java/code/src/com/redhat/rhn/frontend/taglibs/rhn-config-management.tld | 36 -- java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf | 3 java/code/webapp/WEB-INF/pages/configuration/files/comparedeployed.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp | 13 6 files changed, 9 insertions(+), 308 deletions(-) New commits: commit 5f63b61621012d1b09a53597abcec92190eb597f Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Dec 17 15:52:49 2013 +0100 delete ConfigSystemTag as these things are easily handled in jsp diff --git a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigSystemTag.java b/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigSystemTag.java deleted file mode 100644 index f0759ee..0000000 --- a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigSystemTag.java +++ /dev/null @@ -1,149 +0,0 @@ -/** - * Copyright (c) 2009--2010 Red Hat, Inc. - * - * This software is licensed to you under the GNU General Public License, - * version 2 (GPLv2). There is NO WARRANTY for this software, express or - * implied, including the implied warranties of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 - * along with this software; if not, see - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. - * - * Red Hat trademarks are not licensed under GPLv2. No permission is - * granted to use or replicate Red Hat trademarks that are incorporated - * in this software or its documentation. - */ -package com.redhat.rhn.frontend.configuration.tags; - -import org.apache.commons.lang.StringEscapeUtils; - -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.BodyTagSupport; -import javax.servlet.jsp.tagext.TagSupport; - -/** - * ConfigSystemTag - * @version $Rev$ - */ -public class ConfigSystemTag extends TagSupport { - - /** - * Comment for <code>serialVersionUID</code> - */ - private static final long serialVersionUID = 1582063245840138731L; - - public static final String SYSTEM_ALT_KEY = "system.common.systemAlt"; - public static final String SYSTEM_LIST_ICON = "/img/rhn-listicon-system.gif"; - public static final String SYSTEM_HEADER_ICON = "/img/rhn-icon-system.gif"; - public static final String SYSTEM_URL = - "/rhn/systems/details/configuration/Overview.do"; - - /** - * <cfg:system id="" name="" nolink=""> - */ - private String id; - private String name; - private boolean nolink; - - /** - * {@inheritDoc} - */ - public int doEndTag() throws JspException { - if (nolink || id == null) { - writeIcon(); - ConfigTagHelper.write(StringEscapeUtils.escapeXml(name), pageContext); - } - else { - String url = makeConfigSystemUrl(id); - ConfigTagHelper.write("<a href=\"" + url + "\">", pageContext); - writeIcon(); - ConfigTagHelper.write(StringEscapeUtils.escapeXml(name) + "</a>", pageContext); - } - return BodyTagSupport.SKIP_BODY; - } - - /** - * {@inheritDoc} - */ - public void release() { - id = null; - name = null; - nolink = false; - super.release(); - } - - - /** - * @param val the id to set - */ - public void setId(String val) { - this.id = val; - } - - - /** - * @param isNoLink the nolink to set - */ - public void setNolink(String isNoLink) { - this.nolink = Boolean.TRUE.toString().equalsIgnoreCase(isNoLink); - } - - - /** - * @param value the name to set - */ - public void setName(String value) { - this.name = value; - } - - private void writeIcon() throws JspException { - ConfigTagHelper.writeIcon(SYSTEM_LIST_ICON, SYSTEM_ALT_KEY, pageContext); - } - - /** - * Returns the URL to reach the SDC\ConfigOverview page for a system. - * This method may also be used with the el expression - * ${config:systemUrl('id')} - * This method is public static because - * EL functions defined in a TLD file, - * need to be public static methods.. systemConfig file - * @param id the SID of the system in question - * @return the URL to reach the cfg-overview page in the SDC - */ - public static String makeConfigSystemUrl(String id) { - return SYSTEM_URL + "?sid=" + id; - } - - /** - * Returns the Header icon image path for a system - * This method is public static because - * EL functions defined in a TLD file, - * need to be public static methods.. - * @return the image path - */ - public static final String getHeaderIconFor() { - return SYSTEM_HEADER_ICON; - } - - /** - * Returns the List icon image path for a system - * This method is public static because - * EL functions defined in a TLD file, - * need to be public static methods.. - * @return the image path - */ - public static final String getListIconFor() { - return SYSTEM_LIST_ICON; - } - - - /** - * Returns the Header alt key for a system - * This method is public static because - * EL functions defined in a TLD file, - * need to be public static methods.. - * @return the alt key - */ - public static final String getAltKeyFor() { - return SYSTEM_ALT_KEY; - } -} diff --git a/java/code/src/com/redhat/rhn/frontend/configuration/tags/test/ConfigSystemTagTest.java b/java/code/src/com/redhat/rhn/frontend/configuration/tags/test/ConfigSystemTagTest.java deleted file mode 100644 index 9833931..0000000 --- a/java/code/src/com/redhat/rhn/frontend/configuration/tags/test/ConfigSystemTagTest.java +++ /dev/null @@ -1,114 +0,0 @@ -/** - * Copyright (c) 2009--2010 Red Hat, Inc. - * - * This software is licensed to you under the GNU General Public License, - * version 2 (GPLv2). There is NO WARRANTY for this software, express or - * implied, including the implied warranties of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 - * along with this software; if not, see - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. - * - * Red Hat trademarks are not licensed under GPLv2. No permission is - * granted to use or replicate Red Hat trademarks that are incorporated - * in this software or its documentation. - */ -package com.redhat.rhn.frontend.configuration.tags.test; - -import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.frontend.configuration.tags.ConfigSystemTag; -import com.redhat.rhn.testing.RhnBaseTestCase; -import com.redhat.rhn.testing.RhnMockHttpServletRequest; -import com.redhat.rhn.testing.RhnMockJspWriter; -import com.redhat.rhn.testing.TagTestUtils; - -import com.mockobjects.helpers.TagTestHelper; - -import java.net.URL; - -import javax.servlet.jsp.tagext.Tag; - -/** - * ConfigSystemTagTest - * @version $Rev$ - */ -public class ConfigSystemTagTest extends RhnBaseTestCase { - /** - * Called once per test method. - * @throws Exception if an error occurs during setup. - */ - protected void setUp() throws Exception { - super.setUp(); - ConfigSystemTag tag = new ConfigSystemTag(); - RhnMockHttpServletRequest request = new RhnMockHttpServletRequest(); - TagTestHelper tth = TagTestUtils.setupTagTest(tag, - new URL("http://localhost"), - request); - tag.setPageContext(tth.getPageContext()); - } - - /** Test tag output for files - */ - public void testSystem() throws Exception { - - String alt = ConfigSystemTag.SYSTEM_ALT_KEY; - String imgName = ConfigSystemTag.SYSTEM_LIST_ICON; - - execTest(0, "bar", false, alt, imgName); - } - - public void execTest(int id, String name, boolean nolink, - String altKey, String imgName) throws Exception { - ConfigSystemTag tag = new ConfigSystemTag(); - RhnMockHttpServletRequest request = new RhnMockHttpServletRequest(); - TagTestHelper tth = TagTestUtils.setupTagTest(tag, - new URL("http://localhost"), - request); - tag.setPageContext(tth.getPageContext()); - if (id >= 0) { - tag.setId(String.valueOf(id)); - } - - tag.setName(name); - tag.setNolink(String.valueOf(nolink)); - - // ok let's test the tag - tth.assertDoStartTag(Tag.SKIP_BODY); - tth.assertDoEndTag(Tag.SKIP_BODY); - - RhnMockJspWriter rout = (RhnMockJspWriter) tth.getPageContext().getOut(); - - assertTrue(rout.toString().indexOf(name) > -1); - assertFalse(rout.toString().indexOf("alt =\"\"") > -1); - LocalizationService service = LocalizationService.getInstance(); - String alt = service.getMessage(altKey); - assertTrue(rout.toString().indexOf(alt) > -1); - assertTrue(rout.toString().indexOf(imgName) > -1); - if (!nolink && id >= 0) { - String url = "<a href=\"" + ConfigSystemTag.SYSTEM_URL + "?sid=" + id; - assertTrue(rout.toString().startsWith(url)); - } - else { - assertFalse(rout.toString().startsWith("<a href")); - } - - } - - public void testFunctions() { - checkFunctions(ConfigSystemTag.SYSTEM_HEADER_ICON, - ConfigSystemTag.SYSTEM_ALT_KEY, - "system"); - //also checking case sensititvity - checkFunctions(ConfigSystemTag.SYSTEM_HEADER_ICON, - ConfigSystemTag.SYSTEM_ALT_KEY, - "sYsTem"); - - String url = ConfigSystemTag.makeConfigSystemUrl("" + 1); - assertTrue(url.indexOf("sid=1") > -1); - assertTrue(url.startsWith(ConfigSystemTag.SYSTEM_URL)); - } - - private void checkFunctions(String icon, String altKey, String type) { - assertEquals(altKey, ConfigSystemTag.getAltKeyFor()); - assertEquals(icon, ConfigSystemTag.getHeaderIconFor()); - } -} diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-config-management.tld b/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-config-management.tld index e291ddf..7522689 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-config-management.tld +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-config-management.tld @@ -63,26 +63,6 @@ <rtexprvalue>true</rtexprvalue> </attribute> </tag> - <tag> - <name>system</name> - <tag-class>com.redhat.rhn.frontend.configuration.tags.ConfigSystemTag</tag-class> - <body-content>empty</body-content> - <attribute> - <name>id</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <name>name</name> - <required>true</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <name>nolink</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - </tag> <function> <name>channelUrl</name> @@ -138,21 +118,5 @@ <name>fileAlt</name> <function-class>com.redhat.rhn.frontend.configuration.tags.ConfigFileTag</function-class> <function-signature>java.lang.String getAltKeyFor(java.lang.String)</function-signature> - </function> - - <function> - <name>systemHeaderIcon</name> - <function-class>com.redhat.rhn.frontend.configuration.tags.ConfigSystemTag</function-class> - <function-signature>java.lang.String getHeaderIconFor()</function-signature> </function> - <function> - <name>systemListIcon</name> - <function-class>com.redhat.rhn.frontend.configuration.tags.ConfigSystemTag</function-class> - <function-signature>java.lang.String getListIconFor()</function-signature> - </function> - <function> - <name>systemAlt</name> - <function-class>com.redhat.rhn.frontend.configuration.tags.ConfigSystemTag</function-class> - <function-signature>java.lang.String getAltKeyFor()</function-signature> - </function> </taglib> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf index 55ca49f..718f538 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf @@ -3,6 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <c:set var="beanarg" scope="request"> <cfg:channel id="${channel.id}" @@ -25,7 +26,7 @@ <rhn:listdisplay filterBy="system.common.systemName" set="${requestScope.set}"> <rhn:set value="${current.id}" disabled="${not current.selectable}"/> <rhn:column header="globaldeploy.jsp.systemName-header"> - <cfg:system id="${current.id}" name="${current.name}" /><c:if test="${not current.deployable}">*</c:if> + <a href="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"><rhn:icon type="header-system" /> ${fn:escapeXml(current.name)} </a><c:if test="${not current.deployable}">*</c:if> </rhn:column> <rhn:column header="globaldeploy.jsp.overridden-header"> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/comparedeployed.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/comparedeployed.jsp index d76fe77..b44bb85 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/comparedeployed.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/comparedeployed.jsp @@ -29,7 +29,7 @@ <rhn:set value="${current.id}"/> <rhn:column header="system.common.systemName"> - <cfg:system id="${current.id}" name="${current.name}" /> + <a href="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"><rhn:icon type="header-system" /> ${fn:escapeXml(current.name)} </a> </rhn:column> <rhn:column header="comparedeployed.jsp.deployed"> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp index 4af2a56..bb2e818 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp @@ -4,14 +4,16 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <head> <meta name="name" value="sdc.config.jsp.header" /> </head> <body> <c:set var="revisionBean" value="${requestScope.revisionBean}"/> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> -<h2><img class="h2-image" src="${cfg:systemHeaderIcon()}"/> -<bean:message key="sdc.config.header.diff_result"/></h2> +<rhn:toolbar base="h2" icon="header-configuration"> +<bean:message key="sdc.config.header.diff_result"/> +</rhn:toolbar> <p> <c:set var="path" @@ -42,10 +44,7 @@ type = "${channel.configChannelType.label}" /></strong></c:set> -<c:set var="systemValue"><strong><cfg:system - name = "${requestScope.system.name}" - id = "${requestScope.system.id}" - /></strong></c:set> +<c:set var="systemValue"><strong><a href="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"><rhn:icon type="header-system" /> ${fn:escapeXml(current.name)} </a></strong></c:set> <table class="details"> @@ -79,4 +78,4 @@ </tr> </table> </p> -</body> \ No newline at end of file +</body>

1 0

java/code
by mkollar 17 Dec '13

17 Dec '13

java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cd8a079e49ffbe0a10cd1acb408b7b69bdce543d Author: Matej Kollar <mkollar(a)redhat.com> Date: Tue Dec 17 15:56:39 2013 +0100 Local variables need not to be synchronized It is considered inefficient. diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java index 55c677a..d164204 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java @@ -303,7 +303,7 @@ public class ListDisplayTagBase extends BodyTagSupport { HtmlTag tag = new HtmlTag("div"); tag.setAttribute("class", "spacewalk-filter-input input-group"); - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); HtmlTag input = new HtmlTag("input"); input.setAttribute("type", "text");

1 0

Changes to 'refs/tags/spacewalk-java-2.1.101-1'
by Michael Mraka 17 Dec '13

17 Dec '13

Tag 'spacewalk-java-2.1.101-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-12-17 14:37 +0000 Tagging package [spacewalk-java] version [2.1.101-1] in directory [java/]. Changes since tito-0.4.18-1.4: Jan Blazek (1): add Fedora20 comps Matej Kollar (1): Fixed link Michael Mraka (4): bootstrap tuning: fixed icons converted system group > delete page from pxt to java updated links to system group delete page Automatic commit of package [spacewalk-java] release [2.1.101-1]. Stephen Herr (1): 1043657 - allow 1 character system profile names Tomas Kasparek (3): render icon even while not displaying link rework logic of ConfigFileTag so it uses icons instead of gifs and cool stuff use file ype icons for config file details Tomas Lestach (2): enable building for fedora20 build missing builds in koji for fedora20 --- backend/common/rhnException.py | 2 backend/server/handlers/xmlrpc/registration.py | 2 java/code/src/com/redhat/rhn/frontend/action/groups/DeleteGroupAction.java | 53 ++ java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java | 2 java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigFileTag.java | 162 +------- java/code/src/com/redhat/rhn/frontend/configuration/tags/test/ConfigFileTagTest.java | 195 ---------- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 17 java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java | 3 java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf | 4 java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp | 6 java/code/webapp/WEB-INF/pages/groups/delete.jsp | 35 + java/code/webapp/WEB-INF/pages/groups/erratalist.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp | 2 java/code/webapp/WEB-INF/struts-config.xml | 21 + java/spacewalk-java.spec | 9 rel-eng/build-missing-builds.conf | 2 rel-eng/comps/comps-spacewalk-client-fedora20.xml | 38 + rel-eng/comps/comps-spacewalk-server-fedora20.xml | 176 +++++++++ rel-eng/koji-missing-builds.py | 3 rel-eng/packages/spacewalk-java | 2 rel-eng/releasers.conf | 2 rel-eng/tito.props | 4 spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 12 web/include/network/components/system_groups/sgdc_header.pxi | 2 25 files changed, 402 insertions(+), 356 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Michael Mraka 17 Dec '13

17 Dec '13

java/spacewalk-java.spec | 9 ++++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) New commits: commit 19559d41d075ec03dfe21c3cd4e4949286fe800b Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 17 15:37:13 2013 +0100 Automatic commit of package [spacewalk-java] release [2.1.101-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 91c57b5..f0a3ce2 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.100 +Version: 2.1.101 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -785,6 +785,13 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Tue Dec 17 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.101-1 +- updated links to system group delete page +- converted system group > delete page from pxt to java +- bootstrap tuning: fixed icons +- rework logic of ConfigFileTag so it uses icons instead of gifs and cool stuff +- fixing references to SSM errata page + * Mon Dec 16 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.100-1 - more icon fixes - Rewrite of errata_list.pxt to Java diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 219c95b..71f5297 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.100-1 java/ +2.1.101-1 java/

1 0

3 commits - java/code spacewalk/config web/include
by Michael Mraka 17 Dec '13

17 Dec '13

java/code/src/com/redhat/rhn/frontend/action/groups/DeleteGroupAction.java | 53 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 15 ++ java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf | 2 java/code/webapp/WEB-INF/pages/groups/delete.jsp | 35 ++++++ java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp | 2 java/code/webapp/WEB-INF/struts-config.xml | 21 +++ spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 12 -- web/include/network/components/system_groups/sgdc_header.pxi | 2 8 files changed, 127 insertions(+), 15 deletions(-) New commits: commit 4f3551c92453de58b4e4670b3b11820abec75202 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 17 10:57:57 2013 +0100 updated links to system group delete page diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf index 2d3e701..89e305a 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf @@ -12,7 +12,7 @@ <rhn:icon type="header-system-groups" title="<bean:message key='toolbar.work.with.group' />" /> <bean:message key="toolbar.work.with.group"/> </a> - <a href="/network/systems/groups/delete_confirm.pxt?sgid=${systemgroup.id}"> + <a href="/rhn/groups/Delete.do?sgid=${systemgroup.id}"> <rhn:icon type="item-del" title="<bean:message key='toolbar.delete.systemgroup'/>" /> <bean:message key="toolbar.delete.systemgroup"/> </a> diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf index b9c6591..9eb6dbb 100644 --- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf +++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf @@ -126,18 +126,6 @@ PerlConfigRequire PXT/Apache24Config.pm PerlAuthenHandler PXT::ApacheAuth require acl org_entitlement(sw_mgr_enterprise) - - <Files admin_list.pxt> - AuthType Basic - AuthName "RHN System Group Admin Area" - require acl user_role(system_group_admin); user_has_access_to_servergroup() - </Files> - - <Files delete_confirm.pxt> - AuthType Basic - AuthName "RHN System Group Admin Area" - require acl user_role(system_group_admin); user_has_access_to_servergroup() - </Files> </Directory> <Directory "/var/www/html/network/systems/details"> diff --git a/web/include/network/components/system_groups/sgdc_header.pxi b/web/include/network/components/system_groups/sgdc_header.pxi index 1e72df5..ec12f46 100644 --- a/web/include/network/components/system_groups/sgdc_header.pxi +++ b/web/include/network/components/system_groups/sgdc_header.pxi @@ -15,7 +15,7 @@ misc-icon="header-system-groups" misc-text="work with group" deletion-type="group" - deletion-url="delete_confirm.pxt?sgid={formvar:sgid}" + deletion-url="/rhn/groups/Delete.do?sgid={formvar:sgid}" deletion-acl="user_role(system_group_admin)"> <rhn-server-group-name /> </rhn-toolbar> commit d07747fb64a3dcdbb433570d99b2aee5bc2a56c0 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 17 10:57:57 2013 +0100 converted system group > delete page from pxt to java diff --git a/java/code/src/com/redhat/rhn/frontend/action/groups/DeleteGroupAction.java b/java/code/src/com/redhat/rhn/frontend/action/groups/DeleteGroupAction.java new file mode 100644 index 0000000..1bbc4ad --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/action/groups/DeleteGroupAction.java @@ -0,0 +1,53 @@ +/** + * Copyright (c) 2013 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.frontend.action.token; + +import com.redhat.rhn.domain.server.ManagedServerGroup; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnAction; +import com.redhat.rhn.frontend.struts.RhnHelper; +import com.redhat.rhn.manager.system.ServerGroupManager; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + + +/** + * DeleteGroupAction + * @version 1.0 + */ +public class DeleteGroupAction extends RhnAction { + private static final String DELETED_MESSAGE_KEY = "systemgroup.delete.deleted"; + /** {@inheritDoc} */ + public ActionForward execute(ActionMapping mapping, + ActionForm formIn, + HttpServletRequest request, + HttpServletResponse response) throws Exception { + RequestContext context = new RequestContext(request); + ManagedServerGroup serverGroup = context.lookupAndBindServerGroup(); + if (context.isSubmitted()) { + String [] params = {serverGroup.getName()}; + ServerGroupManager manager = ServerGroupManager.getInstance(); + manager.remove(context.getLoggedInUser(), serverGroup); + getStrutsDelegate().saveMessage(DELETED_MESSAGE_KEY, params, request); + return mapping.findForward("success"); + } + return mapping.findForward(RhnHelper.DEFAULT_FORWARD); + } +} 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 e559ec6..bf92d4e 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 @@ -5318,6 +5318,21 @@ value for this entitlement, excluding the default organization's consumption.</s <trans-unit id="systemgroup.details.admincount"> <source>group administrator(s)</source> </trans-unit> + <trans-unit id="systemgroup.delete.title"> + <source>System Group Deletion Confirmation</source> + </trans-unit> + <trans-unit id="systemgroup.delete.subtitle"> + <source>This will delete the following System Group: {1}{0}{2}</source> + </trans-unit> + <trans-unit id="systemgroup.delete.summary"> + <source>Note that this will only delete the system group itself, {0}not{1} any current systems that happen to be members.</source> + </trans-unit> + <trans-unit id="systemgroup.delete.confirm"> + <source>Confirm Deletion</source> + </trans-unit> + <trans-unit id="systemgroup.delete.deleted"> + <source>System group "{0}" deleted.</source> + </trans-unit> </group> <group> <context-group name="ctx"> diff --git a/java/code/webapp/WEB-INF/pages/groups/delete.jsp b/java/code/webapp/WEB-INF/pages/groups/delete.jsp new file mode 100644 index 0000000..d9c9466 --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/groups/delete.jsp @@ -0,0 +1,35 @@ +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> +<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> +<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> + +<html> +<body> +<%@ include file="/WEB-INF/pages/common/fragments/groups/header.jspf" %> + + <h2> + <bean:message key="systemgroup.delete.title"/> + </h2> + + <div class="page-summary"> + <p><bean:message key="systemgroup.delete.subtitle" + arg0="${systemgroup.name}" + arg1="<strong>" + arg2="</strong>"/></p> + <bean:message key="systemgroup.delete.summary" + arg0="<strong>" + arg1="</strong>"/> + </div> + + <html:form method="post" + action="/groups/Delete.do" + styleClass="form-horizontal"> + <rhn:csrf /> + <rhn:submitted/> + <html:hidden property="sgid" value="${param.sgid}" /> + <html:submit property="delete_button" styleClass="btn"> + <bean:message key="systemgroup.delete.confirm"/> + </html:submit> + </html:form> + </body> +</html> diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml index 20509c3..3a0a043 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -1165,6 +1165,12 @@ <form-property name="submitted" type="java.lang.Boolean" /> </form-bean> + <form-bean name="deleteSystemGroupForm" + type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm" > + <form-property name="sgid" type="java.lang.Long" /> + <form-property name="submitted" type="java.lang.Boolean" /> + </form-bean> + <form-bean name="editSystemGroupForm" type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm" > <form-property name="name" type="java.lang.String" /> @@ -3940,6 +3946,21 @@ redirect="true" /> </action> + <action path="/groups/Delete" + scope="request" + name="deleteSystemGroupForm" + input="/WEB-INF/pages/groups/delete.jsp" + type="com.redhat.rhn.frontend.action.token.DeleteGroupAction" + className="com.redhat.rhn.frontend.struts.RhnActionMapping" + > + <set-property property="postRequiredIfSubmitted" value="true" /> + <set-property property="acls" value="user_role(system_group_admin)"/> + <forward name="default" + path="/WEB-INF/pages/groups/delete.jsp"/> + <forward name="success" redirect = "true" + path="/systems/SystemGroupList.do"/> + </action> + <action path="/systems/details/configuration/ViewModifyCentralPaths" scope="request" type="com.redhat.rhn.frontend.action.configuration.sdc.ViewModifyPathsAction" commit 1ad0fd786ab947b4805d94c5d445a84ce6c1cf0b Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 17 09:02:49 2013 +0100 bootstrap tuning: fixed icons diff --git a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp index c0b971e..9f1c66c 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp @@ -32,7 +32,7 @@ <li class="list-group-item"> <div class="row"> <div class="col-sm-2"> - <rhn:icon type="header-errata" title='<bean:message key="ssm.overview.errata'/>" /> + <rhn:icon type="header-errata" title="<bean:message key='ssm.overview.errata'/>" /> <bean:message key="ssm.overview.errata"/> </div> <div class="col-sm-10">

1 0

rel-eng/build-missing-builds.conf rel-eng/koji-missing-builds.py
by Tomas Lestach 17 Dec '13

17 Dec '13

rel-eng/build-missing-builds.conf | 2 +- rel-eng/koji-missing-builds.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 39afe612b0e3aadbfd43cc29ffd6fff28470bcc5 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Dec 17 12:02:49 2013 +0100 build missing builds in koji for fedora20 diff --git a/rel-eng/build-missing-builds.conf b/rel-eng/build-missing-builds.conf index 634a253..aa6cb24 100644 --- a/rel-eng/build-missing-builds.conf +++ b/rel-eng/build-missing-builds.conf @@ -1,4 +1,4 @@ TITO_RELEASER=koji -TAGS="spacewalk-nightly-rhel5 spacewalk-nightly-rhel6 spacewalk-nightly-fedora18 spacewalk-nightly-fedora19" +TAGS="spacewalk-nightly-rhel5 spacewalk-nightly-rhel6 spacewalk-nightly-fedora18 spacewalk-nightly-fedora19 spacewalk-nightly-fedora20" FEDORA_UPLOAD=0 diff --git a/rel-eng/koji-missing-builds.py b/rel-eng/koji-missing-builds.py index b034c3f..1f529ff 100755 --- a/rel-eng/koji-missing-builds.py +++ b/rel-eng/koji-missing-builds.py @@ -36,7 +36,8 @@ distmap = {'rhel6':'.el6', 'rhel5':'.el5', 'rhel4':'.el4', 'fedora18':'.fc18', - 'fedora19':'.fc19'} + 'fedora19':'.fc19', + 'fedora20':'.fc20'} distsuffix = '' tag = args[0]

1 0

rel-eng/releasers.conf rel-eng/tito.props
by Tomas Lestach 17 Dec '13

17 Dec '13

rel-eng/releasers.conf | 2 +- rel-eng/tito.props | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) New commits: commit 6bd087056c61349fa89c4ec8678b1c05f55ade86 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Dec 17 11:58:42 2013 +0100 enable building for fedora20 diff --git a/rel-eng/releasers.conf b/rel-eng/releasers.conf index 9ae4fbf..f374dff 100644 --- a/rel-eng/releasers.conf +++ b/rel-eng/releasers.conf @@ -1,4 +1,4 @@ [koji] releaser = tito.release.KojiGitReleaser -autobuild_tags = spacewalk-nightly-rhel5 spacewalk-nightly-rhel6 spacewalk-nightly-fedora18 spacewalk-nightly-fedora19 +autobuild_tags = spacewalk-nightly-rhel5 spacewalk-nightly-rhel6 spacewalk-nightly-fedora18 spacewalk-nightly-fedora19 spacewalk-nightly-fedora20 git_url = git://git.fedorahosted.org/git/spacewalk.git diff --git a/rel-eng/tito.props b/rel-eng/tito.props index 26e38cb..3796243 100644 --- a/rel-eng/tito.props +++ b/rel-eng/tito.props @@ -23,3 +23,7 @@ blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient sm [spacewalk-nightly-fedora19] disttag = .fc19 blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm apt-spacewalk python-hwdata oracle-rhnsat-selinux mod_perl nodejs-less nodejs scons v8 gyp http-parser libuv c-ares19 nodejs-packaging + +[spacewalk-nightly-fedora20] +disttag = .fc20 +blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm apt-spacewalk python-hwdata oracle-rhnsat-selinux mod_perl nodejs-less nodejs scons v8 gyp http-parser libuv c-ares19 nodejs-packaging

1 0

rel-eng/comps
by jblazek 17 Dec '13

17 Dec '13

rel-eng/comps/comps-spacewalk-client-fedora20.xml | 38 ++++ rel-eng/comps/comps-spacewalk-server-fedora20.xml | 176 ++++++++++++++++++++++ 2 files changed, 214 insertions(+) New commits: commit ef1dc64e53a5959f39a962bf8fe8628c2cfc4a39 Author: Jan Blazek <jblazek(a)redhat.com> Date: Tue Dec 17 11:44:54 2013 +0100 add Fedora20 comps diff --git a/rel-eng/comps/comps-spacewalk-client-fedora20.xml b/rel-eng/comps/comps-spacewalk-client-fedora20.xml new file mode 100644 index 0000000..023b99f --- /dev/null +++ b/rel-eng/comps/comps-spacewalk-client-fedora20.xml @@ -0,0 +1,38 @@ +<?xml version="1.0"?> +<!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd"> + +<comps> + + + + <group> + <id>spacewalk-client</id> + <name>Spacewalk Client</name> + <description>Spacewalk Client Packages</description> + <uservisible>true</uservisible> + <packagelist> + <packagereq type="default">rhncfg</packagereq> + <packagereq type="default">rhncfg-actions</packagereq> + <packagereq type="default">rhncfg-client</packagereq> + <packagereq type="default">rhncfg-management</packagereq> + <packagereq type="default">rhn-custom-info</packagereq> + <packagereq type="default">osad</packagereq> + <packagereq type="default">rhn-client-tools</packagereq> + <packagereq type="default">rhn-virtualization-common</packagereq> + <packagereq type="default">rhn-virtualization-host</packagereq> + <packagereq type="default">spacewalk-koan</packagereq> + <packagereq type="default">rhnlib</packagereq> + <packagereq type="default">rhnmd</packagereq> + <packagereq type="default">rhnsd</packagereq> + <packagereq type="default">rhn-check</packagereq> + <packagereq type="default">rhn-setup</packagereq> + <packagereq type="default">rhn-setup-gnome</packagereq> + <packagereq type="default">yum-rhn-plugin</packagereq> + <packagereq type="default">spacewalk-certs-tools</packagereq> + <packagereq type="default">spacewalk-client-repo</packagereq> + <packagereq type="default">spacewalk-backend-libs</packagereq> + <packagereq type="default">spacewalk-oscap</packagereq> + <packagereq type="default">spacewalk-abrt</packagereq> + </packagelist> + </group> +</comps> diff --git a/rel-eng/comps/comps-spacewalk-server-fedora20.xml b/rel-eng/comps/comps-spacewalk-server-fedora20.xml new file mode 100644 index 0000000..967caa6 --- /dev/null +++ b/rel-eng/comps/comps-spacewalk-server-fedora20.xml @@ -0,0 +1,176 @@ +<?xml version="1.0"?> +<!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd"> + +<comps> + + + + <group> + <id>spacewalk-server</id> + <name>Spacewalk Server</name> + <description>Spacewalk Server Packages</description> + <uservisible>true</uservisible> + <packagelist> + + <packagereq type="default">rhnlib</packagereq> + <packagereq type="default">rhn-check</packagereq> + <packagereq type="default">rhn-setup</packagereq> + <packagereq type="default">rhn-setup-gnome</packagereq> + <packagereq type="default">rhn-client-tools</packagereq> + <packagereq type="default">yum-rhn-plugin</packagereq> + + <packagereq type="default">cobbler2</packagereq> + <packagereq type="default">cobbler20</packagereq> + <packagereq type="default">cobbler-epel</packagereq> + <packagereq type="default">cobbler-loaders</packagereq> + <packagereq type="default">cx_Oracle</packagereq> + <packagereq type="default">dwr</packagereq> + <packagereq type="default">eventReceivers</packagereq> + <packagereq type="optional">heirloom-pkgtools</packagereq> + <packagereq type="default">jpam</packagereq> + <packagereq type="default">MessageQueue</packagereq> + <packagereq type="default">nocpulse-common</packagereq> + <packagereq type="default">nocpulse-db-perl</packagereq> + <packagereq type="default">NOCpulsePlugins</packagereq> + <packagereq type="default">NOCpulsePlugins-Oracle</packagereq> + <packagereq type="default">NPalert</packagereq> + <packagereq type="default">nutch</packagereq> + <packagereq type="default">oracle-instantclient-selinux</packagereq> + <packagereq type="default">oracle-instantclient-sqlplus-selinux</packagereq> + <packagereq type="default">oracle-lib-compat</packagereq> + <packagereq type="default">oracle-nofcontext-selinux</packagereq> + <packagereq type="default">oracle-selinux</packagereq> + <packagereq type="default">oracle-xe-selinux</packagereq> + <packagereq type="default">osa-dispatcher</packagereq> + <packagereq type="default">osa-dispatcher-selinux</packagereq> + <packagereq type="default">perl-DBD-Oracle</packagereq> + <packagereq type="default">perl-Net-INET6Glue</packagereq> + <packagereq type="default">perl-NOCpulse-CLAC</packagereq> + <packagereq type="default">perl-NOCpulse-Debug</packagereq> + <packagereq type="default">perl-NOCpulse-Gritch</packagereq> + <packagereq type="default">perl-NOCpulse-Object</packagereq> + <packagereq type="default">perl-NOCpulse-OracleDB</packagereq> + <packagereq type="default">perl-NOCpulse-PersistentConnection</packagereq> + <packagereq type="default">perl-NOCpulse-Probe</packagereq> + <packagereq type="default">perl-NOCpulse-Probe-Oracle</packagereq> + <packagereq type="default">perl-NOCpulse-ProcessPool</packagereq> + <packagereq type="default">perl-NOCpulse-Scheduler</packagereq> + <packagereq type="default">perl-NOCpulse-SetID</packagereq> + <packagereq type="default">perl-NOCpulse-Utils</packagereq> + <packagereq type="default">perl-Satcon</packagereq> + <packagereq type="default">ProgAGoGo</packagereq> + <packagereq type="default">python-gzipstream</packagereq> + <packagereq type="default">quartz</packagereq> + <packagereq type="default">quartz-oracle</packagereq> + <packagereq type="default">redstone-xmlrpc</packagereq> + <packagereq type="default">rhnpush</packagereq> + <packagereq type="default">SatConfig-bootstrap</packagereq> + <packagereq type="default">SatConfig-bootstrap-server</packagereq> + <packagereq type="default">SatConfig-cluster</packagereq> + <packagereq type="default">SatConfig-general</packagereq> + <packagereq type="default">SatConfig-generator</packagereq> + <packagereq type="default">SatConfig-installer</packagereq> + <packagereq type="default">SatConfig-spread</packagereq> + <packagereq type="default">scdb</packagereq> + <packagereq type="default">simple-core</packagereq> + <packagereq type="default">simple-xml</packagereq> + <packagereq type="default">SNMPAlerts</packagereq> + <packagereq type="default">spacecmd</packagereq> + <packagereq type="default">spacewalk-admin</packagereq> + <packagereq type="default">spacewalk-backend</packagereq> + <packagereq type="default">spacewalk-backend-app</packagereq> + <packagereq type="default">spacewalk-backend-applet</packagereq> + <packagereq type="default">spacewalk-backend-config-files</packagereq> + <packagereq type="default">spacewalk-backend-config-files-common</packagereq> + <packagereq type="default">spacewalk-backend-config-files-tool</packagereq> + <packagereq type="default">spacewalk-backend-iss</packagereq> + <packagereq type="default">spacewalk-backend-iss-export</packagereq> + <packagereq type="default">spacewalk-backend-libs</packagereq> + <packagereq type="default">spacewalk-backend-package-push-server</packagereq> + <packagereq type="default">spacewalk-backend-server</packagereq> + <packagereq type="default">spacewalk-backend-sql</packagereq> + <packagereq type="default">spacewalk-backend-sql-oracle</packagereq> + <packagereq type="default">spacewalk-backend-sql-postgresql</packagereq> + <packagereq type="default">spacewalk-backend-tools</packagereq> + <packagereq type="default">spacewalk-backend-xml-export-libs</packagereq> + <packagereq type="default">spacewalk-backend-xmlrpc</packagereq> + <packagereq type="default">spacewalk-base</packagereq> + <packagereq type="default">spacewalk-base-minimal</packagereq> + <packagereq type="default">spacewalk-base-minimal-config</packagereq> + <packagereq type="default">spacewalk-branding</packagereq> + <packagereq type="default">spacewalk-certs-tools</packagereq> + <packagereq type="default">spacewalk-client-repo</packagereq> + <packagereq type="default">spacewalk-common</packagereq> + <packagereq type="default">spacewalk-config</packagereq> + <packagereq type="default">spacewalk-dobby</packagereq> + <packagereq type="default">spacewalk-doc-indexes</packagereq> + <packagereq type="default">spacewalk-grail</packagereq> + <packagereq type="default">spacewalk-html</packagereq> + <packagereq type="default">spacewalk-java</packagereq> + <packagereq type="default">spacewalk-java-config</packagereq> + <packagereq type="default">spacewalk-java-lib</packagereq> + <packagereq type="default">spacewalk-java-oracle</packagereq> + <packagereq type="default">spacewalk-java-postgresql</packagereq> + <packagereq type="optional">spacewalk-java-tests</packagereq> + <packagereq type="default">spacewalk-jpp-workaround</packagereq> + <packagereq type="default">spacewalk-monitoring</packagereq> + <packagereq type="default">spacewalk-monitoring-selinux</packagereq> + <packagereq type="default">spacewalk-oro-compat</packagereq> + <packagereq type="default">spacewalk-oracle</packagereq> + <packagereq type="default">spacewalk-postgresql</packagereq> + <packagereq type="default">spacewalk-proxy-broker</packagereq> + <packagereq type="default">spacewalk-proxy-common</packagereq> + <packagereq type="default">spacewalk-proxy-docs</packagereq> + <packagereq type="default">spacewalk-proxy-html</packagereq> + <packagereq type="default">spacewalk-proxy-installer</packagereq> + <packagereq type="default">spacewalk-proxy-management</packagereq> + <packagereq type="default">spacewalk-proxy-monitoring</packagereq> + <packagereq type="default">spacewalk-proxy-package-manager</packagereq> + <packagereq type="default">spacewalk-proxy-redirect</packagereq> + <packagereq type="default">spacewalk-proxy-selinux</packagereq> + <packagereq type="default">spacewalk-pxt</packagereq> + <packagereq type="default">spacewalk-pylint</packagereq> + <packagereq type="default">spacewalk-repo</packagereq> + <packagereq type="default">spacewalk-reports</packagereq> + <packagereq type="default">spacewalk-schema</packagereq> + <packagereq type="default">spacewalk-search</packagereq> + <packagereq type="default">spacewalk-selinux</packagereq> + <packagereq type="default">spacewalk-setup</packagereq> + <packagereq type="default">spacewalk-setup-postgresql</packagereq> + <packagereq type="default">spacewalk-setup-jabberd</packagereq> + <packagereq type="default">spacewalk-sniglets</packagereq> + <packagereq type="default">spacewalk-ssl-cert-check</packagereq> + <packagereq type="default">spacewalk-taskomatic</packagereq> + <packagereq type="default">spacewalk-utils</packagereq> + <packagereq type="default">spacewalk-remote-utils</packagereq> + <packagereq type="default">SputLite-client</packagereq> + <packagereq type="default">SputLite-server</packagereq> + <packagereq type="default">ssl_bridge</packagereq> + <packagereq type="default">status_log_acceptor</packagereq> + <packagereq type="default">stringtree-json</packagereq> + <packagereq type="default">susestudio-java-client</packagereq> + <packagereq type="default">tanukiwrapper</packagereq> + <packagereq type="default">tsdb</packagereq> + </packagelist> + </group> + <group> + <id>spacewalk-server-docs</id> + <name>Spacewalk Server Documentation</name> + <description>Spacewalk Server Documentation Packages</description> + <uservisible>false</uservisible> + <packagelist> + <packagereq type="optional">jpam-javadoc</packagereq> + <packagereq type="optional">simple-xml-javadoc</packagereq> + </packagelist> + </group> + <group> + <id>spacewalk-server-no-install</id> + <name>Spacewalk Server Junk</name> + <description>Spacewalk Server Non-installable Packages</description> + <uservisible>false</uservisible> + <packagelist> + <packagereq type="optional">cobbler-web</packagereq> + <packagereq type="optional">koan</packagereq> + </packagelist> + </group> +</comps>

1 0

java/code
by Tomáš Kašpárek 17 Dec '13

17 Dec '13

java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 3f1602c2c03f2e0a2121971832f078fec20490ee Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Dec 17 11:27:10 2013 +0100 use file ype icons for config file details diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf index 6cc1795..5a288c9 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf @@ -14,8 +14,8 @@ <c:set var="helpUrl" scope="request" value="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-files-local" /> <c:set var="downloadUrl" scope="request" value="/rhn/configuration/file/FileDownload.do?crid=${revision.id}&cfid=${file.id}" /> <c:set var="deleteUrl" scope="request" value="/rhn/configuration/file/DeleteRevision.do?crid=${revision.id}&cfid=${file.id}" /> -<c:set var="fileIcon" scope="request" value="header-configuration" /> -<c:set var="dirIcon" scope="request" value="header-configuration" /> +<c:set var="fileIcon" scope="request" value="file-file" /> +<c:set var="dirIcon" scope="request" value="file-directory" /> <c:set var="toolbarText" scope="request"> <bean:message key="filedetails.header.jspf.label" arg0="${fn:escapeXml(file.configFileName.path)}" arg1="${revision.revision}"

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits December 2013