Merged V1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3987 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4133 .
   Removed LicenseComponent reference from projects\repository\source\java\org\alfresco\repo\descriptor\DescriptorServiceImpl.java


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

source/java/org/alfresco/web/ui/repo/component/UIContentSelector.java

@@ -30,7 +30,9 @@ import javax.faces.el.ValueBinding;
 import org.alfresco.model.ContentModel;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.search.LimitBy;
 import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.SearchParameters;
 import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
@@ -353,15 +355,30 @@ public class UIContentSelector extends UIInput
          
          query.append(":*" + safeContains + "*");
       }
+
+      int maxResults = Application.getClientConfig(context).getSelectorsSearchMaxResults();
       
       if (logger.isDebugEnabled())
+      {
          logger.debug("Query: " + query.toString());
+         logger.debug("Max results size: " + maxResults);
+      }
+      
+      // setup search parameters, including limiting the results
+      SearchParameters searchParams = new SearchParameters();
+      searchParams.addStore(Repository.getStoreRef());
+      searchParams.setLanguage(SearchService.LANGUAGE_LUCENE);
+      searchParams.setQuery(query.toString());
+      if (maxResults > 0)
+      {
+         searchParams.setLimit(maxResults);
+         searchParams.setLimitBy(LimitBy.FINAL_SIZE);
+      }
       
       ResultSet results = null;
       try
       {
-         results = Repository.getServiceRegistry(context).getSearchService().query(
-               Repository.getStoreRef(), SearchService.LANGUAGE_LUCENE, query.toString());
+         results = Repository.getServiceRegistry(context).getSearchService().query(searchParams);
          this.availableOptions = results.getNodeRefs();
       }
       finally

source/java/org/alfresco/web/ui/repo/component/property/BaseAssociationEditor.java

@@ -36,6 +36,7 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.service.cmr.dictionary.AssociationDefinition;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.search.LimitBy;
 import org.alfresco.service.cmr.search.ResultSet;
 import org.alfresco.service.cmr.search.SearchParameters;
 import org.alfresco.service.cmr.search.SearchService;
@@ -914,13 +915,23 @@ public abstract class BaseAssociationEditor extends UIInput
             }
          }
          
+         int maxResults = Application.getClientConfig(context).getSelectorsSearchMaxResults();
+         
          if (logger.isDebugEnabled())
+         {
             logger.debug("Query: " + query.toString());
+            logger.debug("Max results size: " + maxResults);
+         }
          
          SearchParameters searchParams = new SearchParameters();
          searchParams.addStore(Repository.getStoreRef());
          searchParams.setLanguage(SearchService.LANGUAGE_LUCENE);
          searchParams.setQuery(query.toString());
