Skip to content

Commit

Permalink
new impl
Browse files Browse the repository at this point in the history
Issue #554
  • Loading branch information
rsoika committed Oct 2, 2023
1 parent 4e88471 commit 33aabac
Show file tree
Hide file tree
Showing 7 changed files with 129 additions and 280 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd">

<factory>
<exception-handler-factory>
org.imixs.workflow.office.util.ImixsExceptionHandlerFactory
</exception-handler-factory>
</factory>

<application>

Expand Down
22 changes: 10 additions & 12 deletions imixs-office-workflow-app/src/main/webapp/errorhandler.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<c:choose>
<!-- Handle ModelException .... -->
<c:when
test="#{errorHandlerData.exceptionType eq 'ModelException'}">
test="#{flash.keep.type eq 'ModelException'}">

<h3>
<span class="typcn typcn-flow-merge"></span>
Expand All @@ -31,7 +31,7 @@

<!-- Handle PluginException .... -->
<c:when
test="#{errorHandlerData.exceptionType eq 'PluginException'}">
test="#{flash.keep.type eq 'PluginException'}">
<h3>
<span class="typcn typcn-plug"></span>
#{message['plugin_exception_title']}
Expand All @@ -40,7 +40,7 @@

<!-- Handle WELD-000321: No conversation found to restore for .... -->
<c:when
test="#{errorHandlerData.exceptionType eq 'ConversationException'}">
test="#{flash.keep.type eq 'ConversationException'}">
<h3>
<span class="typcn typcn-stopwatch"></span>
#{message['login.conversation_expired_title']}
Expand All @@ -49,7 +49,7 @@

<!-- Handle jakarta.persistence.OptimisticLockException .... -->
<c:when
test="#{errorHandlerData.exceptionType eq 'OptimisticLockException'}">
test="#{flash.keep.type eq 'OptimisticLockException'}">
<h3>
<span class="typcn typcn-messages"> </span>
#{message['login.optimisticlock_exception_title']}
Expand All @@ -58,7 +58,7 @@

<!-- handle rollback exceptions -->
<c:when
test="#{errorHandlerData.exceptionType eq 'RolledbackException'}">
test="#{flash.keep.type eq 'RolledbackException'}">
<h3>
<span class="typcn typcn-weather-stormy"></span>
#{message.error_message_rollback_title}
Expand All @@ -76,13 +76,11 @@



<p><h4>#{errorHandlerData.exceptionType}: #{errorHandlerData.message}</h4>
<p><h4>#{flash.keep.type}: #{flash.keep.message}</h4>
<hr />
<strong>Exception:</strong>#{flash.keep.exception}
<br />
<strong>Exception:</strong> #{errorHandlerData.exception}
<br />
<strong>Error Code:</strong>#{errorHandlerData.statusCode}
<br />
<strong>URI:</strong>#{errorHandlerData.uri}
<strong>URI:</strong>#{flash.keep.uri}

</p>
<h:outputText value="#{session.lastAccessedTime}">
Expand All @@ -98,7 +96,7 @@

<input type="button" value="#{message.prev}"
class="imixs-action"
onclick="document.location='#{errorHandlerData.uri}'" />
onclick="document.location='#{flash.keep.uri}'" />
<h:commandButton action="home" value="#{message.close}"
immediate="true" />
</h:form>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 33aabac

Please sign in to comment.