Merged V1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3965 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3985 .
   svn revert root\projects\repository\config\alfresco\version.properties


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

config/alfresco/web-client-config-actions.xml

@@ -385,7 +385,7 @@
          <!-- Create Advanced Space Wizard -->
          <action id="create_space_wizard">
             <permissions>
-               <permission allow="true">CreateChildren</permission>
+               <permission allow="true">ChangePermissions</permission>
             </permissions>
             <label-id>advanced_space_wizard</label-id>
             <image>/images/icons/create_space.gif</image>

source/java/org/alfresco/web/app/servlet/JBPMDeployProcessServlet.java

@@ -26,10 +26,11 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.alfresco.repo.content.MimetypeMap;
-import org.alfresco.repo.workflow.WorkflowComponent;
+import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.workflow.WorkflowDefinition;
 import org.alfresco.service.cmr.workflow.WorkflowDeployment;
 import org.alfresco.service.cmr.workflow.WorkflowException;
+import org.alfresco.service.cmr.workflow.WorkflowService;
 import org.apache.commons.fileupload.DiskFileUpload;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileUpload;
@@ -117,10 +118,9 @@ public class JBPMDeployProcessServlet extends HttpServlet
      */
     private WorkflowDefinition deployArchive(InputStream deploymentArchive)
     {
-        // NOTE: retrieve jbpm engine directly as this servlet only serves JBPM process designer deployments
         WebApplicationContext wc = WebApplicationContextUtils.getRequiredWebApplicationContext(getServletContext());
-        WorkflowComponent jbpmEngine = (WorkflowComponent)wc.getBean("jbpm_engine");
+        WorkflowService workflowService = (WorkflowService)wc.getBean(ServiceRegistry.WORKFLOW_SERVICE.getLocalName());
-        WorkflowDeployment deployment = jbpmEngine.deployDefinition(deploymentArchive, MimetypeMap.MIMETYPE_ZIP); 
+        WorkflowDeployment deployment = workflowService.deployDefinition("jbpm", deploymentArchive, MimetypeMap.MIMETYPE_ZIP); 
         return deployment.definition; 
     }
 

source/web/jsp/workflow/start-workflow-wizard/workflow-options.jsp

@@ -58,7 +58,7 @@
                initialSortColumn="name" initialSortDescending="true">
       
       <%-- Name column --%>
-      <a:column id="col1" primary="true" width="200" style="padding:2px; text-align:left">
+      <a:column id="col1" primary="true" width="200" style="padding:2px;text-align:left">
          <f:facet name="header">
             <a:sortLink id="col1-sort" label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
          </f:facet>
@@ -70,7 +70,7 @@
       </a:column>
       
       <%-- Description column --%>
-      <a:column id="col2" style="text-align:left">
+      <a:column id="col2" style="padding:2px;text-align:left">
          <f:facet name="header">
             <a:sortLink id="col2-sort" label="#{msg.description}" value="description" styleClass="header"/>
          </f:facet>
@@ -78,7 +78,7 @@
       </a:column>
       
       <%-- Path column --%>
-      <a:column id="col3" style="text-align:left">
+      <a:column id="col3" style="padding:2px;text-align:left">
          <f:facet name="header">
             <a:sortLink id="col3-sort" label="#{msg.path}" value="path" styleClass="header"/>
          </f:facet>
@@ -86,7 +86,7 @@
       </a:column>
       
       <%-- Created Date column --%>
-      <a:column id="col4" style="text-align:left">
+      <a:column id="col4" style="padding:2px;text-align:left">
          <f:facet name="header">
             <a:sortLink id="col4-sort" label="#{msg.created}" value="created" styleClass="header"/>
          </f:facet>
@@ -96,7 +96,7 @@
       </a:column>
       
       <%-- Modified Date column --%>
-      <a:column id="col5" style="text-align:left">
+      <a:column id="col5" style="padding:2px;text-align:left">
          <f:facet name="header">
             <a:sortLink id="col5-sort" label="#{msg.modified}" value="modified" styleClass="header"/>
          </f:facet>
@@ -106,7 +106,7 @@
       </a:column>
                         
       <%-- Actions column --%>
-      <a:column id="col6" actions="true" style="text-align:left">
+      <a:column id="col6" actions="true" style="padding:2px;text-align:left">
          <f:facet name="header">
             <h:outputText id="col6-txt" value="#{msg.actions}"/>
          </f:facet>