[jbpm-commits] JBoss JBPM SVN: r3412 - in projects/jsf-console/trunk/console/src/main/webapp: WEB-INF and 1 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Wed Dec 17 15:58:23 EST 2008


Author: heiko.braun at jboss.com
Date: 2008-12-17 15:58:23 -0500 (Wed, 17 Dec 2008)
New Revision: 3412

Added:
   projects/jsf-console/trunk/console/src/main/webapp/app/
Removed:
   projects/jsf-console/trunk/console/src/main/webapp/sa/
Modified:
   projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/jboss-web.xml
   projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/jbpm4jsf-config.xml
   projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/web.xml
   projects/jsf-console/trunk/console/src/main/webapp/app/identities.xhtml
   projects/jsf-console/trunk/console/src/main/webapp/app/processes.xhtml
   projects/jsf-console/trunk/console/src/main/webapp/app/t_loggedin.xhtml
   projects/jsf-console/trunk/console/src/main/webapp/app/t_processinstances.xhtml
   projects/jsf-console/trunk/console/src/main/webapp/app/t_tasks.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/index.jsp
Log:
Align layout with SOA-P: move xhtml to app directory

Modified: projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/jboss-web.xml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/jboss-web.xml	2008-12-17 20:33:41 UTC (rev 3411)
+++ projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/jboss-web.xml	2008-12-17 20:58:23 UTC (rev 3412)
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE jboss-web PUBLIC 
-    "-//JBoss//DTD Web Application 2.4//EN" 
-    "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
 
 <jboss-web>
   <!--
-    Specify the security domain to use. This will be java:/jaas/<name> where <name> is one of the names configured in your login-config.xml.
+    Specify the security domain to use. This will be java:/jaas/<name> where 
+    <name> is one of the names configured in your login-config.xml.
   -->
   <security-domain>java:/jaas/jbpm-console</security-domain>
   <context-root>jbpm-console</context-root>

Modified: projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/jbpm4jsf-config.xml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/jbpm4jsf-config.xml	2008-12-17 20:33:41 UTC (rev 3411)
+++ projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/jbpm4jsf-config.xml	2008-12-17 20:58:23 UTC (rev 3412)
@@ -13,7 +13,7 @@
 
     <!-- This entry facilitates the usage of process image URLs -->
     <process-file-matcher>
-        <pattern>^/sa/pi/(\d+).jpg$</pattern>
+        <pattern>^/app/pi/(\d+).jpg$</pattern>
         <file-name>processimage.jpg</file-name>
         <content-type>image/jpg</content-type>
     </process-file-matcher>

Modified: projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/web.xml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/web.xml	2008-12-17 20:33:41 UTC (rev 3411)
+++ projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/web.xml	2008-12-17 20:58:23 UTC (rev 3412)
@@ -26,7 +26,7 @@
   <!-- This mapping is for the process images. -->
   <servlet-mapping>
     <servlet-name>Faces Servlet</servlet-name>
