- Fix WCM-205

- Add help for 'show my pooled' to Workflow Interpreter
- Remove unnecessary code added earlier for pooled task support

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4786 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/bean/wcm/AVMWorkflowUtil.java

@@ -35,7 +35,9 @@ import org.alfresco.model.WCMAppModel;
 import org.alfresco.repo.avm.AVMNodeConverter;
 import org.alfresco.repo.avm.wf.AVMSubmittedAspect;
 import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.security.authority.AuthorityDAO;
 import org.alfresco.repo.workflow.WorkflowModel;
+import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
 import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.avmsync.AVMDifference;
@@ -45,6 +47,8 @@ import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.cmr.workflow.WorkflowDefinition;
 import org.alfresco.service.cmr.workflow.WorkflowPath;
 import org.alfresco.service.cmr.workflow.WorkflowService;
@@ -105,6 +109,13 @@ public class AVMWorkflowUtil extends WorkflowUtil
       final AVMNodeDescriptor packageDesc = avmService.lookup(-1, packagesPath);
       final NodeRef packageNodeRef = workflowService.createPackage(AVMNodeConverter.ToNodeRef(-1, packageDesc.getPath()));
       nodeService.setProperty(packageNodeRef, WorkflowModel.PROP_IS_SYSTEM_PACKAGE, true);
+
+      // apply global permission to workflow package
+      // TODO: Determine appropriate permissions
+      final ServiceRegistry services = Repository.getServiceRegistry(FacesContext.getCurrentInstance());
+      final PermissionService permissionService = services.getPermissionService();
+      permissionService.setPermission(packageNodeRef, PermissionService.ALL_AUTHORITIES, PermissionService.ALL_PERMISSIONS, true);
+      
       return packageNodeRef;
    }
    

source/web/WEB-INF/jbpm.tld

@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE taglib PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" 
-    "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
-<taglib>
-  <tlibversion>1.0</tlibversion>
-  <jspversion>1.1</jspversion>
-  <shortname>jBPM tags</shortname>
-  <info>jBPM tags</info>
-
-  <!-- PROCESS IMAGE -->
-  <tag>
-    <name>processimage</name>
-    <tagclass>org.jbpm.webapp.tag.ProcessImageTag</tagclass>
-    <bodycontent>empty</bodycontent>
-    <attribute> 
-    	<name>task</name>       
-    	<required>true</required> 
-    	<rtexprvalue>true</rtexprvalue> 
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>processimageToken</name>
-    <tagclass>org.jbpm.webapp.tag.ProcessImageTag</tagclass>
-    <bodycontent>empty</bodycontent>
-    <attribute> 
-    	<name>token</name>       
-    	<required>true</required> 
-    	<rtexprvalue>true</rtexprvalue> 
-    </attribute>
-  </tag>
-
-</taglib>