+         if (maxResults > 0)
+         {
+            searchParams.setLimit(maxResults);
+            searchParams.setLimitBy(LimitBy.FINAL_SIZE);
+         }
          
          if (type.equals(ContentModel.TYPE_PERSON.toString()))
          {

source/java/org/alfresco/web/ui/repo/component/property/UIProperty.java

@@ -176,10 +176,11 @@ public class UIProperty extends PropertySheetItem
       // if we're in edit mode ensure that we don't allow editing of system properties or scenarios we don't support
       if (propSheet.inEditMode())
       {
-         // if we are trying to edit a NodeRef or Path property type set it to read-only as 
-         // these are internal properties that shouldn't be edited.
+         // if we are trying to edit a system property type set it to read-only as  these are internal 
+         // properties that shouldn't be edited.
          if (typeName.equals(DataTypeDefinition.NODE_REF) || typeName.equals(DataTypeDefinition.PATH) || 
-             typeName.equals(DataTypeDefinition.CONTENT))
+             typeName.equals(DataTypeDefinition.CONTENT) || typeName.equals(DataTypeDefinition.QNAME) ||
+             typeName.equals(DataTypeDefinition.CHILD_ASSOC_REF) || typeName.equals(DataTypeDefinition.ASSOC_REF))
          {
             logger.warn("Setting property " + propDef.getName().toString() + " to read-only as it can not be edited");
             control.getAttributes().put("disabled", Boolean.TRUE);

source/java/org/alfresco/web/ui/repo/tag/JBPMProcessImageTag.java

@@ -0,0 +1,254 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.alfresco.web.ui.repo.tag;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.dom4j.DocumentException;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+import org.dom4j.XPath;
+import org.dom4j.xpath.DefaultXPath;
+import org.jbpm.JbpmContext;
+import org.jbpm.file.def.FileDefinition;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.Token;
+import org.jbpm.taskmgmt.exe.TaskInstance;
+
+
+//
+//
+// TODO: DC - Tidy up
+//
+//
+
+
+
+
+public class JBPMProcessImageTag extends TagSupport {
+
+  private static final long serialVersionUID = 1L;
+  private long taskInstanceId = -1;
+  private long tokenInstanceId = -1;
+  
+  private byte[] gpdBytes = null;
+  private byte[] imageBytes = null;
+  private Token currentToken = null;
+  private ProcessDefinition processDefinition = null;
+  
+  static String currentTokenColor = "red";
+  static String childTokenColor = "blue";
+  static String tokenNameColor = "blue";
+  
+
+  public void release() {
+    taskInstanceId = -1;
+    gpdBytes = null;
+    imageBytes = null;
+    currentToken = null;
+  }
+
+  public int doEndTag() throws JspException {
+    try {
+      initialize();
+      retrieveByteArrays();
+      if (gpdBytes != null && imageBytes != null) {
+        writeTable();
+      }
+    } catch (IOException e) {
+      e.printStackTrace();
+      throw new JspException("table couldn't be displayed", e);
+    } catch (DocumentException e) {
+      e.printStackTrace();
+      throw new JspException("table couldn't be displayed", e);
+    }
+    release();
+    return EVAL_PAGE;
+  }
+
+  private void retrieveByteArrays() {
+    try {
+      FileDefinition fileDefinition = processDefinition.getFileDefinition();
+      gpdBytes = fileDefinition.getBytes("gpd.xml");
+      imageBytes = fileDefinition.getBytes("processimage.jpg");
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+  }
+
+  private void writeTable() throws IOException, DocumentException {
+
+    int borderWidth = 4;
+    Element rootDiagramElement = DocumentHelper.parseText(new String(gpdBytes)).getRootElement();
+    int[] boxConstraint;
+    int[] imageDimension = extractImageDimension(rootDiagramElement);
+    String imageLink = "/alfresco/processimage?definitionId=" + processDefinition.getId();
+    JspWriter jspOut = pageContext.getOut();
+
+    if (tokenInstanceId > 0) {
+
+        List allTokens = new ArrayList();
+        walkTokens(currentToken, allTokens);
+        
+    	jspOut.println("<div style='position:relative; background-image:url(" + imageLink + "); width: " + imageDimension[0] + "px; height: " + imageDimension[1] + "px;'>");
+
+        for (int i = 0; i < allTokens.size(); i++)
+        {
+            Token token = (Token) allTokens.get(i);
+
+          //check how many tokens are on teh same level (= having the same parent)
+          int offset = i;
+          if(i > 0) {
+            while(offset > 0 && ((Token) allTokens.get(offset - 1)).getParent().equals(token.getParent())) {
+              offset--;
+            }
+          }
+            boxConstraint = extractBoxConstraint(rootDiagramElement, token);
+
+            //Adjust for borders
+            //boxConstraint[2]-=borderWidth*2;
+            //boxConstraint[3]-=borderWidth*2;
+
+        	jspOut.println("<div style='position:absolute; left: "+ boxConstraint[0] +"px; top: "+ boxConstraint[1] +"px; ");
+
+            if (i == (allTokens.size() - 1)) {
+            	jspOut.println("border: " + currentTokenColor);
+            }
+            else {            	
+    			jspOut.println("border: " + childTokenColor);
+            }
+            
+            jspOut.println(" " + borderWidth + "px groove; "+
+            			"width: "+ boxConstraint[2] +"px; height: "+ boxConstraint[3] +"px;'>");
+			
+            if(token.getName()!=null)
+            {
+                 jspOut.println("<span style='color:" + tokenNameColor + ";font-style:italic;position:absolute;left:"+ (boxConstraint[2] + 10) +"px;top:" +((i - offset) * 20) +";'>&nbsp;" + token.getName() +"</span>");
+            }
+
+            jspOut.println("</div>");
+        }
+        jspOut.println("</div>");    	
+    }
+    else
+    {
+    	boxConstraint = extractBoxConstraint(rootDiagramElement);
+    	
+	    jspOut.println("<table border=0 cellspacing=0 cellpadding=0 width=" + imageDimension[0] + " height=" + imageDimension[1] + ">");
+	    jspOut.println("  <tr>");
+	    jspOut.println("    <td width=" + imageDimension[0] + " height=" + imageDimension[1] + " style=\"background-image:url(" + imageLink + ")\" valign=top>");
+	    jspOut.println("      <table border=0 cellspacing=0 cellpadding=0>");
+	    jspOut.println("        <tr>");
+	    jspOut.println("          <td width=" + (boxConstraint[0] - borderWidth) + " height=" + (boxConstraint[1] - borderWidth)
+	            + " style=\"background-color:transparent;\"></td>");
+	    jspOut.println("        </tr>");
+	    jspOut.println("        <tr>");
+	    jspOut.println("          <td style=\"background-color:transparent;\"></td>");
+	    jspOut.println("          <td style=\"border-color:" + currentTokenColor + "; border-width:" + borderWidth + "px; border-style:groove; background-color:transparent;\" width="
+	            + boxConstraint[2] + " height=" + (boxConstraint[3] + (2 * borderWidth)) + ">&nbsp;</td>");
+	    jspOut.println("        </tr>");
+	    jspOut.println("      </table>");
+	    jspOut.println("    </td>");
+	    jspOut.println("  </tr>");
+	    jspOut.println("</table>");
+    }
+  }
+
+  private int[] extractBoxConstraint(Element root) {
+    int[] result = new int[4];
+    String nodeName = currentToken.getNode().getName();
+    XPath xPath = new DefaultXPath("//node[@name='" + nodeName + "']");
+    Element node = (Element) xPath.selectSingleNode(root);
+    result[0] = Integer.valueOf(node.attribute("x").getValue()).intValue();
+    result[1] = Integer.valueOf(node.attribute("y").getValue()).intValue();
+    result[2] = Integer.valueOf(node.attribute("width").getValue()).intValue();
+    result[3] = Integer.valueOf(node.attribute("height").getValue()).intValue();
+    return result;
+  }
+
+  private int[] extractBoxConstraint(Element root, Token token) {
+	    int[] result = new int[4];
+	    String nodeName = token.getNode().getName();
+	    XPath xPath = new DefaultXPath("//node[@name='" + nodeName + "']");
+	    Element node = (Element) xPath.selectSingleNode(root);
+	    result[0] = Integer.valueOf(node.attribute("x").getValue()).intValue();
+	    result[1] = Integer.valueOf(node.attribute("y").getValue()).intValue();
+	    result[2] = Integer.valueOf(node.attribute("width").getValue()).intValue();
+	    result[3] = Integer.valueOf(node.attribute("height").getValue()).intValue();
+	    return result;
+	  }
+  
+  private int[] extractImageDimension(Element root) {
+    int[] result = new int[2];
+    result[0] = Integer.valueOf(root.attribute("width").getValue()).intValue();
+    result[1] = Integer.valueOf(root.attribute("height").getValue()).intValue();
+    return result;
+  }
+
+  private void initialize() {
+    JbpmContext jbpmContext = JbpmContext.getCurrentJbpmContext(); 
+    if (this.taskInstanceId > 0) {
+    	TaskInstance taskInstance = jbpmContext.getTaskMgmtSession().loadTaskInstance(taskInstanceId);
+    	currentToken = taskInstance.getToken();
+    }
+    else
+    {
+    	if (this.tokenInstanceId > 0) 
+    		currentToken = jbpmContext.getGraphSession().loadToken(this.tokenInstanceId);
+    }
+    processDefinition = currentToken.getProcessInstance().getProcessDefinition();
+  }
+
+  private void walkTokens(Token parent, List allTokens)
+  {
+      Map children = parent.getChildren();
+      if(children != null && children.size() > 0)
+      {
+          Collection childTokens = children.values();
+          for (Iterator iterator = childTokens.iterator(); iterator.hasNext();)
+          {
+              Token child = (Token) iterator.next();
+              walkTokens(child,  allTokens);
+          }
+      }
+
+      allTokens.add(parent);
+  }
+
+  public void setTask(long id) {
+    this.taskInstanceId = id;
+  }
+
+  public void setToken(long id) {
+	this.tokenInstanceId = id;  
+  }
+  
+}