java/code/src/com/redhat/rhn/frontend/action/SetLabels.java
| 1
java/code/src/com/redhat/rhn/frontend/action/keys/CryptoKeysListSetupAction.java
| 2
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartCryptoKeysSetupAction.java
| 2
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartCryptoKeysSubmitAction.java
| 2
java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java
| 12 -
java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsDeleteSetupAction.java
| 87 ++++++++++
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
| 3
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java
| 2
java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java
| 3
java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartListerTest.java
| 2
java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java
| 4
java/code/src/com/redhat/rhn/manager/system/SystemManager.java
| 19 ++
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
| 1
java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp
| 59 ++++++
java/code/webapp/WEB-INF/struts-config.xml
| 21 +-
java/spacewalk-java.spec
| 6
rel-eng/packages/spacewalk-java
| 2
17 files changed, 204 insertions(+), 24 deletions(-)
New commits:
commit 6c91126608ca10f99534345879f42befa7133472
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Jan 22 11:59:56 2013 +0100
Automatic commit of package [spacewalk-java] release [1.9.50-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 0baaf31..9a60447 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: 1.9.49
+Version: 1.9.50
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -659,6 +659,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Jan 22 2013 Tomas Lestach <tlestach(a)redhat.com> 1.9.50-1
+- removing unused PageControl parameter
+- 896015 - dissociate duplicate system set from SSM
+
* Mon Jan 21 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.48-1
- specify permission on /var/lib/tomcat*/webapps
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 6f2ace0..5603c00 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.49-1 java/
+1.9.50-1 java/
commit bdb6dd027f057886adf554affc28946537993650
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jan 21 15:18:32 2013 +0100
removing unused PageControl parameter
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/keys/CryptoKeysListSetupAction.java
b/java/code/src/com/redhat/rhn/frontend/action/keys/CryptoKeysListSetupAction.java
index c81c7db..163d101 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/keys/CryptoKeysListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/keys/CryptoKeysListSetupAction.java
@@ -43,7 +43,7 @@ public class CryptoKeysListSetupAction extends RhnAction {
RequestContext requestContext = new RequestContext(request);
DataResult result = KickstartLister.getInstance().cryptoKeysInOrg(
- requestContext.getCurrentUser().getOrg(), null);
+ requestContext.getCurrentUser().getOrg());
request.setAttribute(RequestContext.PAGE_LIST, result);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartCryptoKeysSetupAction.java
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartCryptoKeysSetupAction.java
index 86d13d6..ffd4bd0 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartCryptoKeysSetupAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartCryptoKeysSetupAction.java
@@ -43,7 +43,7 @@ public class KickstartCryptoKeysSetupAction extends
BaseKickstartListSetupAction
*/
protected DataResult getDataResult(RequestContext rctx, PageControl pc) {
return KickstartLister.getInstance().
- cryptoKeysInOrg(rctx.getCurrentUser().getOrg(), pc);
+ cryptoKeysInOrg(rctx.getCurrentUser().getOrg());
}
/**
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartCryptoKeysSubmitAction.java
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartCryptoKeysSubmitAction.java
index 2d97dec..1b30845 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartCryptoKeysSubmitAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartCryptoKeysSubmitAction.java
@@ -85,7 +85,7 @@ public class KickstartCryptoKeysSubmitAction extends
BaseKickstartListSubmitActi
HttpServletRequest request) {
RequestContext rctx = new RequestContext(request);
return KickstartLister.getInstance().
- cryptoKeysInOrg(rctx.getCurrentUser().getOrg(), null);
+ cryptoKeysInOrg(rctx.getCurrentUser().getOrg());
}
protected void processMethodKeys(Map map) {
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java
index 426cdf2..ef271ab 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java
@@ -68,7 +68,7 @@ public class CryptoKeysHandler extends BaseHandler {
Org org = loggedInUser.getOrg();
KickstartLister lister = KickstartLister.getInstance();
- DataResult dataResult = lister.cryptoKeysInOrg(org, null);
+ DataResult dataResult = lister.cryptoKeysInOrg(org);
return dataResult;
}
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java
b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java
index 77245e1..b35db1a 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java
@@ -175,10 +175,9 @@ public class KickstartLister extends BaseManager {
* Get the list of GPG keys definied for this org. Returns
* DataResult of CryptoKeyDto.
* @param orgIn that has the GPG keys
- * @param pc the page control
* @return DataResult of GPG keys
*/
- public DataResult cryptoKeysInOrg(Org orgIn, PageControl pc) {
+ public DataResult cryptoKeysInOrg(Org orgIn) {
if (logger.isDebugEnabled()) {
logger.debug("gpgKeysInOrg(Org orgIn=" +
orgIn + ") - start");
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartListerTest.java
b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartListerTest.java
index da66487..49947ad 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartListerTest.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartListerTest.java
@@ -59,7 +59,7 @@ public class KickstartListerTest extends BaseTestCaseWithUser {
KickstartFactory.saveCryptoKey(key);
flushAndEvict(key);
- DataResult dr = KickstartLister.getInstance().cryptoKeysInOrg(o, null);
+ DataResult dr = KickstartLister.getInstance().cryptoKeysInOrg(o);
assertTrue(dr.size() > 0);
assertTrue(dr.get(0) instanceof CryptoKeyDto);
}
commit 4714883c49d1fa9e18b925141c50b25c74844ae9
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 17 17:30:03 2013 +0100
896015 - dissociate duplicate system set from SSM
diff --git a/java/code/src/com/redhat/rhn/frontend/action/SetLabels.java
b/java/code/src/com/redhat/rhn/frontend/action/SetLabels.java
index bc738f7..c9e6aab 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/SetLabels.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/SetLabels.java
@@ -23,6 +23,7 @@ public final class SetLabels {
public static final String SYSTEM_ENTITLEMENTS = "system_entitlements";
public static final String AFFECTED_SYSTEMS_LIST = "errata_system_list";
public static final String SYSTEM_LIST = "system_list";
+ public static final String DUPLICATE_SYSTEM_LIST =
"duplicate_system_list";
public static final String PATCH_INSTALL_SET = "install_patch_list";
public static final String PATCH_REMOVE_SET = "removable_patch_list";
public static final String PACKAGE_UPGRADE_SET = "upgrade_package_list";
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java
index dd8e4bc..1d294d6 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java
@@ -70,8 +70,7 @@ public class DuplicateSystemsAction extends RhnAction implements
Listable {
helper.setWillClearSet(false);
helper.execute();
if (helper.isDispatched()) {
- RequestContext context = new RequestContext(request);
- return handleConfirm(context, mapping);
+ return mapping.findForward("confirm");
}
@@ -100,13 +99,6 @@ public class DuplicateSystemsAction extends RhnAction implements
Listable {
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
- private ActionForward handleConfirm(RequestContext context,
- ActionMapping mapping) {
-
getStrutsDelegate().saveMessage("duplicate.systems.delete.confirm.message",
- context.getRequest());
- return mapping.findForward("confirm");
- }
-
/**
* {@inheritDoc}
*/
@@ -126,7 +118,7 @@ public class DuplicateSystemsAction extends RhnAction implements
Listable {
}
private RhnSetDecl getSetDecl() {
- return RhnSetDecl.SYSTEMS;
+ return RhnSetDecl.DUPLICATE_SYSTEMS;
}
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsDeleteSetupAction.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsDeleteSetupAction.java
new file mode 100644
index 0000000..dbf42a1
--- /dev/null
+++
b/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsDeleteSetupAction.java
@@ -0,0 +1,87 @@
+/**
+ * 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.systems.duplicate;
+
+import com.redhat.rhn.common.messaging.MessageQueue;
+import com.redhat.rhn.domain.rhnset.RhnSet;
+import com.redhat.rhn.frontend.events.SsmDeleteServersEvent;
+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.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.rhnset.RhnSetManager;
+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 java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * DuplicateSystemsDeleteSetupAction
+ * @version $Rev$
+ */
+public class DuplicateSystemsDeleteSetupAction extends RhnAction implements Listable {
+ /**
+ * {@inheritDoc}
+ */
+ public ActionForward execute(ActionMapping mapping,
+ ActionForm formIn,
+ HttpServletRequest request,
+ HttpServletResponse response) {
+ RequestContext context = new RequestContext(request);
+ if (context.wasDispatched("ssm.delete.systems.confirmbutton")) {
+ return handleConfirm(context, mapping);
+ }
+
+ ListHelper helper = new ListHelper(this, request);
+ helper.execute();
+
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
+ }
+
+ private ActionForward handleConfirm(RequestContext context,
+ ActionMapping mapping) {
+
+ RhnSet set = RhnSetDecl.DUPLICATE_SYSTEMS.get(context.getLoggedInUser());
+
+ // Fire the request off asynchronously
+ SsmDeleteServersEvent event =
+ new SsmDeleteServersEvent(context.getLoggedInUser(),
+ new ArrayList<Long>(set.getElementValues()));
+ MessageQueue.publish(event);
+ set.clear();
+ RhnSetManager.store(set);
+
+
getStrutsDelegate().saveMessage("duplicate.systems.delete.confirmmessage",
+ context.getRequest());
+ return mapping.findForward("confirm");
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public List getResult(RequestContext contextIn) {
+ return SystemManager.inSet(contextIn.getLoggedInUser(),
+ RhnSetDecl.DUPLICATE_SYSTEMS.getLabel(), true);
+ }
+}
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 90edaf7..6c84d43 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
@@ -4916,6 +4916,9 @@ value for this entitlement, excluding the default organization's
consumption.</s
<trans-unit id="duplicate.systems.delete.confirm.message">
<source> There may be system profiles selected for deletion below that
were not selected on the Duplicate System Profiles page. Please check the list below
carefully to prevent accidental deletion of profiles that may have been in the System Set
Manager.</source>
</trans-unit>
+ <trans-unit id="duplicate.systems.delete.confirmmessage">
+ <source>Selected systems have been queued for deletion.</source>
+ </trans-unit>
<trans-unit id="Compare Systems">
<source>Compare Systems</source>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java
b/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java
index 2b7699b..da1a683 100644
--- a/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java
+++ b/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java
@@ -164,6 +164,10 @@ public class RhnSetDecl {
public static final RhnSetDecl SYSTEMS = make(SetLabels.SYSTEM_LIST,
SetCleanup.ILLEGAL_SERVERS);
+ // set of duplicate servers by server_id
+ public static final RhnSetDecl DUPLICATE_SYSTEMS = make(
+ SetLabels.DUPLICATE_SYSTEM_LIST, SetCleanup.NOOP);
+
// set of servers by server_id
public static final RhnSetDecl SYSTEMS_AFFECTED = make(
SetLabels.AFFECTED_SYSTEMS_LIST, SetCleanup.UNOWNED_SERVERS);
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index b49c7f5..75e3afe 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -2677,6 +2677,20 @@ public class SystemManager extends BaseManager {
* @return List of SystemOverview objects
*/
public static List<SystemOverview> inSet(User user, String setLabel) {
+ return inSet(user, setLabel, false);
+ }
+
+
+ /**
+ * Get a list of SystemOverview objects for the systems in an rhnset with option
+ * to elaborate the result
+ * @param user the user doing the lookup
+ * @param setLabel the label of the set
+ * @param elaborate elaborate results
+ * @return List of SystemOverview objects
+ */
+ public static List<SystemOverview> inSet(User user, String setLabel,
+ boolean elaborate) {
DataResult retval = null;
SelectMode mode = ModeFactory.getMode("System_queries",
"in_set");
@@ -2684,7 +2698,10 @@ public class SystemManager extends BaseManager {
params.put("user_id", user.getId());
params.put("set_label", setLabel);
retval = mode.execute(params);
- retval.setElaborationParams(Collections.EMPTY_MAP);
+ if (elaborate) {
+ retval.setElaborationParams(Collections.EMPTY_MAP);
+ retval.elaborate();
+ }
return retval;
}
diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
index 295188a..ee7f365 100644
--- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
+++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
@@ -53,6 +53,7 @@
<rhn-tab-url>/rhn/systems/DuplicateHostName.do</rhn-tab-url>
<rhn-tab-url>/rhn/systems/DuplicateMacAddress.do</rhn-tab-url>
<rhn-tab-url>/rhn/systems/DuplicateSystemsCompare.do</rhn-tab-url>
+
<rhn-tab-url>/rhn/systems/DuplicateSystemsDeleteConfirm.do</rhn-tab-url>
</rhn-tab>
<rhn-tab name="System Currency"
url="/rhn/systems/SystemCurrency.do"/>
</rhn-tab>
diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp
b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp
new file mode 100644
index 0000000..68b3ba0
--- /dev/null
+++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp
@@ -0,0 +1,59 @@
+<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
+<%@ 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/tags/list" prefix="rl"
%>
+
+<html:xhtml/>
+<html>
+<body>
+<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="system.common.systemAlt"
+
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-ood">
+ <bean:message key="duplicates.jsp.header"/>
+</rhn:toolbar>
+
+<h2>
+ <bean:message key="ssm.delete.systems.header" />
+</h2>
+<p><bean:message key="ssm.delete.systems.summary" /></p>
+
+<rl:listset name="DupesListSet" legend="system">
+
+<rhn:csrf />
+
+<rl:list emptykey="nosystems.message">
+
+ <rl:decorator name="ElaborationDecorator"/>
+ <rl:decorator name="PageSizeDecorator"/>
+
+ <!-- Name Column -->
+ <rl:column sortable="true"
+ bound="false"
+ headerkey="systemlist.jsp.system"
+ sortattr="name"
+ defaultsort="asc"
+ styleclass="first-column">
+ <c:out value="<a
href=\"/rhn/systems/details/Overview.do?sid=${current.id}\">${current.name}</a>"
escapeXml="false" />
+ </rl:column>
+ <rl:column sortable="false"
+ attr="lastCheckin"
+ bound="true"
+ headerkey="systemlist.jsp.last_checked_in"
+ styleclass="last-column" />
+</rl:list>
+
+ <div align="right">
+
+ <hr />
+ <html:submit property="dispatch">
+ <bean:message key="ssm.delete.systems.confirmbutton"/>
+ </html:submit>
+
+ </div>
+<rhn:submitted/>
+
+</rl:listset>
+
+
+</body>
+</html>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml
b/java/code/webapp/WEB-INF/struts-config.xml
index 6793b48..9f554ce 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -2678,7 +2678,7 @@
<forward name="default"
path="/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp"/>
<forward name="confirm"
- path="/systems/ssm/DeleteConfirm.do"
+ path="/systems/DuplicateSystemsDeleteConfirm.do"
redirect="true"/>
</action>
@@ -2692,7 +2692,7 @@
<forward name="default"
path="/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp"/>
<forward name="confirm"
- path="/systems/ssm/DeleteConfirm.do"
+ path="/systems/DuplicateSystemsDeleteConfirm.do"
redirect="true"/>
</action>
@@ -2706,7 +2706,7 @@
<forward name="default"
path="/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp"/>
<forward name="confirm"
- path="/systems/ssm/DeleteConfirm.do"
+ path="/systems/DuplicateSystemsDeleteConfirm.do"
redirect="true"/>
</action>
@@ -2720,7 +2720,7 @@
<forward name="default"
path="/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp"/>
<forward name="confirm"
- path="/systems/ssm/DeleteConfirm.do"
+ path="/systems/DuplicateSystemsDeleteConfirm.do"
redirect="true"/>
</action>
@@ -2748,6 +2748,19 @@
redirect="true"/>
</action>
+ <action path="/systems/DuplicateSystemsDeleteConfirm"
+ scope="request"
+ input="/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp"
+
type="com.redhat.rhn.frontend.action.systems.duplicate.DuplicateSystemsDeleteSetupAction"
+ className="com.redhat.rhn.frontend.struts.RhnActionMapping"
+ parameter="hostname">
+ <set-property property="postRequiredIfSubmitted"
value="true" />
+ <forward name="default"
+
path="/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp"/>
+ <forward name="confirm"
+ path="/systems/DuplicateIPList.do"
+ redirect="true"/>
+ </action>
<action path="/systems/OutOfDate"
scope="request"