java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 2
++
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartCloneAction.java | 10
----------
java/spacewalk-java.spec | 3
++-
3 files changed, 4 insertions(+), 11 deletions(-)
New commits:
commit a994ea6f5bac3a2354b03071dbcae8d2a1545c68
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Feb 23 14:52:35 2011 +0100
679374 - clone also "Don't install @Base package group" and "Ignore
missing packages" kickstart profile atributes
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
index e28ba9e..6b97b67 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
@@ -1175,6 +1175,8 @@ public class KickstartData {
}
}
cloned.setDefaultRegTokens(newTokens);
+ cloned.setNoBase(this.getNoBase());
+ cloned.setIgnoreMissing(this.getIgnoreMissing());
//create a new session one
KickstartSessionCreateCommand cmd = new KickstartSessionCreateCommand(
commit 44897cf092f8763f3a3542a27179c541d273c195
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Feb 23 14:45:07 2011 +0100
remove dead code
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartCloneAction.java
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartCloneAction.java
index 2c9cb85..3b18090 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartCloneAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartCloneAction.java
@@ -16,10 +16,7 @@ package com.redhat.rhn.frontend.action.kickstart;
import com.redhat.rhn.common.validator.ValidatorError;
import com.redhat.rhn.common.validator.ValidatorException;
-import com.redhat.rhn.domain.kickstart.KickstartData;
-import com.redhat.rhn.domain.kickstart.KickstartFactory;
import com.redhat.rhn.domain.kickstart.builder.KickstartBuilder;
-import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.frontend.struts.RhnValidationHelper;
@@ -103,11 +100,4 @@ public class KickstartCloneAction extends RhnAction {
form.set(RequestContext.LABEL, cmd.getNewLabel());
return mapping.findForward("default");
}
-
- private boolean alreadyExists(String label, User user) {
- long oid = user.getOrg().getId();
- KickstartData d =
- KickstartFactory.lookupKickstartDataByLabelAndOrgId(label, oid);
- return (d != null);
- }
}
commit c31c30659f1ca872e36e5db774eb061731e96f50
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Feb 23 14:33:19 2011 +0100
replace servletapi5 require by tomcatX-servlet-2.X-api
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 03b1908..10d5cae 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -59,15 +59,16 @@ Requires: jta
Requires: log4j
Requires: redstone-xmlrpc
Requires: oscache
-Requires: servletapi5
# EL5/F12 = Struts 1.2 and Tomcat 5, EL6+/F13+ = 1.3 and 6
%if (0%{?rhel} && 0%{?rhel} < 6) || (0%{?fedora} && 0%{?fedora} <
13)
Requires: tomcat5
Requires: jasper5
+Requires: tomcat5-servlet-2.4-api
Requires: struts >= 0:1.2.9
%else
Requires: tomcat6
Requires: tomcat6-lib
+Requires: tomcat6-servlet-2.5-api
Requires: struts >= 0:1.3.0
Requires: struts-taglib >= 0:1.3.0
%endif
Show replies by date