You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by rg...@apache.org on 2005/10/12 17:24:56 UTC
svn commit: r314946 - in
/cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet:
ActionResponse.java PortletContext.java PortletException.java
PortletRequest.java PortletResponse.java
Author: rgoers
Date: Wed Oct 12 08:24:55 2005
New Revision: 314946
URL: http://svn.apache.org/viewcvs?rev=314946&view=rev
Log:
Convert CascadingRuntimeException to PortletException
Added:
cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/PortletException.java
Modified:
cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/ActionResponse.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/PortletContext.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/PortletRequest.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/PortletResponse.java
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/ActionResponse.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/ActionResponse.java?rev=314946&r1=314945&r2=314946&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/ActionResponse.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/ActionResponse.java Wed Oct 12 08:24:55 2005
@@ -17,8 +17,6 @@
import org.apache.cocoon.util.NetUtils;
-import org.apache.avalon.framework.CascadingRuntimeException;
-
import javax.portlet.PortletMode;
import javax.portlet.PortletModeException;
import javax.portlet.PortletPreferences;
@@ -67,13 +65,13 @@
try {
this.getActionResponse().setPortletMode(new PortletMode(value));
} catch (PortletModeException e) {
- throw new CascadingRuntimeException("Cant set portlet mode '" + value + "'", e);
+ throw new PortletException("Cant set portlet mode '" + value + "'", e);
}
} else if (PortletEnvironment.HEADER_WINDOW_STATE.equals(name)) {
try {
this.getActionResponse().setWindowState(new WindowState(value));
} catch (WindowStateException e) {
- throw new CascadingRuntimeException("Cant set window state '" + value + "'", e);
+ throw new PortletException("Cant set window state '" + value + "'", e);
}
} else {
super.addHeader(name, value);
@@ -90,13 +88,13 @@
try {
this.getActionResponse().setPortletMode(new PortletMode(value));
} catch (PortletModeException e) {
- throw new CascadingRuntimeException("Cant set portlet mode '" + value + "'", e);
+ throw new PortletException("Cant set portlet mode '" + value + "'", e);
}
} else if (PortletEnvironment.HEADER_WINDOW_STATE.equals(name)) {
try {
this.getActionResponse().setWindowState(new WindowState(value));
} catch (WindowStateException e) {
- throw new CascadingRuntimeException("Cant set window state '" + value + "'", e);
+ throw new PortletException("Cant set window state '" + value + "'", e);
}
} else {
super.setHeader(name, value);
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/PortletContext.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/PortletContext.java?rev=314946&r1=314945&r2=314946&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/PortletContext.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/PortletContext.java Wed Oct 12 08:24:55 2005
@@ -17,8 +17,6 @@
import org.apache.cocoon.environment.impl.AbstractContext;
-import org.apache.avalon.framework.CascadingRuntimeException;
-
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
@@ -78,7 +76,7 @@
try {
value = this.context.getResource("/WEB-INF").toString();
} catch (MalformedURLException mue) {
- throw new CascadingRuntimeException("Cannot determine the base URL for " + path, mue);
+ throw new PortletException("Cannot determine the base URL for " + path, mue);
}
value = value.substring(0, value.length() - "WEB-INF".length());
}
Added: cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/PortletException.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/PortletException.java?rev=314946&view=auto
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/PortletException.java (added)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/PortletException.java Wed Oct 12 08:24:55 2005
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.environment.portlet;
+
+import org.apache.cocoon.portal.PortalException;
+
+/**
+ *
+ * @author <a href="mailto:rgoers@apache.org">Ralph Goers</a>
+ *
+ * @version $Id: $
+ */
+public class PortletException extends PortalException {
+ public PortletException() {
+ super();
+ }
+
+ public PortletException(String message) {
+ super(message);
+ }
+
+ public PortletException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public PortletException(Throwable cause) {
+ super(cause);
+ }
+}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/PortletRequest.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/PortletRequest.java?rev=314946&r1=314945&r2=314946&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/PortletRequest.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/PortletRequest.java Wed Oct 12 08:24:55 2005
@@ -22,8 +22,6 @@
import org.apache.cocoon.portlet.multipart.MultipartActionRequest;
import org.apache.commons.collections.IteratorUtils;
-import org.apache.avalon.framework.CascadingRuntimeException;
-
import javax.portlet.PortalContext;
import javax.portlet.PortletMode;
import javax.portlet.PortletPreferences;
@@ -370,7 +368,7 @@
byte[] bytes = str.getBytes(this.container_encoding);
return new String(bytes, form_encoding);
} catch (java.io.UnsupportedEncodingException uee) {
- throw new CascadingRuntimeException("Unsupported Encoding Exception", uee);
+ throw new PortletException("Unsupported Encoding Exception", uee);
}
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/PortletResponse.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/PortletResponse.java?rev=314946&r1=314945&r2=314946&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/PortletResponse.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/environment/portlet/PortletResponse.java Wed Oct 12 08:24:55 2005
@@ -18,8 +18,6 @@
import org.apache.cocoon.environment.Cookie;
import org.apache.cocoon.environment.Response;
-import org.apache.avalon.framework.CascadingRuntimeException;
-
import javax.portlet.PortletPreferences;
import javax.portlet.ReadOnlyException;
@@ -34,7 +32,7 @@
*
* @author <a href="mailto:alex.rudnev@dc.gov">Alex Rudnev</a>
* @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
- * @version CVS $Id: PortletResponse.java,v 1.2 2004/03/05 13:02:08 bdelacretaz Exp $
+ * @version CVS $Id$
*/
public abstract class PortletResponse implements Response {
@@ -105,9 +103,9 @@
// TODO: When is good time to persist changes?
this.preferences.store();
} catch (ReadOnlyException e) {
- throw new CascadingRuntimeException("Cannot set read-only preference '" + cookie.getName() + "'", e);
+ throw new PortletException("Cannot set read-only preference '" + cookie.getName() + "'", e);
} catch (Exception e) {
- throw new CascadingRuntimeException("Cannot set preference '" + cookie.getName() + "'", e);
+ throw new PortletException("Cannot set preference '" + cookie.getName() + "'", e);
}
}