java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java | 22
++++++++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 3 +
java/spacewalk-java.spec | 8 +++
rel-eng/packages/spacewalk-java | 2
4 files changed, 29 insertions(+), 6 deletions(-)
New commits:
commit 1eb0b43fe7b46ed0287684ed823a034ef389f25a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 22 16:27:15 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.123-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 8c02550..7bdae62 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.122
+Version: 2.1.123
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Jan 22 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.123-1
+- Bugfix: ISE when cobbler components are missing (not installed)
+- port reboot_confirm.pxt from perl to java
+- SUSE Studio API will stop working via unencrypted HTTP
+- Inconsistency in build vs. eclipse checkstyle.
+
* Wed Jan 22 2014 Tomas Lestach <tlestach(a)redhat.com> 2.1.122-1
- let taskomatic link commons-io
- fix CVE URL in updateinfo references
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 3d45759..e538d17 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.122-1 java/
+2.1.123-1 java/
commit 2d7add225d3d4b447cff70c31393ffde7a4b5173
Author: Bo Maryniuk <bo(a)suse.de>
Date: Fri Jan 17 19:21:06 2014 +0100
Bugfix: ISE when cobbler components are missing (not installed)
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java
b/java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java
index cadc1b4..c341eeb 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java
@@ -35,22 +35,36 @@ import javax.servlet.http.HttpServletResponse;
* @version $Rev$
*/
public class CobblerAction extends RhnAction {
- /** {@inheritDoc} */
+ /** {@inheritDoc}
+ * @param mapping
+ * @param formIn
+ * @param request
+ * @param response
+ * @return */
@Override
public ActionForward execute(ActionMapping mapping,
ActionForm formIn,
HttpServletRequest request,
HttpServletResponse response) {
RequestContext ctx = new RequestContext(request);
+ ActionErrors errors = new ActionErrors();
if (ctx.isSubmitted()) {
- CobblerSyncCommand cmd = new CobblerSyncCommand(ctx.getLoggedInUser());
- ValidatorError ve = cmd.store();
+ ValidatorError ve;
+ try {
+ ve = new CobblerSyncCommand(ctx.getLoggedInUser()).store();
+ } catch (Exception ex) {
+ this.getStrutsDelegate().addError(errors,
+ "cobbler.jsp.xmlrpc.fail",
+ ex.getLocalizedMessage());
+ this.getStrutsDelegate().saveMessages(request, errors);
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
+ }
+
if (ve == null) {
addMessage(request, "cobbler.jsp.synced");
}
else {
- ActionErrors errors = new ActionErrors();
getStrutsDelegate().addError(errors, ve.getKey(), ve.getValues());
getStrutsDelegate().saveMessages(request, errors);
}
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 62ec065..e46805b 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
@@ -8237,6 +8237,9 @@ Please note that some manual configuration of these scripts may
still be require
<trans-unit id="cobbler.jsp.sync">
<source>Run Cobbler Sync</source>
</trans-unit>
+ <trans-unit id="cobbler.jsp.xmlrpc.fail">
+ <source>Cobbler command failed: {0}</source>
+ </trans-unit>
<trans-unit id="cobbler.jsp.synced">
<source>Cobbler Sync action was successfully executed. Look at
/var/log/cobbler/*.log for more information</source>
</trans-unit>