Changes to 'master-create-cobbler-record-ssm'
by Silvio Moioli
New branch 'master-create-cobbler-record-ssm' available with the following commits:
commit 704465a53e436d5c3cbfee187003fd287f15f812
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Nov 14 09:33:22 2013 +0100
ssm/kickstart/Schedule: button to create Cobbler records tests
commit 83ce48d97b1e9b01b75fa17c15781f7f5aa9db8b
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Nov 14 09:30:50 2013 +0100
ssm/kickstart/Schedule: button to create Cobbler records added
commit 27ba22b8ac0208f014b54ca698ea47dbf0c8c16b
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Dec 5 12:07:32 2013 +0100
ssm/kickstart/Schedule: display skipped systems in action message
commit dc0c22eab6823a911020a6d5589277da75e86fa8
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Nov 13 13:08:13 2013 +0100
Refactoring: extract method to add success message
10 years, 4 months
Changes to 'master-power-management-ssm'
by Silvio Moioli
New branch 'master-power-management-ssm' available with the following commits:
commit b02b831b98ca67f1cfcdc9b748b0728bf59e0eb0
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Nov 21 14:01:49 2013 +0100
SSM power management operation page test
commit e42c4e7531a6e9e8c14b1a4a81d62a938f5b8afc
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Tue Nov 19 17:25:13 2013 +0100
SSM power management operation page added
commit b7c0003e91ab13e052840b66cb4ad796faad08d6
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Nov 18 18:00:04 2013 +0100
SSM power management configuration page test
commit ca7e4b75078d5c037e9add64260fe1ace76f6454
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Nov 18 17:54:55 2013 +0100
SSM power management configuration page added
commit 1bd654dba5424966a3bcc28d003caceacffcde7f
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Nov 18 10:34:57 2013 +0100
rhnSsmOperationServer: note column tests
commit 26223bdbe9cb40f72bbc9bc21342ffaa4a0e17ab
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Nov 18 14:24:43 2013 +0100
rhnSsmOperationServer: note column added
commit ca38dd811f32ddbf6df9b2d800d27ae9a1d11efa
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Nov 14 10:44:52 2013 +0100
ServerTestUtils: add a server group parameter to createTestSystem
10 years, 4 months
Changes to 'master-power-management-single'
by Silvio Moioli
New branch 'master-power-management-single' available with the following commits:
commit 6a93fb04cd7335eb37c5c47588b5b3e4fe05f1e5
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Nov 7 18:29:57 2013 +0100
Single-system power management page tests
commit bb99347d1b85b204c74669af265c105f4c9d881c
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Nov 7 18:26:45 2013 +0100
Single-system power management page added
commit de6161321d1062ee5e44edbcbcfda6dc9671da22
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Oct 31 17:41:33 2013 +0100
Configuration options added
commit 6be658e1f161aaa5d41e06d7035bedb5e31cf86c
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Nov 7 18:17:01 2013 +0100
SystemRecord: power status support tests
commit 3fe1c049edde205d8d828c871913fb6f9c330be1
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Nov 7 18:16:39 2013 +0100
SystemRecord: power status support added
commit dd312f39d1a12ff7f47d59c09f6215209f8db75e
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Nov 7 18:25:38 2013 +0100
CobblerPowerCommand tests
commit b7cf4dd43f1bfc31e9caca27ed55ca430e43771a
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Nov 7 18:24:49 2013 +0100
CobblerPowerCommand added
commit 6fa2b62ca1d87eacd2d37d85f2936fb81d6fc962
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Nov 7 18:23:48 2013 +0100
CobblerPowerSettingsUpdateCommand tests
commit fa150827c3e5067a602a40387bb1c830330bd8de
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Nov 7 18:23:12 2013 +0100
CobblerPowerSettingsUpdateCommand added
commit 98ffdf91697bf2c76641e4ffbc87235dc58b2a7a
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Oct 28 11:59:32 2013 +0100
Refactoring: make getCobblerSystemRecordName() callable from other classes
commit 0948e5f3ac6edf6c7e9cdc738148857f397b64fd
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Nov 6 12:03:51 2013 +0100
Do not assume a Cobbler system record always has a profile attached
commit 82463a18728556d8b03b62ab2b4aa191b0b39ade
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Nov 7 18:22:05 2013 +0100
Cobbler image support tests
commit 504976132c2d8a84a2db49d65d75b7652ea1bec0
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Nov 7 18:21:39 2013 +0100
Cobbler image support added
commit c1210ec0a85c5ed93ebd91dd20e4fc916773fadc
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Nov 7 18:20:14 2013 +0100
SystemRecord: power management support tests
commit 9efee41f05303a9b2ad5d44688622566691f072c
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Nov 7 18:19:51 2013 +0100
SystemRecord: power management support added
10 years, 4 months
2 commits - java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java | 7 ++++++-
java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java | 8 +++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
New commits:
commit c6ea5409490deb6be031677ad60ecbbea9ad56e7
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Dec 18 13:27:01 2013 +0100
fix CSVTag so it uses IconTag
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java
index 382f299..6d7ef13 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.frontend.action.CSVDownloadAction;
import com.redhat.rhn.frontend.dto.SystemSearchPartialResult;
import com.redhat.rhn.frontend.dto.SystemSearchResult;
+import com.redhat.rhn.frontend.taglibs.IconTag;
import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
import java.util.HashMap;
@@ -196,10 +197,15 @@ public class CSVTag extends BodyTagSupport {
private void renderExport() throws JspException {
StringBuffer page = new StringBuffer(CSV_DOWNLOAD_URI);
page.append("?" + makeCSVRequestParams());
+ IconTag i = new IconTag();
+ i.setParent(getParent());
+ i.setPageContext(pageContext);
+ i.setType("item-download-csv");
String exportLink = new String("<div class=\"spacewalk-csv-download\"><a href=\"" +
- page + "\"><i class=\"spacewalk-icon-download-csv\"></i>" +
+ page + "\">" + i.renderStartTag() +
LocalizationService.getInstance().getMessage(
"listdisplay.csv") + "</a></div>");
+ i.release();
ListTagUtil.write(pageContext, exportLink);
}
commit 2723a5b89657c3aa287a526c17402d2530ca4c44
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Dec 18 13:24:44 2013 +0100
fix ListDisplayTag so it uses IconTag
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
index 3287af7..c7998a2 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
@@ -458,10 +458,15 @@ public class ListDisplayTag extends ListDisplayTagBase {
if (request.getQueryString() != null) {
page.append("&" + request.getQueryString());
}
+ IconTag i = new IconTag();
+ i.setParent(getParent());
+ i.setPageContext(pageContext);
+ i.setType("item-download-csv");
out.println("<div class=\"spacewalk-csv-download\"><a href=\"" + page +
- "\"><i class=\"spacewalk-icon-download-csv\"></i>" +
+ "\">" + i.renderStartTag() +
LocalizationService.getInstance().getMessage("listdisplay.csv") +
"</a></div>");
+ i.release();
}
private void renderBoundsVariables(Writer out) throws IOException {
10 years, 4 months
2 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/groups/AdminListAction.java | 7 -------
java/code/src/com/redhat/rhn/frontend/action/groups/ErrataListAction.java | 5 -----
2 files changed, 12 deletions(-)
New commits:
commit 091328ac72fab99b783ea432d93b9e87bb1bda1d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Dec 18 11:48:45 2013 +0100
removing dead code, exception is thrown within lookupAndBindServerGroup
removing due to: The variable serverGroup can only be null at this location
diff --git a/java/code/src/com/redhat/rhn/frontend/action/groups/ErrataListAction.java b/java/code/src/com/redhat/rhn/frontend/action/groups/ErrataListAction.java
index 1bd5a5b..9f40a63 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/groups/ErrataListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/groups/ErrataListAction.java
@@ -15,7 +15,6 @@
package com.redhat.rhn.frontend.action.groups;
import com.redhat.rhn.domain.server.ManagedServerGroup;
-import com.redhat.rhn.frontend.action.common.BadParameterException;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
@@ -46,10 +45,6 @@ public class ErrataListAction extends RhnAction implements Listable {
RequestContext requestContext = new RequestContext(request);
ManagedServerGroup serverGroup = requestContext.lookupAndBindServerGroup();
- if (serverGroup == null) {
- throw new BadParameterException("Invalid " + RequestContext.SERVER_GROUP_ID +
- " parameter:" + serverGroup.getId());
- }
ListHelper helper = new ListHelper(this, request);
helper.execute();
commit 114c012d6cea1579eb5d60c213ae51073fd5ab93
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Dec 18 10:27:45 2013 +0100
removing dead code, exception is thrown within lookupAndBindServerGroup
removing due to: The variable serverGroup can only be null at this
location
diff --git a/java/code/src/com/redhat/rhn/frontend/action/groups/AdminListAction.java b/java/code/src/com/redhat/rhn/frontend/action/groups/AdminListAction.java
index e63a7da..3a843e9 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/groups/AdminListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/groups/AdminListAction.java
@@ -18,7 +18,6 @@ import com.redhat.rhn.domain.server.ManagedServerGroup;
import com.redhat.rhn.domain.server.ServerGroupFactory;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.domain.user.User;
-import com.redhat.rhn.frontend.action.common.BadParameterException;
import com.redhat.rhn.frontend.dto.UserOverview;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
@@ -58,12 +57,6 @@ public class AdminListAction extends RhnAction implements Listable {
ManagedServerGroup serverGroup = requestContext.lookupAndBindServerGroup();
User user = requestContext.getCurrentUser();
- if (serverGroup == null) {
- throw new BadParameterException("Invalid " + RequestContext.SERVER_GROUP_ID +
- " parameter:" + serverGroup.getId());
- }
-
-
ListRhnSetHelper helper = new ListRhnSetHelper(this, request,
RhnSetDecl.setForSystemGroupAdmins(serverGroup));
Set<Long> preselected = new HashSet<Long>();
10 years, 4 months
proxy/proxy
by StephenHerr
proxy/proxy/broker/rhnBroker.py | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 70e86d8d47cc87bf7e2335489f4735e01bd90341
Author: Flavio Castelli <fcastelli(a)suse.com>
Date: Tue Dec 17 11:53:22 2013 -0500
Fixed client registration via proxy
diff --git a/proxy/proxy/broker/rhnBroker.py b/proxy/proxy/broker/rhnBroker.py
index 55ed025..0907237 100644
--- a/proxy/proxy/broker/rhnBroker.py
+++ b/proxy/proxy/broker/rhnBroker.py
@@ -175,7 +175,9 @@ class BrokerHandler(SharedHandler):
# do that for us
# Add/modify the X-RHN-IP-Path header.
- ip_path = _oto['X-RHN-IP-Path']
+ ip_path = None
+ if 'X-RHN-IP-Path' in _oto:
+ ip_path = _oto['X-RHN-IP-Path']
log_debug(4, "X-RHN-IP-Path is: %s" % repr(ip_path))
client_ip = self.req.connection.remote_ip
if ip_path is None:
@@ -185,10 +187,15 @@ class BrokerHandler(SharedHandler):
_oto['X-RHN-IP-Path'] = ip_path
# NOTE: X-RHN-Proxy-Auth described in broker/rhnProxyAuth.py
- log_debug(5, 'X-RHN-Proxy-Auth currently set to: %s' % repr(_oto['X-RHN-Proxy-Auth']))
+ if 'X-RHN-Proxy-Auth' in _oto:
+ log_debug(5, 'X-RHN-Proxy-Auth currently set to: %s' % repr(_oto['X-RHN-Proxy-Auth']))
+ else:
+ log_debug(5, 'X-RHN-Proxy-Auth is not set'
if self.req.headers_in.has_key('X-RHN-Proxy-Auth'):
- tokens = _oto['X-RHN-Proxy-Auth'].split(',')
+ tokens = []
+ if 'X-RHN-Proxy-Auth' in _oto:
+ tokens = _oto['X-RHN-Proxy-Auth'].split(',')
log_debug(5, 'Tokens: %s' % tokens)
# GETs: authenticate user, and service local GETs.
10 years, 4 months
Changes to 'refs/tags/spacewalk-java-2.1.102-1'
by Tomáš Kašpárek
Tag 'spacewalk-java-2.1.102-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-12-17 15:55 +0000
Tagging package [spacewalk-java] version [2.1.102-1] in directory [java/].
Changes since spacewalk-java-2.1.101-1:
Matej Kollar (1):
Local variables need not to be synchronized
Tomas Kasparek (2):
delete ConfigSystemTag as these things are easily handled in jsp
Automatic commit of package [spacewalk-java] release [2.1.102-1].
---
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/ListDisplayTagBase.java | 2
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
java/spacewalk-java.spec | 6
rel-eng/packages/spacewalk-java | 2
9 files changed, 16 insertions(+), 311 deletions(-)
---
10 years, 4 months