inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Added change missing from checkin on Friday

Browse Source 
- Removed type column from dashlets
- Removed unrequired JBPM filters from web.xml
- Moved jbpm console link from dashlet to admin console
- Removed workflows temporary dashlet

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3624 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2006-08-29 11:14:45 +00:00
parent 8b0b4cb878
commit 4bb0cb5b71
8 changed files with 14 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/web-client-config.xml
View File

@@ -194,8 +194,6 @@
<dashlet id="workitems-completed" label-id="my_workitems_completed_title" description-id="my_workitems_completed_desc"
jsp="/jsp/workflow/workitems-completed-dashlet.jsp" allow-narrow="false" />
<!-- TEMP! -->
<dashlet id="process-list" label="Workflows" description="List of workflows you may start"
jsp="/jbpm/process_list.jsp" allow-narrow="true" />
<dashlet id="my-docs-template" label="My Documents"
description="My Documents Template Page"
jsp="/jsp/dashboards/dashlets/my-docs.jsp" allow-narrow="true" />

2
source/java/org/alfresco/web/ui/repo/component/UIWorkflowSummary.java
View File

@@ -30,7 +30,7 @@ public class UIWorkflowSummary extends SelfRenderingComponent
@Override
public String getFamily()
{
return "org.alfresco.faces.Workflow";
return "org.alfresco.faces.WorkflowSummary";
}
@Override

2
source/java/org/alfresco/web/ui/repo/tag/WorkflowSummaryTag.java
View File

@@ -32,7 +32,7 @@ public class WorkflowSummaryTag extends HtmlComponentTag
*/
public String getComponentType()
{
return "org.alfresco.faces.Workflow";
return "org.alfresco.faces.WorkflowSummary";
}
/**

4
source/web/WEB-INF/faces-config-repo.xml
View File

@@ -144,6 +144,10 @@
<component-class>org.alfresco.web.ui.repo.component.UIUserGroupPicker</component-class>
</component>
<component>
<component-type>org.alfresco.faces.WorkflowSummary</component-type>
<component-class>org.alfresco.web.ui.repo.component.UIWorkflowSummary</component-class>
</component>
<!-- ==================== CONVERTERS ==================== -->
<component>

77
source/web/WEB-INF/web.xml
View File

@@ -94,24 +94,14 @@
<!-- -->
<!-- JBPM START -->
<!-- Used by the JPBM console for monitoring in-flight workflows -->
<!-- TODO: Remove this block - just a temporary placement for testing -->
<!-- -->
<filter>
<filter-name>LogFilter</filter-name>
<filter-class>org.jbpm.webapp.filter.LogFilter</filter-class>
</filter>
<filter>
<filter-name>JbpmContextFilter</filter-name>
<filter-class>org.jbpm.webapp.filter.JbpmContextFilter</filter-class>
<!-- <filter-class>org.jbpm.webapp.filter.JbpmContextFilter</filter-class> -->
</filter>
<!--
<filter>
<filter-name>JbpmAuthenticationFilter</filter-name>
<filter-class>org.jbpm.webapp.filter.AuthenticationFilter</filter-class>
</filter>
-->
<!-- -->
<!-- JBPM END -->
@@ -138,31 +128,14 @@
<!-- -->
<!-- JBPM START -->
<!-- Used by the JPBM console for monitoring in-flight workflows -->
<!-- TODO: Remove this block - just a temporary placement for testing -->
<!-- -->
<filter-mapping>
<filter-name>LogFilter</filter-name>
<url-pattern>/faces/jbpm/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>JbpmContextFilter</filter-name>
<url-pattern>/faces/jbpm/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>JbpmContextFilter</filter-name>
<url-pattern>/processimage</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>JbpmContextFilter</filter-name>
<url-pattern>/faces/jsp/dashboards/*</url-pattern>
</filter-mapping>
<!--
<filter-mapping>
<filter-name>JbpmAuthenticationFilter</filter-name>
<url-pattern>/faces/jbpm/*</url-pattern>
</filter-mapping>
-->
<!-- -->
<!-- JBPM END -->
@@ -242,30 +215,6 @@
<servlet-class>org.alfresco.web.app.servlet.JBPMDeployProcessServlet</servlet-class>
</servlet>
<!-- -->
<!-- JBPM START -->
<!-- TODO: Remove this block - just a temporary placement for testing -->
<!-- -->
<!--
<servlet>
<servlet-name>JbpmThreadsServlet</servlet-name>
<servlet-class>org.jbpm.web.JbpmThreadsServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
-->
<!-- jBPM FileServlet -->
<servlet>
<servlet-name>ProcessImageServlet</servlet-name>
<servlet-class>org.jbpm.webapp.servlet.ProcessImageServlet</servlet-class>
</servlet>
<!-- -->
<!-- JBPM END -->
<!-- -->
<servlet-mapping>
<servlet-name>Faces Servlet</servlet-name>
<url-pattern>/faces/*</url-pattern>
@@ -316,28 +265,6 @@
<url-pattern>/jbpm/deployprocess</url-pattern>
</servlet-mapping>
<!-- -->
<!-- JBPM START -->
<!-- TODO: Remove this block - just a temporary placement for testing -->
<!-- -->
<!--
<servlet-mapping>
<servlet-name>JbpmThreadsServlet</servlet-name>
<url-pattern>/threads</url-pattern>
</servlet-mapping>
-->
<!-- jBPM FileServlet -->
<servlet-mapping>
<servlet-name>ProcessImageServlet</servlet-name>
<url-pattern>/processimage</url-pattern>
</servlet-mapping>
<!-- -->
<!-- JBPM END -->
<!-- -->
<session-config>
<session-timeout>60</session-timeout>
</session-config>

6
source/web/jsp/admin/admin-console.jsp
View File

@@ -126,6 +126,12 @@
<tr>
<td><a:actionLink value="#{msg.node_browser}" image="/images/icons/node_browser.gif" action="dialog:showNodeBrowser" styleClass="title" /></td>
</tr>
<tr>
<td>
<img src="<%=request.getContextPath()%>/images/icons/workflow.gif" align="absmiddle" />
<h:outputLink value="/alfresco/faces/jbpm/home.jsp" styleClass="title"><h:outputText value="jBPM Console" /></h:outputLink>
</td>
</tr>
</table>
<% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "ballongrey"); %>

8
source/web/jsp/workflow/workitems-completed-dashlet.jsp
View File

@@ -27,14 +27,6 @@
<h:outputText value="#{r['bpm:taskId']}" />
</a:column>
<%-- Type column --%>
<a:column style="text-align:left">
<f:facet name="header">
<a:sortLink label="#{msg.type}" value="type" styleClass="header"/>
</f:facet>
<h:outputText value="#{r.type}" />
</a:column>
<%-- Source column --%>
<a:column style="text-align:left">
<f:facet name="header">

8
source/web/jsp/workflow/workitems-todo-dashlet.jsp
View File

@@ -35,14 +35,6 @@
<h:outputText value="#{r['bpm:taskId']}" />
</a:column>
<%-- Type column --%>
<a:column style="text-align:left">
<f:facet name="header">
<a:sortLink label="#{msg.type}" value="type" styleClass="header"/>
</f:facet>
<h:outputText value="#{r.type}" />
</a:column>
<%-- Source column --%>
<a:column style="text-align:left">
<f:facet name="header">