Merged V2.9 to HEAD

10586: Merged V2.2 to V2.9
      9883: Fix for https://issues.alfresco.com/jira/browse/ETWOTWO-561
      9893: Gave some more time to wait for the threads to finish (QNameDAOTest)
      9955: Added trace logging of calls that possibly cause failures during session flushing
      9956: Part fix ETWOTWO570: RetryingTransactionAdvice needs to use RetryingTransactionHelper
      9958: Fixed ETWOTWO-570: AVM transaction interceptors fail if methods are incorrectly declared
      9973: More missing transaction declarations for AttributeService
      9977: Fixed unit test to rollback properly after expected txn failure
      9978: Fix for ETWOTWO-440: Error : 500: Failed to execute method NodeInfoBean.sendNodeInfo
      9986: LinkValidationService missing txn declaration for onBootstrap
   10588: Merged V2.2 to V2.9
      9898: Fixed handling of cm:name on root nodes
      9900: Empty property sets are allowed
   10589: Merged V2.2 to V2.9
      9965: Fixed unit test to inject 'nodeService' and not 'NodeService'.
      10311: getWebProjectUserRole - change log level from info to debug
      10329: Fix missing and mis-spelt transaction declarations
      10343: Fix for ETWOTWO-32
      10346: Build Fix
      10358: Fix for ETWOTWO-621
      10362: Fix for ETWOTWO-518
      10371: QNameDAO cache doesn't blow up if cache entry is invalid
      10538: Fix for minor XSS issue identified in ETWOTWO-657 item 3
   10678: Merged V2.2 to V2.9
      10205: Fix for ETWOTWO-48: Cancelled import of war into a Web project and Web Project became unusable
      10206: Fix for ETWOTWO-181: Deletion of checked out document


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

source/java/org/alfresco/web/bean/ajax/NodeInfoBean.java

@@ -33,12 +33,14 @@ import java.util.Map;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 
-import org.alfresco.repo.template.CropContentMethod;
+import org.alfresco.repo.content.transform.TransformerInfoException;
 import org.alfresco.repo.template.TemplateNode;
 import org.alfresco.repo.web.scripts.FileTypeImageUtils;
+import org.alfresco.service.cmr.repository.ContentIOException;
 import org.alfresco.service.cmr.repository.FileTypeImageSize;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.TemplateException;
 import org.alfresco.service.cmr.repository.TemplateImageResolver;
 import org.alfresco.web.app.servlet.BaseTemplateContentServlet;
 import org.alfresco.web.bean.repository.Repository;
@@ -89,9 +91,32 @@ public class NodeInfoBean implements Serializable
             return;
          }
       }
+      try
+      {
           Repository.getServiceRegistry(context).getTemplateService().processTemplate(
             "/alfresco/templates/client/" + strTemplate, getModel(nodeRef, requestMap), out);
       }
+      catch (TemplateException ex)
+      {
+         // Try to catch TransformerInfoException to display it in NodeInfo pane.
+         // Fix bug reported in https://issues.alfresco.com/jira/browse/ETWOTWO-440
+         
+         logger.error(ex);
+         Throwable cause = ex.getCause();
+         while (cause != null)
+         {
+            logger.error(cause);
+            cause = cause.getCause();
+            if (cause != null && cause instanceof TransformerInfoException)
+            {
+               out.write("<tr><td colspan=\"2\"><span class='errorMessage'>" + cause.getMessage() + "</span></td></tr>");
+               return;
+            }
+         }
+         
+         throw ex;
+      }
+   }
 
    
    // ------------------------------------------------------------------------------
@@ -118,7 +143,7 @@ public class NodeInfoBean implements Serializable
    // ------------------------------------------------------------------------------
    // Helper methods
    
-   private Map<String, Object> getModel(NodeRef nodeRef, Map<String, String> requestMap)
+   private Map<String, Object> getModel(NodeRef nodeRef, Map<String, String> requestMap) throws ContentIOException
    {
       FacesContext context = FacesContext.getCurrentInstance();
       Map<String, Object> model = new HashMap<String, Object>(8, 1.0f);

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

@@ -392,9 +392,9 @@ public class WebProject implements Serializable
 	          }
 	      }
 	      
-		  if (LOGGER.isInfoEnabled())
+		  if (LOGGER.isDebugEnabled())
 		  {
-			  LOGGER.info("getWebProjectUserRole: "+currentUser.getUserName()+" "+userrole+" in "+(System.currentTimeMillis()-start)+" ms");
+			  LOGGER.debug("getWebProjectUserRole: "+currentUser.getUserName()+" "+userrole+" in "+(System.currentTimeMillis()-start)+" ms");
 		  }
 		  
 	      return userrole;

source/java/org/alfresco/web/ui/common/component/UIGenericPicker.java

@@ -322,7 +322,7 @@ public class UIGenericPicker extends UICommand
          out.write("<input name='");
          out.write(clientId + FIELD_CONTAINS);
          out.write("' type='text' maxlength='256' style='width:120px' value=\"");
-         out.write(Utils.replace(this.contains, "\"", "&quot;"));
+         out.write(Utils.encode(this.contains));
          out.write("\">&nbsp;");
       }
       
@@ -341,12 +341,14 @@ public class UIGenericPicker extends UICommand
          String resultsMsg;
          if (getShowFilter() == false)
          {
-            resultsMsg = MessageFormat.format(bundle.getString(MSG_RESULTS1), new Object[] {this.contains});
+            resultsMsg = MessageFormat.format(bundle.getString(MSG_RESULTS1),
+                  new Object[] {Utils.encode(this.contains)});
          }
          else
          {
             String filterMsg = this.filters[this.filterIndex].getLabel();
-            resultsMsg = MessageFormat.format(bundle.getString(MSG_RESULTS2), new Object[] {this.contains, filterMsg});
+            resultsMsg = MessageFormat.format(bundle.getString(MSG_RESULTS2),
+                  new Object[] {Utils.encode(this.contains), filterMsg});
          }
          out.write(resultsMsg);
          out.write("&nbsp;");

source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java

@@ -814,7 +814,7 @@ public class UIUserSandboxes extends SelfRenderingComponent implements Serializa
                // build node context required for actions
                AVMNode avmNode = new AVMNode(node);
                String assetPath = sourcePath.substring(rootPathIndex);
-               String previewUrl = AVMUtil.getPreviewURI(userStore, assetPath);
+               String previewUrl = AVMUtil.getPreviewURI(userStore, '/' + JNDIConstants.DIR_DEFAULT_WWW + '/' + JNDIConstants.DIR_DEFAULT_APPBASE + assetPath);
                avmNode.getProperties().put("previewUrl", previewUrl);
                
                // size of files