You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by cd...@apache.org on 2006/05/05 19:16:49 UTC
svn commit: r400114 - in /portals/pluto/trunk/pluto-container/src/main:
java/org/apache/pluto/core/PortletInvoker.java
resources/org/apache/pluto/core/LocalStrings.properties
Author: cdoremus
Date: Fri May 5 10:16:46 2006
New Revision: 400114
URL: http://svn.apache.org/viewcvs?rev=400114&view=rev
Log:
Fixes for PLUTO-239
Modified:
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletInvoker.java
portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/core/LocalStrings.properties
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletInvoker.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletInvoker.java?rev=400114&r1=400113&r2=400114&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletInvoker.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletInvoker.java Fri May 5 10:16:46 2006
@@ -171,8 +171,8 @@
} catch (javax.servlet.UnavailableException ex) {
int seconds = ex.isPermanent()?-1:ex.getUnavailableSeconds();
String message = EXCEPTIONS.getString(
- "error.portlet.unavailable",
- new String[] {String.valueOf(seconds)}
+ "error.portlet.invoker.unavailable",
+ uri, new String[] {String.valueOf(seconds)}
);
if (LOG.isErrorEnabled()) {
LOG.error(message, ex);
@@ -181,7 +181,7 @@
message, seconds);
} catch (javax.servlet.ServletException ex) {
- String message = EXCEPTIONS.getString("error.portlet.invoke");
+ String message = EXCEPTIONS.getString("error.portlet.invoker");
if(LOG.isErrorEnabled()) {
LOG.error(message);
}
Modified: portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/core/LocalStrings.properties
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/core/LocalStrings.properties?rev=400114&r1=400113&r2=400114&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/core/LocalStrings.properties (original)
+++ portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/core/LocalStrings.properties Fri May 5 10:16:46 2006
@@ -22,15 +22,13 @@
error.context.descriptor.load=An error occured while loading the context descriptor {0}
-
####################################
## Portlet Invocation ##
####################################
-error.portlet.invoke=Unable to successfully invoke portlet. Error during processing.
-error.portlet.invoke.dispatcher=Unable to locate request dispatcher for context {0} and portlet {1}.
-error.portlet.invoke.unavailable=Unable to invoke portlet. Resource {0} unavilable for {1} seconds.
+error.portlet.invoker=Unable to successfully invoke portlet. Error during processing.
+error.portlet.invoker.dispatcher=Unable to locate request dispatcher for context {0} and portlet {1}.
+error.portlet.invoker.unavailable=Unable to invoke portlet. Resource {0} unavailable for {1} seconds.
error.config.context.null=Error creating portlet invoker for portlet {0}. Unable to locate context {1}. Check your portlet configuration and ensure cross context dispatching is enabled.
-