client/rhel rel-eng/packages
by Šimon Lukašík
client/rhel/spacewalk-oscap/spacewalk-oscap.spec | 5 ++++-
rel-eng/packages/spacewalk-oscap | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit f1b4d1cae586662f4277bd4e524ab4239f572ca4
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Jul 24 18:36:24 2013 +0200
Automatic commit of package [spacewalk-oscap] release [0.0.18-1].
diff --git a/client/rhel/spacewalk-oscap/spacewalk-oscap.spec b/client/rhel/spacewalk-oscap/spacewalk-oscap.spec
index b4cfd25..5399bae 100644
--- a/client/rhel/spacewalk-oscap/spacewalk-oscap.spec
+++ b/client/rhel/spacewalk-oscap/spacewalk-oscap.spec
@@ -1,5 +1,5 @@
Name: spacewalk-oscap
-Version: 0.0.17
+Version: 0.0.18
Release: 1%{?dist}
Summary: OpenSCAP plug-in for rhn-check
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Jul 24 2013 Simon Lukasik <slukasik(a)redhat.com> 0.0.18-1
+- Log exception in the file, when non XML encountered.
+
* Wed Jul 24 2013 Simon Lukasik <slukasik(a)redhat.com> 0.0.17-1
- Correct a typo in the error message.
diff --git a/rel-eng/packages/spacewalk-oscap b/rel-eng/packages/spacewalk-oscap
index da7c5dd..2e864ef 100644
--- a/rel-eng/packages/spacewalk-oscap
+++ b/rel-eng/packages/spacewalk-oscap
@@ -1 +1 @@
-0.0.17-1 client/rhel/spacewalk-oscap/
+0.0.18-1 client/rhel/spacewalk-oscap/
10 years, 9 months
client/rhel
by Šimon Lukašík
client/rhel/spacewalk-oscap/scap.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 79b25582d43c89b5625d3ed54648104862c17a0c
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Jul 24 18:35:36 2013 +0200
Log exception in the file, when non XML encountered.
diff --git a/client/rhel/spacewalk-oscap/scap.py b/client/rhel/spacewalk-oscap/scap.py
index 691bd1b..9891857 100644
--- a/client/rhel/spacewalk-oscap/scap.py
+++ b/client/rhel/spacewalk-oscap/scap.py
@@ -162,7 +162,8 @@ def _assert_xml(f):
try:
xml.sax.parse(f, xml.sax.ContentHandler())
return True
- except:
+ except Exception, e:
+ log.log_exception(*sys.exc_info())
return False
finally:
f.seek(0)
10 years, 9 months
Changes to 'refs/tags/spacewalk-java-2.1.6-1'
by Grant Gainey
Tag 'spacewalk-java-2.1.6-1' created by Grant Gainey <ggainey(a)redhat.com> at 2013-07-24 15:27 +0000
Tagging package [spacewalk-java] version [2.1.6-1] in directory [java/].
Changes since spacewalk-oscap-0.0.17-1:
Grant Gainey (3):
987977 - Fix chaining of pkg-scheduling in SSM
Make checkstyle happy
Automatic commit of package [spacewalk-java] release [2.1.6-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml | 15 -
java/code/src/com/redhat/rhn/domain/action/script/ScriptAction.java | 4
java/code/src/com/redhat/rhn/frontend/action/schedule/PendingActionsDeleteConfirmAction.java | 40 +--
java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java | 38 ++-
java/code/src/com/redhat/rhn/frontend/events/SsmPackagesAction.java | 85 ++++---
java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java | 33 ++
java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java | 8
java/code/src/com/redhat/rhn/frontend/taglibs/list/SelectableColumnTag.java | 23 ++
java/code/src/com/redhat/rhn/frontend/taglibs/rhn-list.tld | 113 +++++-----
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 11
java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf | 28 +-
java/spacewalk-java.spec | 6
rel-eng/packages/spacewalk-java | 2
13 files changed, 252 insertions(+), 154 deletions(-)
---
10 years, 9 months
java/spacewalk-java.spec rel-eng/packages
by Grant Gainey
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 72b0bc822e1a19a2e9b46b3e994cf3d5bf9db52c
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Wed Jul 24 11:27:13 2013 -0400
Automatic commit of package [spacewalk-java] release [2.1.6-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index f6deb43..a399da3 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.5
+Version: 2.1.6
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -771,6 +771,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Jul 24 2013 Grant Gainey <ggainey(a)redhat.com> 2.1.6-1
+- Make checkstyle happy
+- 987977 - Fix chaining of pkg-scheduling in SSM
+
* Tue Jul 23 2013 Dimitar Yordanov <dyordano(a)redhat.com> 2.1.5-1
- new api call updateRepoLabel(key, label, new_label
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 313545d..8cb278d 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.5-1 java/
+2.1.6-1 java/
10 years, 9 months
java/code
by Grant Gainey
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 11 +++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 10c3948fab0c0cf6197936cff04268785d7480e1
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Wed Jul 24 11:25:25 2013 -0400
Make checkstyle happy
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
index 9f30026..4aa322a 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
@@ -2599,20 +2599,21 @@ public class ChannelSoftwareHandler extends BaseHandler {
/**
* Updates repository label
* @param sessionKey Session containing user information.
- * @param id ID of the repo
- * @param label new label
+ * @param label of the repo
+ * @param newLabel new label
* @return the updated repo
*
* @xmlrpc.doc Updates repository label
* @xmlrpc.param #session_key()
* @xmlrpc.param #param_desc("string", "label", "repository label")
- * @xmlrpc.param #param_desc("string", "label", "new repository label")
+ * @xmlrpc.param #param_desc("string", "newLabel", "new repository label")
* @xmlrpc.returntype $ContentSourceSerializer
**/
- public ContentSource updateRepoLabel(String sessionKey, String label, String new_label) {
+ public ContentSource updateRepoLabel(String sessionKey, String label,
+ String newLabel) {
User user = getLoggedInUser(sessionKey);
ContentSource repo = lookupContentSourceByLabel(label, user.getOrg());
- setRepoLabel(repo, new_label);
+ setRepoLabel(repo, newLabel);
ChannelFactory.save(repo);
return repo;
}
10 years, 9 months
java/code
by Grant Gainey
java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml | 15 -
java/code/src/com/redhat/rhn/domain/action/script/ScriptAction.java | 4
java/code/src/com/redhat/rhn/frontend/action/schedule/PendingActionsDeleteConfirmAction.java | 40 +--
java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java | 38 ++-
java/code/src/com/redhat/rhn/frontend/events/SsmPackagesAction.java | 85 ++++---
java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java | 33 ++
java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java | 8
java/code/src/com/redhat/rhn/frontend/taglibs/list/SelectableColumnTag.java | 23 ++
java/code/src/com/redhat/rhn/frontend/taglibs/rhn-list.tld | 113 +++++-----
java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf | 28 +-
10 files changed, 240 insertions(+), 147 deletions(-)
New commits:
commit 10fa99004b5d9a177cfe3aba8082c48bd6aa4227
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Wed Jul 24 11:24:55 2013 -0400
987977 - Fix chaining of pkg-scheduling in SSM
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml
index 2372097..4c51e03 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml
@@ -19,7 +19,7 @@ SELECT EVENT_ID as ID,
NULL AS history_status,
NULL AS history_type,
NULL AS history_type_name,
- SH.details
+ SH.details
FROM rhnServerHistory SH
WHERE SH.server_id = :sid
UNION
@@ -31,7 +31,7 @@ SELECT EVENT_ID as ID,
AStat.name AS history_status,
AType.label AS history_type,
AType.name AS history_type_name,
- NULL AS details
+ NULL AS details
FROM rhnActionType AType,
rhnActionStatus AStat,
rhnAction A
@@ -94,6 +94,7 @@ order by id desc
<query params="user_id, org_id">
SELECT DISTINCT UAO.id AS ID,
UAO.earliest_action AS EARLIEST,
+ A.prerequisite AS PREREQUISITE,
UAO.type_name,
(CASE UAO.action_name WHEN NULL THEN UAO.type_name ELSE UAO.action_name END) AS ACTION_NAME,
UAO.scheduler,
@@ -102,11 +103,13 @@ SELECT DISTINCT UAO.id AS ID,
(SELECT COUNT(server_id) FROM rhnServerAction WHERE action_id = UAO.id AND status = 2) AS "COMPLETED_SYSTEMS",
(SELECT COUNT(server_id) FROM rhnServerAction WHERE action_id = UAO.id AND status = 3) AS "FAILED_SYSTEMS"
FROM rhnUserActionOverview UAO left join
- web_contact WC on UAO.scheduler = WC.id
+ web_contact WC on UAO.scheduler = WC.id,
+ rhnAction A
WHERE UAO.org_id = :org_id
AND UAO.user_id = :user_id
AND UAO.action_status_id IN (0,1)
AND UAO.archived = 0
+ AND UAO.id = A.id
ORDER BY EARLIEST DESC
</query>
<elaborator name="action_overview_elab" />
@@ -297,9 +300,9 @@ SELECT 1
<query params="parent_id, status_id, tries">
INSERT INTO rhnServerAction (server_id, action_id, status, REMAINING_TRIES)
select s.id as server_id, :parent_id as action_id,
- :status_id as status, :tries as REMAINING_TRIES
- from rhnServer s
- where s.id in (%s)
+ :status_id as status, :tries as REMAINING_TRIES
+ from rhnServer s
+ where s.id in (%s)
</query>
</write-mode>
<write-mode name="add_config_rev_to_action">
diff --git a/java/code/src/com/redhat/rhn/domain/action/script/ScriptAction.java b/java/code/src/com/redhat/rhn/domain/action/script/ScriptAction.java
index 071a5eb..a0e453f 100644
--- a/java/code/src/com/redhat/rhn/domain/action/script/ScriptAction.java
+++ b/java/code/src/com/redhat/rhn/domain/action/script/ScriptAction.java
@@ -35,7 +35,9 @@ public class ScriptAction extends Action {
* @param scriptActionDetailsIn The scriptActionDetails to set.
*/
public void setScriptActionDetails(ScriptActionDetails scriptActionDetailsIn) {
- scriptActionDetailsIn.setParentAction(this);
+ if (scriptActionDetailsIn != null) {
+ scriptActionDetailsIn.setParentAction(this);
+ }
scriptActionDetails = scriptActionDetailsIn;
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/PendingActionsDeleteConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/PendingActionsDeleteConfirmAction.java
index 653f856..5547a5b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/schedule/PendingActionsDeleteConfirmAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/PendingActionsDeleteConfirmAction.java
@@ -14,7 +14,21 @@
*/
package com.redhat.rhn.frontend.action.schedule;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+
import com.redhat.rhn.common.localization.LocalizationService;
+import com.redhat.rhn.domain.action.Action;
+import com.redhat.rhn.domain.action.ActionFactory;
import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.domain.rhnset.RhnSetElement;
import com.redhat.rhn.domain.user.User;
@@ -28,18 +42,6 @@ import com.redhat.rhn.manager.action.ActionManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.rhnset.RhnSetManager;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
/**
* PendingActionsConfirmAction
* @version $Rev: 101893 $
@@ -65,9 +67,6 @@ public class PendingActionsDeleteConfirmAction extends RhnAction implements List
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
-
-
-
/**
* {@inheritDoc}
*/
@@ -84,7 +83,6 @@ public class PendingActionsDeleteConfirmAction extends RhnAction implements List
getSetDecl().getLabel());
}
-
private ActionForward cancelActions(ActionMapping mapping, HttpServletRequest request) {
RequestContext requestContext = new RequestContext(request);
StrutsDelegate strutsDelegate = getStrutsDelegate();
@@ -93,14 +91,12 @@ public class PendingActionsDeleteConfirmAction extends RhnAction implements List
RhnSet set = getSetDecl().get(user);
- List actionsToCancel = new LinkedList();
+ List<Action> actionsToCancel = new LinkedList();
for (RhnSetElement element : set.getElements()) {
- actionsToCancel.add(element.getElement());
+ actionsToCancel.add(ActionFactory.lookupById(element.getElement()));
}
-
- ActionManager.removeActions(actionsToCancel);
-
+ ActionManager.cancelActions(user, actionsToCancel);
ActionMessages msgs = new ActionMessages();
// If there was only one action cancelled, display the "action" cancelled
@@ -122,8 +118,6 @@ public class PendingActionsDeleteConfirmAction extends RhnAction implements List
set.clear();
RhnSetManager.store(set);
-
return mapping.findForward("success");
-
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java
index 8f7ba0a..1369b99 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java
@@ -22,6 +22,7 @@ import java.util.Map;
import java.util.Set;
import com.redhat.rhn.domain.action.Action;
+import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.SetLabels;
import com.redhat.rhn.frontend.dto.EssentialServerDto;
@@ -43,7 +44,7 @@ public class SsmInstallPackagesAction extends SsmPackagesAction {
Long channelId = sipe.getChannelId();
List<EssentialServerDto> servers = SystemManager.systemsSubscribedToChannelInSet(
- channelId, u, SetLabels.SYSTEM_LIST);
+ channelId, u, SetLabels.SYSTEM_LIST);
// Create one action for all servers to which the packages are installed
List<Long> serverIds = new LinkedList<Long>();
@@ -53,28 +54,45 @@ public class SsmInstallPackagesAction extends SsmPackagesAction {
return serverIds;
}
- protected List<Action> doSchedule(SsmPackageEvent event,
- User user,
- List<Long> sids,
- Date earliest) {
+ protected List<Action> doSchedule(SsmPackageEvent event, User user, List<Long> sids,
+ Date earliest) {
SsmInstallPackagesEvent sipe = (SsmInstallPackagesEvent) event;
Set<String> data = sipe.getPackages();
// Convert the package list to domain objects
- List<PackageListItem> packageListItems =
- new ArrayList<PackageListItem>(data.size());
+ List<PackageListItem> pkgListItems = new ArrayList<PackageListItem>(data.size());
for (String key : data) {
- packageListItems.add(PackageListItem.parse(key));
+ pkgListItems.add(PackageListItem.parse(key));
}
// Convert to list of maps
List<Map<String, Long>> packageListData = PackageListItem
- .toKeyMaps(packageListItems);
+ .toKeyMaps(pkgListItems);
List<Action> pkgActions = ActionManager.schedulePackageInstall(user, sids,
- packageListData, earliest);
+ packageListData, earliest);
return pkgActions;
}
+ protected Action doSchedule(SsmPackageEvent event, User user, Server s, Date earliest) {
+ SsmInstallPackagesEvent sipe = (SsmInstallPackagesEvent) event;
+
+ Set<String> data = sipe.getPackages();
+ // Convert the package list to domain objects
+ List<PackageListItem> pkgListItems = new ArrayList<PackageListItem>(data.size());
+ for (String key : data) {
+ pkgListItems.add(PackageListItem.parse(key));
+ }
+
+ // Convert to list of maps
+ List<Map<String, Long>> packageListData = PackageListItem
+ .toKeyMaps(pkgListItems);
+
+ Action pkgAction = ActionManager.schedulePackageInstall(user, s,
+ packageListData, earliest);
+
+ return pkgAction;
+ }
+
}
diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/events/SsmPackagesAction.java
index 7bb4fa9..70fc767 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/SsmPackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/SsmPackagesAction.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.frontend.events;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -24,6 +25,8 @@ import com.redhat.rhn.common.messaging.EventMessage;
import com.redhat.rhn.domain.action.Action;
import com.redhat.rhn.domain.action.script.ScriptActionDetails;
import com.redhat.rhn.domain.action.script.ScriptRunAction;
+import com.redhat.rhn.domain.server.Server;
+import com.redhat.rhn.domain.server.ServerFactory;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.domain.user.UserFactory;
import com.redhat.rhn.manager.action.ActionManager;
@@ -107,46 +110,47 @@ public abstract class SsmPackagesAction extends AbstractDatabaseAction {
List<Long> serverIds = getAffectedServers(event, user);
log.debug("Scheduling actions.");
+
// If we have a remote-cmd, have to correctly order it and the package action(s)
if (event.getScriptDetails() != null) {
- ScriptActionDetails sad = event.getScriptDetails();
- if (event.isBefore()) {
- log.debug("Scheduling remote-action BEFORE.");
-
- ScriptRunAction sra = ActionManager.scheduleScriptRun(user, serverIds,
- null, sad, earliest);
- ActionManager.storeAction(sra);
-
- List<Action> pkgActions = doSchedule(event, user, serverIds, earliest);
-
- // Might be more than one action from schedPkgActions
- Action prevAction = sra;
- for (Action a : pkgActions) {
- a.setPrerequisite(prevAction);
- ActionManager.storeAction(a);
- prevAction = a;
- }
+ for (Long sid : serverIds) {
+ Server s = ServerFactory.lookupById(sid);
+ List<Long> sidList = new ArrayList<Long>();
+ sidList.add(sid);
+ ScriptActionDetails sad = event.getScriptDetails();
+ if (event.isBefore()) {
+ log.debug("Scheduling remote-action BEFORE.");
- }
- else {
- log.debug("Scheduling remote-action AFTER.");
-
- List<Action> pkgActions = doSchedule(event, user, serverIds, earliest);
- ScriptRunAction sra = ActionManager.scheduleScriptRun(user, serverIds,
- null, sad, earliest);
-
- // Might be more than one action from schedPkgActions
- Action prevAction = null;
- for (Action a : pkgActions) {
- if (prevAction != null) {
- a.setPrerequisite(prevAction);
- }
- ActionManager.storeAction(a);
- prevAction = a;
- }
+ ScriptRunAction sra = ActionManager.scheduleScriptRun(user, sidList,
+ null, sad, earliest);
+ ActionManager.storeAction(sra);
+
+ Action pkgAction = doSchedule(event, user, s, earliest);
+
+ Action prevAction = sra;
+ pkgAction.setPrerequisite(prevAction);
+ ActionManager.storeAction(pkgAction);
+ prevAction = pkgAction;
- sra.setPrerequisite(prevAction);
- ActionManager.storeAction(sra);
+ }
+ else {
+ log.debug("Scheduling remote-action AFTER.");
+
+ Action pkgAction = doSchedule(event, user, s, earliest);
+ ScriptRunAction sra = ActionManager.scheduleScriptRun(user, sidList,
+ null, sad, earliest);
+
+ // Might be more than one action from schedPkgActions
+ Action prevAction = null;
+ if (prevAction != null) {
+ pkgAction.setPrerequisite(prevAction);
+ }
+ ActionManager.storeAction(pkgAction);
+ prevAction = pkgAction;
+
+ sra.setPrerequisite(prevAction);
+ ActionManager.storeAction(sra);
+ }
}
}
else { // No remote-script to schedule
@@ -160,9 +164,14 @@ public abstract class SsmPackagesAction extends AbstractDatabaseAction {
protected abstract List<Long> getAffectedServers(SsmPackageEvent event, User u);
- protected abstract List<Action> doSchedule(SsmPackageEvent event,
+ protected abstract Action doSchedule(SsmPackageEvent event,
User user,
- List<Long> sids,
+ Server s,
Date earliest);
+ protected abstract List<Action> doSchedule(SsmPackageEvent event,
+ User user,
+ List<Long> sid,
+ Date earliest);
+
}
diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java b/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java
index c17526e..dcfdf92 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java
@@ -24,6 +24,7 @@ import java.util.Set;
import org.apache.log4j.Logger;
import com.redhat.rhn.domain.action.Action;
+import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.PackageListItem;
import com.redhat.rhn.manager.action.ActionManager;
@@ -116,4 +117,36 @@ public class SsmRemovePackagesAction extends SsmPackagesAction {
return actions;
}
+ protected Action doSchedule(SsmPackageEvent event, User user, Server s, Date earliest) {
+
+ SsmRemovePackagesEvent srpe = (SsmRemovePackagesEvent) event;
+
+ List<Map> result = srpe.getResult();
+
+ Set<PackageListItem> allPackages = new HashSet<PackageListItem>();
+
+ for (Map data : result) {
+
+ // Get the packages out of the elaborator
+ List<Map> elabList = (List<Map>) data.get("elaborator0");
+ if (elabList != null) {
+ for (Map elabMap : elabList) {
+ String idCombo = (String) elabMap.get("id_combo");
+ PackageListItem item = PackageListItem.parse(idCombo);
+ allPackages.add(item);
+ }
+ }
+ }
+
+ List<PackageListItem> allPackagesList = new ArrayList<PackageListItem>(allPackages);
+ List<Map<String, Long>> packageListData = PackageListItem
+ .toKeyMaps(allPackagesList);
+
+ Action action = ActionManager.schedulePackageRemoval(user, s,
+ packageListData, earliest);
+
+ return action;
+ }
+
+
}
diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java b/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java
index 5620c22..84b9491 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java
@@ -20,6 +20,7 @@ import java.util.List;
import java.util.Map;
import com.redhat.rhn.domain.action.Action;
+import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.manager.action.ActionManager;
@@ -53,4 +54,11 @@ public class SsmUpgradePackagesAction extends SsmPackagesAction {
}
+ protected Action doSchedule(SsmPackageEvent event, User user, Server s, Date earliest) {
+
+ SsmUpgradePackagesEvent supe = (SsmUpgradePackagesEvent) event;
+ List<Map<String, Long>> packageListItems = supe.getSysPackageSet().get(s.getId());
+
+ return ActionManager.schedulePackageUpgrade(user, s, packageListItems, earliest);
+ }
}
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/SelectableColumnTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/SelectableColumnTag.java
index abfe836..cd0d989 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/SelectableColumnTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/SelectableColumnTag.java
@@ -53,6 +53,7 @@ public class SelectableColumnTag extends TagSupport {
private String headerKey;
private String listName;
private String rhnSet;
+ private String hideDisabled;
/**
* Sets the column width
@@ -111,6 +112,15 @@ public class SelectableColumnTag extends TagSupport {
}
/**
+ * Expression to determine if we should show disabled checkboxes
+ * @param expr "true" if we should hide disabled checkboxes, else we show them
+ */
+ public void setHideDisabled(String expr) {
+ hideDisabled = expr;
+ }
+
+
+ /**
* {@inheritDoc}
*/
public int doStartTag() throws JspException {
@@ -220,6 +230,11 @@ public class SelectableColumnTag extends TagSupport {
String id = ListTagHelper.getObjectId(getCurrent());
String checkboxId = makeCheckboxId(listName, id);
renderHiddenItem(id, value);
+
+ if (isHideDisabled() && isDisabled()) {
+ return;
+ }
+
ListTagUtil.write(pageContext, "<input type=\"checkbox\" ");
boolean selected = isSelected();
if (selected) {
@@ -399,6 +414,14 @@ public class SelectableColumnTag extends TagSupport {
}
return false;
}
+
+ private boolean isHideDisabled() {
+ if (hideDisabled != null && hideDisabled.equalsIgnoreCase("true")) {
+ return true;
+ }
+ return false;
+ }
+
protected void writeStartingTd() throws JspException {
writeStartingTd(pageContext, styleClass, width);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-list.tld b/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-list.tld
index 3b99555..f145ee6 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-list.tld
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-list.tld
@@ -16,7 +16,7 @@
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
- <attribute>
+ <attribute>
<name>legend</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -82,40 +82,40 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
- <name>hidepagenums</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
+ <name>hidepagenums</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<name>parentiselement</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
- <attribute>
+ <attribute>
<name>searchparent</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
- <attribute>
+ <attribute>
<name>searchchild</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>reflink</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>reflinkkey</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>reflinkkeyarg0</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
+ </attribute>
+ <attribute>
+ <name>reflink</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>reflinkkey</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>reflinkkeyarg0</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
</tag>
<tag>
<name>decorator</name>
@@ -221,12 +221,12 @@
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
- <attribute>
+ <attribute>
<name>filterattr</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
- <attribute>
+ <attribute>
<name>filtermessage</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -251,7 +251,7 @@
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
- <attribute>
+ <attribute>
<name>headerkey</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -271,6 +271,11 @@
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
+ <attribute>
+ <name>hideDisabled</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
</tag>
<tag>
<name>radiocolumn</name>
@@ -291,7 +296,7 @@
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
- <attribute>
+ <attribute>
<name>headerkey</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -307,37 +312,37 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
- <tag>
- <name>csv</name>
- <tag-class>com.redhat.rhn.frontend.taglibs.list.CSVTag</tag-class>
- <body-content>JSP</body-content>
- <attribute>
- <name>name</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>dataset</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>exportColumns</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>header</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
+ <tag>
+ <name>csv</name>
+ <tag-class>com.redhat.rhn.frontend.taglibs.list.CSVTag</tag-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <name>name</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>dataset</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>exportColumns</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>header</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
<function>
<name>expandable</name>
<function-class>com.redhat.rhn.frontend.taglibs.RhnListTagFunctions</function-class>
<function-signature>boolean isExpandable(java.lang.Object)</function-signature>
</function>
- <function>
+ <function>
<name>countChildren</name>
<function-class>com.redhat.rhn.frontend.taglibs.RhnListTagFunctions</function-class>
<function-signature>int getChildrenCount(java.lang.Object)</function-signature>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf
index a744fa3..c0e1a91 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf
@@ -1,15 +1,15 @@
<rl:decorator name="PageSizeDecorator"/>
- <rl:decorator name="SelectableDecorator"/>
+ <rl:decorator name="SelectableDecorator"/>
<rl:decorator name="ElaborationDecorator"/>
-
- <rl:selectablecolumn value="${current.selectionKey}"
- selected="${current.selected}"
- disabled="${not current.selectable}"
- headerclass="first-column"/>
+ <rl:selectablecolumn value="${current.selectionKey}"
+ selected="${current.selected}"
+ disabled="${not current.selectable}"
+ hideDisabled="true"
+ headerclass="first-column"/>
<rl:column sortable="true"
bound="false"
@@ -20,7 +20,6 @@
<a href="/rhn/schedule/CompletedSystems.do?aid=${current.id}"><c:out value="${current.actionName}" /></a>
</rl:column>
-
<rl:column sortable="true"
bound="false"
headerkey="actions.jsp.earliest"
@@ -30,17 +29,16 @@
<c:out value="${current.earliest}" />
</rl:column>
-
<rl:column sortable="false"
bound="false"
headerkey="actions.jsp.succeeded"
styleclass="thin-column"
>
<c:if test="${current.completed != 0}">
- <a href="/rhn/schedule/CompletedSystems.do?aid=${current.id}">${current.completed}</a>
+ <a href="/rhn/schedule/CompletedSystems.do?aid=${current.id}">${current.completed}</a>
</c:if>
<c:if test="${current.completed == 0}">
- ${current.completed}
+ ${current.completed}
</c:if>
</rl:column>
@@ -51,10 +49,10 @@
styleclass="thin-column"
>
<c:if test="${current.failed != 0}">
- <a href="/rhn/schedule/FailedSystems.do?aid=${current.id}">${current.failed}</a>
+ <a href="/rhn/schedule/FailedSystems.do?aid=${current.id}">${current.failed}</a>
</c:if>
<c:if test="${current.failed == 0}">
- ${current.failed}
+ ${current.failed}
</c:if>
</rl:column>
@@ -66,10 +64,10 @@
styleclass="thin-column"
>
<c:if test="${current.inProgress != 0}">
- <a href="/rhn/schedule/InProgressSystems.do?aid=${current.id}">${current.inProgress}</a>
+ <a href="/rhn/schedule/InProgressSystems.do?aid=${current.id}">${current.inProgress}</a>
</c:if>
<c:if test="${current.inProgress == 0}">
- ${current.inProgress}
+ ${current.inProgress}
</c:if>
</rl:column>
@@ -78,6 +76,6 @@
bound="false"
headerkey="actions.jsp.total"
styleclass="thin-column">
- ${current.tally}
+ ${current.tally}
</rl:column>
10 years, 9 months
Changes to 'refs/tags/spacewalk-oscap-0.0.17-1'
by Šimon Lukašík
Tag 'spacewalk-oscap-0.0.17-1' created by Simon Lukasik <slukasik(a)redhat.com> at 2013-07-24 10:56 +0000
Tagging package [spacewalk-oscap] version [0.0.17-1] in directory [client/rhel/spacewalk-oscap/].
Changes since spacewalk-schema-2.1.2-1:
Simon Lukasik (2):
Correct a typo in the error message.
Automatic commit of package [spacewalk-oscap] release [0.0.17-1].
---
client/rhel/spacewalk-oscap/scap.py | 2 +-
client/rhel/spacewalk-oscap/spacewalk-oscap.spec | 5 ++++-
rel-eng/packages/spacewalk-oscap | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
10 years, 9 months
client/rhel rel-eng/packages
by Šimon Lukašík
client/rhel/spacewalk-oscap/spacewalk-oscap.spec | 5 ++++-
rel-eng/packages/spacewalk-oscap | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 9ea4985b66d9f47040dd870bd14b11cb1332bd25
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Jul 24 12:56:34 2013 +0200
Automatic commit of package [spacewalk-oscap] release [0.0.17-1].
diff --git a/client/rhel/spacewalk-oscap/spacewalk-oscap.spec b/client/rhel/spacewalk-oscap/spacewalk-oscap.spec
index 5ae6854..b4cfd25 100644
--- a/client/rhel/spacewalk-oscap/spacewalk-oscap.spec
+++ b/client/rhel/spacewalk-oscap/spacewalk-oscap.spec
@@ -1,5 +1,5 @@
Name: spacewalk-oscap
-Version: 0.0.16
+Version: 0.0.17
Release: 1%{?dist}
Summary: OpenSCAP plug-in for rhn-check
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Jul 24 2013 Simon Lukasik <slukasik(a)redhat.com> 0.0.17-1
+- Correct a typo in the error message.
+
* Wed Jun 12 2013 Tomas Kasparek <tkasparek(a)redhat.com> 0.0.16-1
- rebranding RHN Satellite to Red Hat Satellite in client stuff
diff --git a/rel-eng/packages/spacewalk-oscap b/rel-eng/packages/spacewalk-oscap
index 456ff29..da7c5dd 100644
--- a/rel-eng/packages/spacewalk-oscap
+++ b/rel-eng/packages/spacewalk-oscap
@@ -1 +1 @@
-0.0.16-1 client/rhel/spacewalk-oscap/
+0.0.17-1 client/rhel/spacewalk-oscap/
10 years, 9 months
client/rhel
by Šimon Lukašík
client/rhel/spacewalk-oscap/scap.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f6d747158f07af9fb5006b1cccd52f9e9c11badb
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Jul 24 12:50:11 2013 +0200
Correct a typo in the error message.
Addressing:
[Tue Jul 23 17:09:49 2013] up2date
Traceback (most recent call last):
File /usr/share/rhn/actions/scap.py, line 48, in xccdf_eval
up_err = _upload_results(results_file, results_dir, args)
File /usr/share/rhn/actions/scap.py, line 128, in _upload_results
errors += _upload_file(server, systemid, args, path, filename, f)
<type 'exceptions.TypeError'>: cannot concatenate 'str' and 'tuple' objects
diff --git a/client/rhel/spacewalk-oscap/scap.py b/client/rhel/spacewalk-oscap/scap.py
index 0f4cb32..691bd1b 100644
--- a/client/rhel/spacewalk-oscap/scap.py
+++ b/client/rhel/spacewalk-oscap/scap.py
@@ -133,7 +133,7 @@ def _upload_results(xccdf_result, results_dir, args):
def _upload_file(server, systemid, args, path, filename, f):
if not _assert_xml(f):
log.log_debug('Excluding "%s" file from upload. Not an XML.', path)
- return '\nxccdf_eval: File "%s" not uploaded. Not an XML file format.', filename
+ return '\nxccdf_eval: File "%s" not uploaded. Not an XML file format.' % filename
stat = os.fstat(f.fileno())
if stat.st_size < args['file_size']:
10 years, 9 months
Changes to 'refs/tags/spacewalk-schema-2.1.2-1'
by Tomas Lestach
Tag 'spacewalk-schema-2.1.2-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-07-24 10:14 +0000
Tagging package [spacewalk-schema] version [2.1.2-1] in directory [schema/spacewalk/].
Changes since spacewalk-setup-2.1.2-1:
Tomas Lestach (7):
change log table integer -> number
change log_id type on logged tables
replace integer with number/ric in logging package
extract logging.recreate_trigger from logging.enable_logging
fix_f624b843
fix oracle equivalent source sha1
Automatic commit of package [spacewalk-schema] release [2.1.2-1].
---
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/common/tables/log.sql | 4
schema/spacewalk/oracle/packages/logging.pkb | 156 +++---
schema/spacewalk/oracle/packages/logging.pks | 3
schema/spacewalk/postgres/packages/logging.pkb | 98 ++--
schema/spacewalk/postgres/packages/logging.pks | 2
schema/spacewalk/spacewalk-schema.spec | 10
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/001-log.sql.oracle | 4
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/001-log.sql.postgresql | 4
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/002-log-tables.sql.oracle | 1
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/002-log-tables.sql.postgresql | 5
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/003-logging.pks.sql.oracle | 25 +
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/003-logging.pks.sql.postgresql | 2
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/004-logging.pkb.sql.oracle | 147 ++++++
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/004-logging.pkb.sql.postgresql | 236 ++++++++++
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/010-rhn_entitlements.pkb.postgresql | 2
16 files changed, 602 insertions(+), 99 deletions(-)
---
10 years, 9 months