-    <url-pattern>/sa/pi/*</url-pattern>
+    <url-pattern>/app/pi/*</url-pattern>
   </servlet-mapping>
 
   <context-param>
@@ -55,7 +55,7 @@
 
   <servlet-mapping>
     <servlet-name>GDP Deployer Servlet</servlet-name>
-    <url-pattern>/upload/*</url-pattern>
+    <url-pattern>/app/upload/*</url-pattern>
   </servlet-mapping>
 
   <!--
@@ -76,7 +76,7 @@
   <security-constraint>
     <web-resource-collection>
       <web-resource-name>Secure Area</web-resource-name>
-      <url-pattern>/sa/*</url-pattern>
+      <url-pattern>/app/*</url-pattern>
       <http-method>GET</http-method>
       <http-method>POST</http-method>
     </web-resource-collection>

Copied: projects/jsf-console/trunk/console/src/main/webapp/app (from rev 3401, projects/jsf-console/trunk/console/src/main/webapp/sa)

Modified: projects/jsf-console/trunk/console/src/main/webapp/app/identities.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/sa/identities.xhtml	2008-12-16 14:24:23 UTC (rev 3401)
+++ projects/jsf-console/trunk/console/src/main/webapp/app/identities.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
@@ -11,7 +11,7 @@
       xmlns:j4j="http://jbpm.org/jbpm4jsf/core"
       xmlns:id="http://jbpm.org/jbpm4jsf/identity"
 >
-    <ui:composition template="../sa/t_loggedin.xhtml">
+    <ui:composition template="../app/t_loggedin.xhtml">
         <ui:define name="actions">
             <ga:checkRole roles="#{access.role.identities}">
                 <ga:responseActions>

Modified: projects/jsf-console/trunk/console/src/main/webapp/app/processes.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/sa/processes.xhtml	2008-12-16 14:24:23 UTC (rev 3401)
+++ projects/jsf-console/trunk/console/src/main/webapp/app/processes.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
@@ -10,7 +10,7 @@
       xmlns:n="http://gravel.jboss.org/jsf/1.0/navigation"
       xmlns:j4j="http://jbpm.org/jbpm4jsf/core"
 >
-    <ui:composition template="../sa/t_loggedin.xhtml">
+    <ui:composition template="../app/t_loggedin.xhtml">
         <ui:define name="actions">
             <ga:responseActions>
                 <j4j:listProcesses target="#{proclist}"/>

Modified: projects/jsf-console/trunk/console/src/main/webapp/app/t_loggedin.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/sa/t_loggedin.xhtml	2008-12-16 14:24:23 UTC (rev 3401)
+++ projects/jsf-console/trunk/console/src/main/webapp/app/t_loggedin.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
@@ -32,26 +32,26 @@
 
         <ui:define name="header">
             <h:outputText value="#{msgs['topmenu.caption']}" style="margin-left:30px;margin-right:10px"/>
-            <h:outputLink styleClass="headermenufirst" value="processes.jsf" style="#{view.viewId == '/sa/processes.xhtml' ? 'font-weight:bold' : ''}">
+            <h:outputLink styleClass="headermenufirst" value="processes.jsf" style="#{view.viewId == '/app/processes.xhtml' ? 'font-weight:bold' : ''}">
                 <h:outputText value="#{msgs['topmenu.processes']}"/>
             </h:outputLink>
-            <h:outputLink styleClass="headermenu" value="tasks.jsf" style="#{view.viewId == '/sa/tasks.xhtml' ? 'font-weight:bold' : ''}">
+            <h:outputLink styleClass="headermenu" value="tasks.jsf" style="#{view.viewId == '/app/tasks.xhtml' ? 'font-weight:bold' : ''}">
                 <h:outputText value="#{msgs['topmenu.tasks']}"/>
             </h:outputLink>
             <ga:checkRole roles="#{access.role.tasks.listAll}">
-	            <h:outputLink styleClass="headermenu" value="tasks_all.jsf" style="#{view.viewId == '/sa/tasks_all.xhtml' ? 'font-weight:bold' : ''}">
+	            <h:outputLink styleClass="headermenu" value="tasks_all.jsf" style="#{view.viewId == '/app/tasks_all.xhtml' ? 'font-weight:bold' : ''}">
 	                <h:outputText value="#{msgs['topmenu.tasks_all']}"/>
 	            </h:outputLink>
 	        </ga:checkRole>
             
             
             <ga:checkRole roles="#{access.role.jobs}">
-                <h:outputLink styleClass="headermenu" value="jobs.jsf" style="#{view.viewId == '/sa/jobs.xhtml' ? 'font-weight:bold' : ''}">
+                <h:outputLink styleClass="headermenu" value="jobs.jsf" style="#{view.viewId == '/app/jobs.xhtml' ? 'font-weight:bold' : ''}">
                     <h:outputText value="#{msgs['topmenu.jobs']}"/>
                 </h:outputLink>
             </ga:checkRole>
             <ga:checkRole roles="#{access.role.identities}">
-                <h:outputLink styleClass="headermenu" value="identities.jsf" style="#{view.viewId == '/sa/identities.xhtml' ? 'font-weight:bold' : ''}">
+                <h:outputLink styleClass="headermenu" value="identities.jsf" style="#{view.viewId == '/app/identities.xhtml' ? 'font-weight:bold' : ''}">
                     <h:outputText value="#{msgs['topmenu.identities']}"/>
                 </h:outputLink>
             </ga:checkRole>

Modified: projects/jsf-console/trunk/console/src/main/webapp/app/t_processinstances.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/sa/t_processinstances.xhtml	2008-12-16 14:24:23 UTC (rev 3401)
+++ projects/jsf-console/trunk/console/src/main/webapp/app/t_processinstances.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
@@ -65,11 +65,11 @@
                    onkeypress="keypress(event,'apply')"/>
         </td>
         <td style="white-space:nowrap;">
-            <h:selectBooleanCheckbox id="running_i" value="#{filter_running == true}"/>
+            <h:selectBooleanCheckbox id="running_i" value="#{filter_running}"/>
             <gs:label forId="running_i" styleClass="statusRunning">R</gs:label>
-            <h:selectBooleanCheckbox id="suspended_i" value="#{filter_suspended == true}"/>
+            <h:selectBooleanCheckbox id="suspended_i" value="#{filter_suspended}"/>
             <gs:label forId="suspended_i" styleClass="statusSuspended">S</gs:label>
-            <h:selectBooleanCheckbox id="ended_i" value="#{filter_ended == true}"/>
+            <h:selectBooleanCheckbox id="ended_i" value="#{filter_ended}"/>
             <gs:label forId="ended_i" styleClass="statusEnded">E</gs:label>
         </td>
         <td/>

Modified: projects/jsf-console/trunk/console/src/main/webapp/app/t_tasks.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/sa/t_tasks.xhtml	2008-12-16 14:24:23 UTC (rev 3401)
+++ projects/jsf-console/trunk/console/src/main/webapp/app/t_tasks.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
@@ -69,13 +69,13 @@
                 <input name="actor_i" type="text" style="width:80px;" value="#{task_filter_actor}" onkeypress="keypress(event,'apply')"/>
             </td>
             <td style="width:120px;white-space:nowrap">
-                <h:selectBooleanCheckbox id="task_notstarted_i" value="#{task_filter_notstarted == true}"/>
+                <h:selectBooleanCheckbox id="task_notstarted_i" value="#{task_filter_notstarted}"/>
                 <gs:label forId="task_notstarted_i" styleClass="statusNotstarted">N</gs:label>
-                <h:selectBooleanCheckbox id="task_running_i" value="#{task_filter_running == true}"/>
+                <h:selectBooleanCheckbox id="task_running_i" value="#{task_filter_running}"/>
                 <gs:label forId="task_running_i" styleClass="statusRunning">R</gs:label>
-                <h:selectBooleanCheckbox id="task_suspended_i" value="#{task_filter_suspended == true}"/>
+                <h:selectBooleanCheckbox id="task_suspended_i" value="#{task_filter_suspended}"/>
                 <gs:label forId="task_suspended_i" styleClass="statusSuspended">S</gs:label>
-                <h:selectBooleanCheckbox id="task_ended_i" value="#{task_filter_ended == true}"/>
+                <h:selectBooleanCheckbox id="task_ended_i" value="#{task_filter_ended}"/>
                 <gs:label forId="task_ended_i" styleClass="statusEnded">E</gs:label>
             </td>
             <td/>

Modified: projects/jsf-console/trunk/console/src/main/webapp/app/tasks.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/sa/tasks.xhtml	2008-12-16 14:24:23 UTC (rev 3401)
+++ projects/jsf-console/trunk/console/src/main/webapp/app/tasks.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
@@ -10,7 +10,7 @@
       xmlns:n="http://gravel.jboss.org/jsf/1.0/navigation"
       xmlns:j4j="http://jbpm.org/jbpm4jsf/core"
 >
-    <ui:composition template="../sa/t_loggedin.xhtml">
+    <ui:composition template="../app/t_loggedin.xhtml">
         <ui:define name="actions">
         
             <ga:responseActions>

Modified: projects/jsf-console/trunk/console/src/main/webapp/app/tasks_all.xhtml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/sa/tasks_all.xhtml	2008-12-16 14:24:23 UTC (rev 3401)
+++ projects/jsf-console/trunk/console/src/main/webapp/app/tasks_all.xhtml	2008-12-17 20:58:23 UTC (rev 3412)
@@ -10,7 +10,7 @@
       xmlns:n="http://gravel.jboss.org/jsf/1.0/navigation"
       xmlns:j4j="http://jbpm.org/jbpm4jsf/core"
 >
-    <ui:composition template="../sa/t_loggedin.xhtml">
+    <ui:composition template="../app/t_loggedin.xhtml">
         <ui:define name="actions">
         
             <ga:responseActions>

Modified: projects/jsf-console/trunk/console/src/main/webapp/index.jsp
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/index.jsp	2008-12-17 20:33:41 UTC (rev 3411)
+++ projects/jsf-console/trunk/console/src/main/webapp/index.jsp	2008-12-17 20:58:23 UTC (rev 3412)
@@ -1,10 +1,11 @@
 <%
   final String queryString = request.getQueryString();
   final String contextRoot = request.getContextPath();
-  final String target = contextRoot + "/sa/processes.jsf";
+  final String target = contextRoot + "/app/processes.jsf";
   if (queryString != null && queryString.length() > 0) {
     response.sendRedirect(target + "?" + queryString);
-  } else {
+  } 
+  else {
     response.sendRedirect(target);
   }
 %>




More information about the jbpm-commits mailing list