[seam-commits] Seam SVN: r14051 - in branches/enterprise/JBPAPP_5_0/src: main/org/jboss/seam/navigation and 2 other directories.

[seam-commits at lists.jboss.org]

Author: manaRH
Date: 2011-02-16 10:45:42 -0500 (Wed, 16 Feb 2011)
New Revision: 14051

Modified:
   branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/bpm/BusinessProcessInterceptor.java
   branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/bpm/ProcessInstance.java
   branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/navigation/TaskControl.java
   branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/pageflow/Page.java
   branches/enterprise/JBPAPP_5_0/src/test/integration/resources/WEB-INF/components.xml
Log:
JBPAPP-5517 - integration test for exception handling in jbpm EL expression and cleaning log messages if there is re-throw exceptions

Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/bpm/BusinessProcessInterceptor.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/bpm/BusinessProcessInterceptor.java	2011-02-16 12:51:22 UTC (rev 14050)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/bpm/BusinessProcessInterceptor.java	2011-02-16 15:45:42 UTC (rev 14051)
@@ -147,7 +147,6 @@
                BusinessProcess.instance().endTask( method.getAnnotation(EndTask.class).transition() );   
             }
             catch (Exception e) {
-               //log.error("Closing JBPM context because exception(s) was thrown!", e);
                throw new RuntimeException(e);
             }
             finally
@@ -166,7 +165,6 @@
                BusinessProcess.instance().transition(transitionName);
             }
             catch (Exception e) {
-               //log.error("Closing JBPM context because exception(s) was thrown!", e);
                throw new RuntimeException(e);
             }
             finally

Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/bpm/ProcessInstance.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/bpm/ProcessInstance.java	2011-02-16 12:51:22 UTC (rev 14050)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/bpm/ProcessInstance.java	2011-02-16 15:45:42 UTC (rev 14051)
@@ -46,7 +46,7 @@
             if (processId!=null)
             {
                //TODO: do we need to cache this??
-               return ManagedJbpmContext.instance().getProcessInstanceForUpdate(processId);
+               return ManagedJbpmContext.instance().getProcessInstance(processId);
             }
             else
             {

Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/navigation/TaskControl.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/navigation/TaskControl.java	2011-02-16 12:51:22 UTC (rev 14050)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/navigation/TaskControl.java	2011-02-16 15:45:42 UTC (rev 14051)
@@ -31,7 +31,6 @@
             BusinessProcess.instance().endTask(transition == null ? null : transition.getValue());
          }
          catch (Exception e) {
-            log.debug("Closing JBPM context because exception(s) was thrown!");
             throw new RuntimeException(e);
          }
          finally

Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/pageflow/Page.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/pageflow/Page.java	2011-02-16 12:51:22 UTC (rev 14050)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/pageflow/Page.java	2011-02-16 15:45:42 UTC (rev 14051)
@@ -110,7 +110,6 @@
             BusinessProcess.instance().endTask(transition);
          }
          catch (Exception e) {
-            log.debug("Closing JBPM context because exception(s) was thrown!");
             throw new RuntimeException(e);
          }
          finally

Modified: branches/enterprise/JBPAPP_5_0/src/test/integration/resources/WEB-INF/components.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/integration/resources/WEB-INF/components.xml	2011-02-16 12:51:22 UTC (rev 14050)
+++ branches/enterprise/JBPAPP_5_0/src/test/integration/resources/WEB-INF/components.xml	2011-02-16 15:45:42 UTC (rev 14051)
@@ -38,6 +38,8 @@
             <value>testProcess2.jpdl.xml</value>
             <value>testProcess3.jpdl.xml</value>
             <value>testProcess4.jpdl.xml</value>
+            <value>testProcess5.jpdl.xml</value>
+            <value>testProcess6.jpdl.xml</value>
         </bpm:process-definitions>
     </bpm:jbpm>