java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java
| 2 -
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/ScheduleRemoteCommand.java
| 6 ++--
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectInstallationPackagesAction.java
| 2 -
java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java
| 6 ++--
java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesEvent.java
| 4 +-
java/code/src/com/redhat/rhn/frontend/events/SsmPackageEvent.java
| 6 ++--
java/code/src/com/redhat/rhn/frontend/events/SsmPackagesAction.java
| 14 +++++-----
java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java
| 6 ++--
java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java
| 4 +-
java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesEvent.java
| 2 -
java/code/src/com/redhat/rhn/manager/MissingCapabilityException.java
| 2 -
java/code/src/com/redhat/rhn/manager/action/ActionManager.java
| 4 +-
java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java
| 4 +-
13 files changed, 31 insertions(+), 31 deletions(-)
New commits:
commit 0a62299142752c970f5f0b26afe667c02c34a1a9
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Thu Apr 4 16:55:51 2013 -0400
948605: checkstyle whitespace fixes. Sigh.
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java
index abeb9f9..82bd4dc 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java
@@ -78,7 +78,7 @@ public class SchedulePackageRemoveAction extends RhnListAction
implements Listab
Map params = new HashMap();
params.put(RequestContext.MODE,
requestContext.getRequiredParamAsString(RequestContext.MODE));
-
+
if (request.getParameter("dispatch") != null) {
String packagesDecl = request.getParameter("packagesDecl");
if (requestContext.wasDispatched("installconfirm.jsp.confirm")) {
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/ScheduleRemoteCommand.java
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/ScheduleRemoteCommand.java
index 9676501..83c7639 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/ScheduleRemoteCommand.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/ScheduleRemoteCommand.java
@@ -63,7 +63,7 @@ import com.redhat.rhn.manager.system.SystemManager;
/**
* ScheduleRemoteCommand
- *
+ *
* @version $Rev$
*/
public class ScheduleRemoteCommand extends RhnAction {
@@ -193,7 +193,7 @@ public class ScheduleRemoteCommand extends RhnAction {
else if (MODE_UPGRADE.equals(mode)) {
List<Map> result = getUpgradeResult(ctxt, sessionSetLabel);
- Map<Long, List<Map<String, Long>>> sysPackageSet =
+ Map<Long, List<Map<String, Long>>> sysPackageSet =
new HashMap<Long, List<Map<String, Long>>>();
for (Map sys : result) {
Long sysId = (Long) sys.get("id");
@@ -264,7 +264,7 @@ public class ScheduleRemoteCommand extends RhnAction {
// bz465892 - As the selected packages are parsed, remove duplicates
// keeping the highest EVR
- Map<String, PackageListItem> packageNameIdsToItems =
+ Map<String, PackageListItem> packageNameIdsToItems =
new HashMap<String, PackageListItem>(data.size());
for (String idCombo : data) {
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectInstallationPackagesAction.java
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectInstallationPackagesAction.java
index b8ac8c1..90b619f 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectInstallationPackagesAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectInstallationPackagesAction.java
@@ -36,7 +36,7 @@ import javax.servlet.http.HttpServletResponse;
/**
* SSM action for selecting the packages to install. Package list is determined by the
* first step in the flow where the channel is selected.
- *
+ *
* @version $Revision$
*/
public class SelectInstallationPackagesAction extends RhnAction implements Listable {
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 a9c4c54..8f7ba0a 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java
@@ -37,7 +37,7 @@ public class SsmInstallPackagesAction extends SsmPackagesAction {
protected String getOperationName() {
return "ssm.package.install.operationname";
}
-
+
protected List<Long> getAffectedServers(SsmPackageEvent event, User u) {
SsmInstallPackagesEvent sipe = (SsmInstallPackagesEvent) event;
Long channelId = sipe.getChannelId();
@@ -61,7 +61,7 @@ public class SsmInstallPackagesAction extends SsmPackagesAction {
Set<String> data = sipe.getPackages();
// Convert the package list to domain objects
- List<PackageListItem> packageListItems =
+ List<PackageListItem> packageListItems =
new ArrayList<PackageListItem>(data.size());
for (String key : data) {
packageListItems.add(PackageListItem.parse(key));
@@ -73,7 +73,7 @@ public class SsmInstallPackagesAction extends SsmPackagesAction {
List<Action> pkgActions = ActionManager.schedulePackageInstall(user, sids,
packageListData, earliest);
-
+
return pkgActions;
}
diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesEvent.java
b/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesEvent.java
index 1316949..8133d51 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesEvent.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesEvent.java
@@ -30,7 +30,7 @@ public class SsmInstallPackagesEvent extends SsmPackageEvent {
/**
* Creates a new event to install a set of packages on systems in the SSM.
- *
+ *
* @param userIdIn user making the changes; cannot be <code>null</code>
* @param earliestIn earliest time to perform the installation; can be
* <code>null</code>
@@ -61,7 +61,7 @@ public class SsmInstallPackagesEvent extends SsmPackageEvent {
/**
* Creates a new event to install a set of packages on systems in the SSM.
- *
+ *
* @param userIdIn user making the changes; cannot be <code>null</code>
* @param earliestIn earliest time to perform the installation; can be
* <code>null</code>
diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmPackageEvent.java
b/java/code/src/com/redhat/rhn/frontend/events/SsmPackageEvent.java
index 8da985d..b2592a7 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/SsmPackageEvent.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/SsmPackageEvent.java
@@ -22,9 +22,9 @@ import com.redhat.rhn.domain.action.script.ScriptActionDetails;
/**
* Base for SSM package install/update/remove actions. Holds the data shared between the
* three paths.
- *
+ *
* @author ggainey
- *
+ *
*/
public abstract class SsmPackageEvent implements EventMessage {
@@ -35,7 +35,7 @@ public abstract class SsmPackageEvent implements EventMessage {
/**
* Creates a new event to install a set of packages on systems in the SSM.
- *
+ *
* @param userIdIn user making the changes; cannot be <code>null</code>
* @param earliestIn earliest time to perform the installation; can be
* <code>null</code>
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 069edf2..7bb4fa9 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/SsmPackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/SsmPackagesAction.java
@@ -34,7 +34,7 @@ import com.redhat.rhn.manager.ssm.SsmOperationManager;
* Base functionality for responding to SSM package install/update/remove.
* Handles ordering if a remote-cmd has been specified. Subclasses are responsible
* for describing the affected servers, and the actual work of scheduling action(s)
- *
+ *
* @author ggainey
*
*/
@@ -57,18 +57,18 @@ public abstract class SsmPackagesAction extends AbstractDatabaseAction
{
* The following isn't 100% accurate. All systems in the SSM are associated
with
* the operation, however only systems on which the package already exists
(since
* this is an upgrade) will actually have events scheduled.
- *
+ *
* The problem is that the list of servers to which the package upgrades apply
is
* never stored in an RhnSet, which is used to make the impact of this call
* minimal. The correct list is showed to the user before selecting confirm, so
* the only potential issue is in viewing the SSM task log after the user has
* confirmed the operation. Again, the events themselves are correctly scheduled
* on only the systems to which they apply.
- *
+ *
* For now, this small potential for logging inaccuracy is acceptable given the
* proxmity of this fix to the Satellite 5.3 release (as opposed to omitting the
* server association to the task entirely).
- *
+ *
* jdobies, Aug 12, 2009
*/
@@ -88,10 +88,10 @@ public abstract class SsmPackagesAction extends AbstractDatabaseAction
{
log.debug("Time to schedule all actions: " +
(System.currentTimeMillis() - actionStart));
}
- }
+ }
catch (Exception e) {
log.error("Error scheduling package installations for event " +
event, e);
- }
+ }
finally {
// This should stay in the finally block so the operation is
// not perpetually left in an in progress state
@@ -157,7 +157,7 @@ public abstract class SsmPackagesAction extends AbstractDatabaseAction
{
}
protected abstract String getOperationName();
-
+
protected abstract List<Long> getAffectedServers(SsmPackageEvent event, User
u);
protected abstract List<Action> doSchedule(SsmPackageEvent event,
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 577c6a9..b1eebe0 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java
@@ -30,7 +30,7 @@ import com.redhat.rhn.manager.action.ActionManager;
/**
* Handles removing packages from servers in the SSM.
- *
+ *
* @see com.redhat.rhn.frontend.events.SsmRemovePackagesEvent
*/
public class SsmRemovePackagesAction extends SsmPackagesAction {
@@ -65,13 +65,13 @@ public class SsmRemovePackagesAction extends SsmPackagesAction {
* removals into a single action. The schedule package removal page will display
a
* fine grained mapping of server to package removed (taking into account to
only
* show packages that exist on the server).
- *
+ *
* However, there is no issue in requesting a client delete a package it
doesn't
* have. So when we create the action, populate it with all packages and for
every
* server to which any package removal applies. This will let us keep all of the
* removals coupled under a single scheduled action and won't cause an issue
on
* the client when the scheduled removals are picked up.
- *
+ *
* jdobies, Apr 8, 2009
*/
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 c13a34f..5620c22 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java
@@ -25,7 +25,7 @@ import com.redhat.rhn.manager.action.ActionManager;
/**
* Handles removing packages from servers in the SSM.
- *
+ *
* @see com.redhat.rhn.frontend.events.SsmUpgradePackagesEvent
*/
public class SsmUpgradePackagesAction extends SsmPackagesAction {
@@ -33,7 +33,7 @@ public class SsmUpgradePackagesAction extends SsmPackagesAction {
protected String getOperationName() {
return "ssm.package.upgrade.operationname";
}
-
+
protected List<Long> getAffectedServers(SsmPackageEvent event, User u) {
SsmUpgradePackagesEvent supe = (SsmUpgradePackagesEvent) event;
List<Long> sids = new ArrayList<Long>();
diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesEvent.java
b/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesEvent.java
index c065091..f11c0c2 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesEvent.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesEvent.java
@@ -56,7 +56,7 @@ public class SsmUpgradePackagesEvent extends SsmPackageEvent {
}
sysPackageSet = sysPackageSetIn;
}
-
+
/**
* Creates a new SSM upgrade packages event.
*
diff --git a/java/code/src/com/redhat/rhn/manager/MissingCapabilityException.java
b/java/code/src/com/redhat/rhn/manager/MissingCapabilityException.java
index 2a12b78..30701e9 100644
--- a/java/code/src/com/redhat/rhn/manager/MissingCapabilityException.java
+++ b/java/code/src/com/redhat/rhn/manager/MissingCapabilityException.java
@@ -44,7 +44,7 @@ public class MissingCapabilityException extends RhnRuntimeException {
/**
* Constructor for exception on missing capability on a bunch of servers.
- *
+ *
* @param missingCapability the missing capability.
* @param sid the ID of the server missing the capability
*/
diff --git a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
index 1e25e20..1769300 100644
--- a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
+++ b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
@@ -1246,7 +1246,7 @@ public class ActionManager extends BaseManager {
List<Action> actions = new ArrayList<Action>();
Action anAction;
-
+
// Different handling for package removal on solaris v. rhel, so split out
// the servers first in case the list is mixed.
Set<Long> rhelServers = new HashSet<Long>();
@@ -1390,7 +1390,7 @@ public class ActionManager extends BaseManager {
/**
* Schedules a script action for the given servers
- *
+ *
* @param scheduler User scheduling the action.
* @param sids Servers for which the action affects.
* @param script The set of packages to be removed.
diff --git a/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java
b/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java
index 5cbb66f..2d171ee 100644
--- a/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java
+++ b/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java
@@ -235,11 +235,11 @@ public class SsmManager {
set.clear();
RhnSetManager.store(set);
}
-
+
/**
* Returns a list of server-ids of the servers in the SSM selection, for the
specified
* user
- *
+ *
* @param user user whose system-set we care about
* @return list of server-ids
*/