java/code/src/com/redhat/rhn/common/errors/NoSuchPackageExceptionHandler.java | 45
----------
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java | 3
java/code/webapp/WEB-INF/struts-config.xml | 3
java/spacewalk-java.spec | 6
+
rel-eng/packages/spacewalk-java | 2
5 files changed, 7 insertions(+), 52 deletions(-)
New commits:
commit 4a5c688215a16d088f673f7d7b546044d0817989
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue May 7 11:56:55 2013 +0200
Automatic commit of package [spacewalk-java] release [1.10.74-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 7340a08..ad5a0de 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.10.73
+Version: 1.10.74
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -751,6 +751,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue May 07 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.74-1
+- remove unused NoSuchPackageExceptionHandler
+- do not throw xmlrpc exception within the WebUI context
+
* Mon May 06 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.73-1
- 924205 - enhance exception handling
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 92b8b20..4c46b7a 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.73-1 java/
+1.10.74-1 java/
commit 9c5b0a6a936cc0aa85535fd4efe16ef107aa0da2
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon May 6 16:58:05 2013 +0200
remove unused NoSuchPackageExceptionHandler
diff --git a/java/code/src/com/redhat/rhn/common/errors/NoSuchPackageExceptionHandler.java
b/java/code/src/com/redhat/rhn/common/errors/NoSuchPackageExceptionHandler.java
deleted file mode 100644
index e24d4f0..0000000
--- a/java/code/src/com/redhat/rhn/common/errors/NoSuchPackageExceptionHandler.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Copyright (c) 2009--2010 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.common.errors;
-
-import com.redhat.rhn.frontend.xmlrpc.NoSuchPackageException;
-
-import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ExceptionHandler;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * UnknownPackageExceptionHandler
- * @version $Rev$
- */
-public class NoSuchPackageExceptionHandler extends ExceptionHandler {
- private NoSuchPackageException exception;
-
- @Override
- protected void storeException(HttpServletRequest request, String property,
- ActionMessage error, ActionForward forward, String scope) {
- request.setAttribute("error", exception);
- }
-
- @Override
- protected void logException(Exception ex) {
- Logger log = Logger.getLogger(NoSuchPackageExceptionHandler.class);
- log.error("Missing Parameter Error", ex);
- exception = (NoSuchPackageException) ex;
- }
-}
diff --git a/java/code/webapp/WEB-INF/struts-config.xml
b/java/code/webapp/WEB-INF/struts-config.xml
index d9c84f6..272846e 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -1248,9 +1248,6 @@
<exception type="com.redhat.rhn.common.security.PermissionException"
path="/WEB-INF/pages/common/errors/permission.jsp"
key="frontend.actions.channels.manager.add.permsfailure"
handler="com.redhat.rhn.common.errors.PermissionExceptionHandler"/>
- <exception type="com.redhat.rhn.frontend.xmlrpc.NoSuchPackageException"
- path="/WEB-INF/pages/common/errors/nosuchpkg.jsp" key="date"
-
handler="com.redhat.rhn.common.errors.NoSuchPackageExceptionHandler"/>
<exception
type="com.redhat.rhn.frontend.xmlrpc.NoSuchKickstartException"
path="/WEB-INF/pages/common/errors/nosuchkickstart.jsp"
key="date"
handler="com.redhat.rhn.common.errors.NoSuchKickstartExceptionHandler"/>
commit dcf378e331ec581ba8e85bcb8388e067c96ad6ef
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon May 6 16:56:39 2013 +0200
do not throw xmlrpc exception within the WebUI context
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java
index 1fe0ba4..247f6f2 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java
@@ -26,7 +26,6 @@ import com.redhat.rhn.frontend.dto.PackageListItem;
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.xmlrpc.NoSuchPackageException;
import com.redhat.rhn.manager.download.DownloadManager;
import com.redhat.rhn.manager.rhnpackage.PackageManager;
@@ -168,7 +167,7 @@ public class PackageDetailsAction extends RhnAction {
// show permission error if pid is invalid like we did before
if (pkg == null) {
- throw new NoSuchPackageException();
+ throw new PermissionException("Invalid id_combo and cid/sid");
}
Map params = new HashMap();