You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by rm...@apache.org on 2011/04/18 20:16:15 UTC
svn commit: r1094683 -
/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java
Author: rmatthews
Date: Mon Apr 18 18:16:14 2011
New Revision: 1094683
URL: http://svn.apache.org/viewvc?rev=1094683&view=rev
Log:
trialling embedded error messages (for apps in production rather than testing)
Modified:
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java?rev=1094683&r1=1094682&r2=1094683&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java Mon Apr 18 18:16:14 2011
@@ -108,10 +108,10 @@ public class Dispatcher {
}
try {
- // TODO pick this up from configuration
+ // TODO pick options up from configuration
// context.raiseError(404);
//context.setRequestPath("/error/notfound_404.shtml");
- IsisContext.getMessageBroker().addWarning("Failed to find page...."); // TODO complete message
+ IsisContext.getMessageBroker().addWarning("Failed to find page " + servletPath + ". Please navigate from here");
context.setRequestPath("/index.shtml");
processTheView(context);
} catch (IOException e1) {
@@ -124,7 +124,7 @@ public class Dispatcher {
try {
processTheView(context);
} catch (IOException e1) {
- throw new ScimpiException(e);
+ throw new ScimpiException(e1);
}
} catch (Throwable e) {
@@ -162,9 +162,9 @@ public class Dispatcher {
} else {
// TODO allow these values to be got configuration
// context.raiseError(500);
- context.setRequestPath("/error/server_500.shtml");
- //IsisContext.getMessageBroker().addWarning("There was a error while processing this request...."); // TODO include the reference code so it can be looked up
- //context.setRequestPath("/index.shtml");
+ // context.setRequestPath("/error/server_500.shtml");
+ IsisContext.getMessageBroker().addWarning("There was a error while processing this request...."); // TODO include the reference code so it can be looked up
+ context.setRequestPath("/index.shtml");
try {
processTheView(context);
} catch (IOException e1) {