[jbpm-commits] JBoss JBPM SVN: r3593 - in projects/jsf-console/trunk: console/src/main/webapp/app and 1 other directory.

Author: heiko.braun(a)jboss.com Date: 2009-01-07 08:31:10 -0500 (Wed, 07 Jan 2009) New Revision: 3593 Modified: projects/jsf-console/trunk/console/src/main/webapp/app/procdef.xhtml projects/jsf-console/trunk/console/src/main/webapp/app/procins.xhtml projects/jsf-console/trunk/console/src/main/webapp/app/tasks.xhtml projects/jsf-console/trunk/console/src/main/webapp/app/tasks_all.xhtml projects/jsf-console/trunk/console/src/main/webapp/app/user.xhtml projects/jsf-console/trunk/pom.xml Log: Fix JBPM-1913: Upgrade to Facelets 1.1.15.B1 and apply patches from SOA-1052 Modified: projects/jsf-console/trunk/console/src/main/webapp/app/procdef.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/app/procdef.xhtml 2009-01-07 13:10:16 UTC (rev 3592) +++ projects/jsf-console/trunk/console/src/main/webapp/app/procdef.xhtml 2009-01-07 13:31:10 UTC (rev 3593) @@ -23,9 +23,16 @@ <ga:parameter name="pi_key" target="#{pi_key}" default=""> <f:converter converterId="gravel.StringWildcardFilter"/> </ga:parameter> - <ga:parameter name="fr" target="#{filter_running}" default="true"/> - <ga:parameter name="fs" target="#{filter_suspended}" default="true"/> - <ga:parameter name="fe" target="#{filter_ended}" default="false"/> + <ga:parameter name="fr" target="#{filter_running}" default="${true}"> + <f:converter converterId="javax.faces.Boolean"/> + </ga:parameter> + <ga:parameter name="fs" target="#{filter_suspended}" default="${true}"> + <f:converter converterId="javax.faces.Boolean"/> + </ga:parameter> + <ga:parameter name="fe" target="#{filter_ended}" default="${false}"> + <f:converter converterId="javax.faces.Boolean"/> + </ga:parameter> + <!-- tasks parameters --> <ga:parameter name="name" target="#{task_filter_name}" default=""> <f:converter converterId="gravel.StringWildcardFilter"/> @@ -33,11 +40,18 @@ <ga:parameter name="actor" target="#{task_filter_actor}" default=""> <f:converter converterId="gravel.StringWildcardFilter"/> </ga:parameter> - <ga:parameter name="fn" target="#{task_filter_notstarted}" default="true"/> - <ga:parameter name="fr" target="#{task_filter_running}" default="true"/> - <ga:parameter name="fs" target="#{task_filter_suspended}" default="true"/> - <ga:parameter name="fe" target="#{task_filter_ended}" default="false"/> - + <ga:parameter name="fn" target="#{task_filter_notstarted}" default="${true}"> + <f:converter converterId="javax.faces.Boolean"/> + </ga:parameter> + <ga:parameter name="fr" target="#{task_filter_running}" default="${true}"> + <f:converter converterId="javax.faces.Boolean"/> + </ga:parameter> + <ga:parameter name="fs" target="#{task_filter_suspended}" default="${true}"> + <f:converter converterId="javax.faces.Boolean"/> + </ga:parameter> + <ga:parameter name="fe" target="#{task_filter_ended}" default="${false}"> + <f:converter converterId="javax.faces.Boolean"/> + </ga:parameter> <j4j:loadProcess id="#{id}" target="#{pd}"/> <j4j:listTasksForProcess unless="#{viewMode != 'task'}" process="#{pd}" target="#{tasks}"/> <j4j:listProcessInstances unless="#{viewMode != 'ins'}" target="#{piList}" processId="#{id}"/> Modified: projects/jsf-console/trunk/console/src/main/webapp/app/procins.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/app/procins.xhtml 2009-01-07 13:10:16 UTC (rev 3592) +++ projects/jsf-console/trunk/console/src/main/webapp/app/procins.xhtml 2009-01-07 13:31:10 UTC (rev 3593) @@ -35,10 +35,18 @@ <ga:parameter name="actor" target="#{task_filter_actor}" default=""> <f:converter converterId="gravel.StringWildcardFilter"/> </ga:parameter> - <ga:parameter name="fn" target="#{task_filter_notstarted}" default="true"/> - <ga:parameter name="fr" target="#{task_filter_running}" default="true"/> - <ga:parameter name="fs" target="#{task_filter_suspended}" default="true"/> - <ga:parameter name="fe" target="#{task_filter_ended}" default="false"/> + <ga:parameter name="fn" target="#{task_filter_notstarted}" default="${true}"> + <f:converter converterId="javax.faces.Boolean"/> + </ga:parameter> + <ga:parameter name="fr" target="#{task_filter_running}" default="${true}"> + <f:converter converterId="javax.faces.Boolean"/> + </ga:parameter> + <ga:parameter name="fs" target="#{task_filter_suspended}" default="${true}"> + <f:converter converterId="javax.faces.Boolean"/> + </ga:parameter> + <ga:parameter name="fe" target="#{task_filter_ended}" default="${false}"> + <f:converter converterId="javax.faces.Boolean"/> + </ga:parameter> <gd:filter source="#{tasks}" target="#{tasks}" entryVar="entry" test="#{task_filter_notstarted and entry.start == null and entry.end == null or task_filter_ended and entry.end != null or (entry.start != null and entry.end == null) and (task_filter_suspended and entry.suspended or task_filter_running and ! entry.suspended)}"/> Modified: projects/jsf-console/trunk/console/src/main/webapp/app/tasks.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/app/tasks.xhtml 2009-01-07 13:10:16 UTC (rev 3592) +++ projects/jsf-console/trunk/console/src/main/webapp/app/tasks.xhtml 2009-01-07 13:31:10 UTC (rev 3593) @@ -23,11 +23,18 @@ <ga:parameter name="name" target="#{task_filter_name}" default=""> <f:converter converterId="gravel.StringWildcardFilter"/> </ga:parameter> - <ga:parameter name="fn" target="#{task_filter_notstarted}" default="true"/> - <ga:parameter name="fr" target="#{task_filter_running}" default="true"/> - <ga:parameter name="fs" target="#{task_filter_suspended}" default="true"/> - <ga:parameter name="fe" target="#{task_filter_ended}" default="false"/> - + <ga:parameter name="fn" target="#{task_filter_notstarted}" default="${true}"> + <f:converter converterId="javax.faces.Boolean"/> + </ga:parameter> + <ga:parameter name="fr" target="#{task_filter_running}" default="${true}"> + <f:converter converterId="javax.faces.Boolean"/> + </ga:parameter> + <ga:parameter name="fs" target="#{task_filter_suspended}" default="${true}"> + <f:converter converterId="javax.faces.Boolean"/> + </ga:parameter> + <ga:parameter name="fe" target="#{task_filter_ended}" default="${false}"> + <f:converter converterId="javax.faces.Boolean"/> + </ga:parameter> <gd:filter source="#{tasks}" target="#{tasks}" entryVar="entry" test="#{task_filter_notstarted and entry.start == null and entry.end == null or task_filter_ended and entry.end != null or (entry.start != null and entry.end == null) and (task_filter_suspended and entry.suspended or task_filter_running and ! entry.suspended)}"/> <gd:filter if="#{! empty task_filter_name}" entryVar="entry" source="#{tasks}" target="#{tasks}" filter="#{task_filter_name}" filterArgument="#{entry.name == null ? '' : entry.name}"/> Modified: projects/jsf-console/trunk/console/src/main/webapp/app/tasks_all.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/app/tasks_all.xhtml 2009-01-07 13:10:16 UTC (rev 3592) +++ projects/jsf-console/trunk/console/src/main/webapp/app/tasks_all.xhtml 2009-01-07 13:31:10 UTC (rev 3593) @@ -25,11 +25,18 @@ <ga:parameter name="actor" target="#{task_filter_actor}" default=""> <f:converter converterId="gravel.StringWildcardFilter"/> </ga:parameter> - <ga:parameter name="fn" target="#{task_filter_notstarted}" default="true"/> - <ga:parameter name="fr" target="#{task_filter_running}" default="true"/> - <ga:parameter name="fs" target="#{task_filter_suspended}" default="true"/> - <ga:parameter name="fe" target="#{task_filter_ended}" default="false"/> - + <ga:parameter name="fn" target="#{task_filter_notstarted}" default="${true}"> + <f:converter converterId="javax.faces.Boolean"/> + </ga:parameter> + <ga:parameter name="fr" target="#{task_filter_running}" default="${true}"> + <f:converter converterId="javax.faces.Boolean"/> + </ga:parameter> + <ga:parameter name="fs" target="#{task_filter_suspended}" default="${true}"> + <f:converter converterId="javax.faces.Boolean"/> + </ga:parameter> + <ga:parameter name="fe" target="#{task_filter_ended}" default="${false}"> + <f:converter converterId="javax.faces.Boolean"/> + </ga:parameter> <gd:filter source="#{tasks}" target="#{tasks}" entryVar="entry" test="#{task_filter_notstarted and entry.start == null and entry.end == null or task_filter_ended and entry.end != null or (entry.start != null and entry.end == null) and (task_filter_suspended and entry.suspended or task_filter_running and ! entry.suspended)}"/> <gd:filter if="#{! empty task_filter_name}" entryVar="entry" source="#{tasks}" target="#{tasks}" filter="#{task_filter_name}" filterArgument="#{entry.name == null ? '' : entry.name}"/> <gd:filter if="#{! empty task_filter_actor}" entryVar="entry" source="#{tasks}" target="#{tasks}" filter="#{task_filter_actor}" filterArgument="#{entry.actorId == null ? '' : entry.actorId}"/> Modified: projects/jsf-console/trunk/console/src/main/webapp/app/user.xhtml =================================================================== --- projects/jsf-console/trunk/console/src/main/webapp/app/user.xhtml 2009-01-07 13:10:16 UTC (rev 3592) +++ projects/jsf-console/trunk/console/src/main/webapp/app/user.xhtml 2009-01-07 13:31:10 UTC (rev 3593) @@ -53,10 +53,18 @@ <ga:parameter name="actor" target="#{task_filter_actor}" default=""> <f:converter converterId="gravel.StringWildcardFilter"/> </ga:parameter> - <ga:parameter name="fn" target="#{task_filter_notstarted}" default="true"/> - <ga:parameter name="fr" target="#{task_filter_running}" default="true"/> - <ga:parameter name="fs" target="#{task_filter_suspended}" default="true"/> - <ga:parameter name="fe" target="#{task_filter_ended}" default="false"/> + <ga:parameter name="fn" target="#{task_filter_notstarted}" default="${true}"> + <f:converter converterId="javax.faces.Boolean"/> + </ga:parameter> + <ga:parameter name="fr" target="#{task_filter_running}" default="${true}"> + <f:converter converterId="javax.faces.Boolean"/> + </ga:parameter> + <ga:parameter name="fs" target="#{task_filter_suspended}" default="${true}"> + <f:converter converterId="javax.faces.Boolean"/> + </ga:parameter> + <ga:parameter name="fe" target="#{task_filter_ended}" default="${false}"> + <f:converter converterId="javax.faces.Boolean"/> + </ga:parameter> <gd:filter source="#{tasks}" target="#{tasks}" entryVar="entry" test="#{task_filter_notstarted and entry.start == null and entry.end == null or task_filter_ended and entry.end != null or (entry.start != null and entry.end == null) and (task_filter_suspended and entry.suspended or task_filter_running and ! entry.suspended)}"/> Modified: projects/jsf-console/trunk/pom.xml =================================================================== --- projects/jsf-console/trunk/pom.xml 2009-01-07 13:10:16 UTC (rev 3592) +++ projects/jsf-console/trunk/pom.xml 2009-01-07 13:31:10 UTC (rev 3593) @@ -43,7 +43,7 @@ <jbpm.version>3.3.1-SNAPSHOT</jbpm.version> <jboss.gravel.version>1.0.0.GA</jboss.gravel.version> <junit.version>3.8.1</junit.version> - <sun.facelets.version>1.1.14</sun.facelets.version> + <sun.facelets.version>1.1.15.B1</sun.facelets.version> </properties> <!-- DependencyManagement -->