web/conf
by Michael Mraka
web/conf/rhn_web.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cbfb04ee39c85df3d2005593a6c4507e0e2084f8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Sep 16 13:32:32 2011 +0200
723461 - let emails be sent to localhost by default
diff --git a/web/conf/rhn_web.conf b/web/conf/rhn_web.conf
index c62bc68..dad786e 100644
--- a/web/conf/rhn_web.conf
+++ b/web/conf/rhn_web.conf
@@ -22,7 +22,7 @@ web.db_tz_offset = 0
web.debug = 1
# RHN::Mail never send email to these domains
-web.disallowed_mail_domains = localhost.localdomain, localhost
+web.disallowed_mail_domains =
# URL for the download server
web.download_url =
12 years, 7 months
Changes to 'refs/tags/spacewalk-backend-1.6.19-1'
by Michael Mraka
Tag 'spacewalk-backend-1.6.19-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-09-19 06:58 +0000
Tagging package [spacewalk-backend] version [1.6.19-1] in directory [backend/].
Changes since rhn-client-tools-1.6.17-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-backend] release [1.6.19-1].
---
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 7 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 7ddffd8df453e4f1a2d8f159263ad75eb0a0faa2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Sep 19 08:58:20 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.6.19-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 2a95409..cc7f397 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 and Python
-Version: 1.6.18
+Version: 1.6.19
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -674,6 +674,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Sep 19 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.19-1
+- implemented Database.execute()
+
* Tue Sep 13 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.18-1
- 736127 - fixed /var/log/rhn/rhn_server_xmlrpc.log does not log IP addresses
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 1ee7808..6898352 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.6.18-1 backend/
+1.6.19-1 backend/
12 years, 7 months
Changes to 'refs/tags/rhn-client-tools-1.6.17-1'
by Martin Minar
Tag 'rhn-client-tools-1.6.17-1' created by Martin Minar <mminar(a)redhat.com> at 2011-09-19 06:49 +0000
Tagging package [rhn-client-tools] version [1.6.17-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-java-1.6.47-1:
Martin Minar (1):
Automatic commit of package [rhn-client-tools] release [1.6.17-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 7 months
client/rhel rel-eng/packages
by Martin Minar
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 2d9db83a52e79ebf981a563170ed791e04d935c2
Author: Martin Minar <mminar(a)redhat.com>
Date: Mon Sep 19 08:49:14 2011 +0200
Automatic commit of package [rhn-client-tools] release [1.6.17-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index d348660..d1080c5 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.6.16
+Version: 1.6.17
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -339,6 +339,9 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Mon Sep 19 2011 Martin Minar <mminar(a)redhat.com> 1.6.17-1
+- 688072 - polish registration welcome message a bit (mzazrivec(a)redhat.com)
+
* Fri Sep 09 2011 Jan Pazdziora 1.6.16-1
- 576223 - make rhn-profile-sync write errors to stderr.
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index ed8c18e..56a24f0 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.6.16-1 client/rhel/rhn-client-tools/
+1.6.17-1 client/rhel/rhn-client-tools/
12 years, 7 months
Changes to 'refs/tags/spacewalk-java-1.6.47-1'
by Tomas Lestach
Tag 'spacewalk-java-1.6.47-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-09-16 15:59 +0000
Tagging package [spacewalk-java] version [1.6.47-1] in directory [java/].
Changes since spacewalk-web-1.6.21-1:
Jan Pazdziora (1):
619723 - Add support for open ranges, like bytes=9500- or bytes=-500.
Milan Zazrivec (4):
509563 - remove system profile from cobbler during system deletion
509563 - add missing import
update copyright info
688072 - polish registration welcome message a bit
Tomas Lestach (3):
732350 - link mchange-commons jar to taskomatic
717984 - list only ssm systems in SSM Selected Systems List tab
Automatic commit of package [spacewalk-java] release [1.6.47-1].
---
client/rhel/rhn-client-tools/data/rh_register.glade | 8 -
java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 31 ++++-
java/code/src/com/redhat/rhn/frontend/action/ssm/ListSystemsAction.java | 48 +++-----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemRemoveCommand.java | 59 ++++++++++
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 5
java/code/webapp/WEB-INF/pages/ssm/systems/list.jsp | 5
java/conf/default/rhn_taskomatic_daemon.conf | 1
java/spacewalk-java.spec | 13 ++
rel-eng/packages/spacewalk-java | 2
10 files changed, 129 insertions(+), 45 deletions(-)
---
12 years, 7 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/ssm/ListSystemsAction.java | 48 ++++------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2
java/code/webapp/WEB-INF/pages/ssm/systems/list.jsp | 5 -
java/spacewalk-java.spec | 13 ++
rel-eng/packages/spacewalk-java | 2
5 files changed, 35 insertions(+), 35 deletions(-)
New commits:
commit 894462646d9ed20257029b3a7740d9735c65d866
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 16 17:59:27 2011 +0200
Automatic commit of package [spacewalk-java] release [1.6.47-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index eb86703..b443186 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.6.46
+Version: 1.6.47
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -557,6 +557,17 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Sep 16 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.47-1
+- 717984 - list only ssm systems in SSM Selected Systems List tab
+ (tlestach(a)redhat.com)
+- update copyright info (mzazrivec(a)redhat.com)
+- 619723 - Add support for open ranges, like bytes=9500- or bytes=-500.
+ (jpazdziora(a)redhat.com)
+- 509563 - add missing import (mzazrivec(a)redhat.com)
+- 509563 - remove system profile from cobbler during system deletion
+ (mzazrivec(a)redhat.com)
+- 732350 - link mchange-commons jar to taskomatic (tlestach(a)redhat.com)
+
* Fri Sep 16 2011 Jan Pazdziora 1.6.46-1
- CVE-2011-2927, 730955 - remove markup from localized string resources as
well.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 16e96ee..4f2caf4 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.46-1 java/
+1.6.47-1 java/
commit 862ff9d0078c416fd91b961a327afe2a8eca4a6d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 16 17:15:49 2011 +0200
717984 - list only ssm systems in SSM Selected Systems List tab
diff --git a/java/code/src/com/redhat/rhn/frontend/action/ssm/ListSystemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/ssm/ListSystemsAction.java
index 489bebd..591be43 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/ssm/ListSystemsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/ssm/ListSystemsAction.java
@@ -14,17 +14,18 @@
*/
package com.redhat.rhn.frontend.action.ssm;
-import com.redhat.rhn.domain.rhnset.RhnSet;
-import com.redhat.rhn.domain.user.User;
-import com.redhat.rhn.frontend.action.systems.SystemListSetupAction;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
+import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
+import com.redhat.rhn.manager.system.SystemManager;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.DynaActionForm;
+
+import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -34,36 +35,27 @@ import javax.servlet.http.HttpServletResponse;
* ListSystemsAction
* @version $Rev$
*/
-public class ListSystemsAction extends RhnAction {
+public class ListSystemsAction extends RhnAction implements Listable {
+
/**
- *
- * {@inheritDoc}
+ * ${@inheritDoc}
*/
public ActionForward execute(ActionMapping mapping,
ActionForm formIn,
HttpServletRequest request,
HttpServletResponse response) {
- RequestContext context = new RequestContext(request);
-
- RequestContext rctx = new RequestContext(request);
- User user = rctx.getLoggedInUser();
-
- if (context.wasDispatched("ssm.list.systems.confirmbutton")) {
- RhnSet set = RhnSetDecl.SYSTEMS.get(context.getLoggedInUser());
-
- DynaActionForm daForm = (DynaActionForm)formIn;
-
- // Logic to remove hosts from SSM goes here
-
- return mapping.findForward("confirm");
- }
-
- new SystemListSetupAction().execute(mapping, formIn, request, response);
-// ListHelper helper = new ListHelper(this, request);
-// helper.setListName("systemList");
-// helper.setDataSetName("pageList");
-// helper.execute();
-
+ ListHelper helper = new ListHelper(this, request);
+ helper.setListName("systemList");
+ helper.setDataSetName("pageList");
+ helper.execute();
return mapping.findForward("default");
}
+
+ /**
+ * ${@inheritDoc}
+ */
+ public List getResult(RequestContext context) {
+ return SystemManager.inSet(context.getLoggedInUser(),
+ RhnSetDecl.SYSTEMS.getLabel());
+ }
}
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 e3c1daa..6ea95ed 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
@@ -5489,7 +5489,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<source>Selected Systems List</source>
</trans-unit>
<trans-unit id="ssm.list.systems.summary">
- <source><p>Below are your selected systems. All actions taken within this interface will apply only to the relevant systems in this set.</p><p>To remove systems from the current set, un-check those systems to be removed.</p></source>
+ <source><p>Below are your selected systems. All actions taken within this interface will apply only to the these systems.</p></source>
</trans-unit>
</group>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/list.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/list.jsp
index c2cfef6..44e6651 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/list.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/list.jsp
@@ -12,12 +12,9 @@
<bean:message key="ssm.list.systems.header" />
</h2>
<p><bean:message key="ssm.list.systems.summary" /></p>
-<%--
<c:set var="notSelectable" value="true"/>
<c:set var="showLastCheckin" value="true"/>
-<c:set var="noPackages" value="true"/>
-<c:set var="noErrata" value="true"/>
---%>
+<c:set var="noUpdates" value="true"/>
<rl:listset name="systemListSet" legend="system">
<%@ include file="/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf" %>
12 years, 7 months
client/rhel
by Milan Zazrivec
client/rhel/rhn-client-tools/data/rh_register.glade | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 77b5214e38e7f9b64bb93db3301f1c8e6d14f2a7
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Sep 16 16:44:23 2011 +0200
688072 - polish registration welcome message a bit
diff --git a/client/rhel/rhn-client-tools/data/rh_register.glade b/client/rhel/rhn-client-tools/data/rh_register.glade
index 5cd571b..db22ea5 100644
--- a/client/rhel/rhn-client-tools/data/rh_register.glade
+++ b/client/rhel/rhn-client-tools/data/rh_register.glade
@@ -1426,7 +1426,7 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<child>
<widget class="GtkLabel" id="label98">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">This assistant will guide you through connecting your system to Red Hat Network (RHN) for software updates, such as:</property>
+ <property name="label" translatable="yes" context="yes">This assistant will guide you through connecting your system to Red Hat Network (RHN) to receive software updates, including security updates, to keep your system supported and compliant. You will need the following at this time:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1469,7 +1469,7 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<child>
<widget class="GtkLabel" id="label35">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">• Your Red Hat Network or Red Hat Network Satellite login </property>
+ <property name="label" translatable="yes" context="yes">• A network connection</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1494,7 +1494,7 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<child>
<widget class="GtkLabel" id="label36">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">• A name for your system's Red Hat Network profile</property>
+ <property name="label" translatable="yes" context="yes">• Your Red Hat Network or Red Hat Network Satellite login </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1519,7 +1519,7 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<child>
<widget class="GtkLabel" id="label37">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">• The address to your Red Hat Network Satellite (optional)</property>
+ <property name="label" translatable="yes" context="yes">• The location of your Red Hat Network Satellite or Proxy (optional)</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
12 years, 7 months
java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemRemoveCommand.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 29bbd4bc7873d144a7ce5325101f6c7cbe49b5b6
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Sep 16 16:27:34 2011 +0200
update copyright info
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemRemoveCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemRemoveCommand.java
index 86ff4e0..4cb3abc 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemRemoveCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemRemoveCommand.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2009--2010 Red Hat, Inc.
+ * Copyright (c) 2011 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
12 years, 7 months
java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 31 ++++++++--
1 file changed, 25 insertions(+), 6 deletions(-)
New commits:
commit 365fb6234d3bbb67919ce058f16b427548421e18
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 16 14:50:31 2011 +0200
619723 - Add support for open ranges, like bytes=9500- or bytes=-500.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
index 9f96511..3b23e52 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
@@ -63,6 +63,8 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -625,17 +627,34 @@ public class DownloadFile extends DownloadAction {
String diskPath, String range) {
// bytes=440-25183
- String[] bytesheader = StringUtils.split(range, "=");
- String[] ranges = StringUtils.split(bytesheader[1], "-");
- long start = Long.valueOf(ranges[0]).longValue();
- long end = Long.valueOf(ranges[1]).longValue();
+ Pattern rangePattern = Pattern.compile("bytes=(\\d*)-(\\d*)");
+ Matcher rangeMatcher = rangePattern.matcher(range);
+
+ if (!rangeMatcher.matches()) {
+ // this will fail
+ rangeMatcher.group(1);
+ }
+
+ long start, end;
+ if (StringUtils.isEmpty(rangeMatcher.group(1))) {
+ start = 0;
+ }
+ else {
+ start = Long.valueOf(rangeMatcher.group(1)).longValue();
+ }
+ File actualFile = new File(diskPath);
+ long totalSize = actualFile.length();
+ if (StringUtils.isEmpty(rangeMatcher.group(2))) {
+ end = totalSize;
+ }
+ else {
+ end = Long.valueOf(rangeMatcher.group(2)).longValue();
+ }
if (log.isDebugEnabled()) {
log.debug("manualServeByteRange Start : " + start);
log.debug("manualServeByteRange End : " + end);
}
long size = end - start + 1;
- File actualFile = new File(diskPath);
- long totalSize = actualFile.length();
if (log.isDebugEnabled()) {
log.debug("manualServeByteRange totalsize: " + totalSize);
12 years, 7 months