Merged V3.0 to HEAD

11982: Fix for ETHREEOH-906 - Writing the TICKET value directly to the page during template processing is a potential XSS security hole.
   11983: Added back .html suffix to plain HTML form upload api call - added code comment to explain why it's there.
   11984: Added debug/info level logging to Invite process.
   11985: ETHREEOH-184: thumbnail assocs do not double up on check-in and thumbnail updates are done in one action
   11986: Fix for ETHREEOH-905 - missing url encoding step for user password during webscript based login process.
   11995: Unit test fixed up, fallout from runAs merge.
   11998: Part of a fix for ETHREEOH-546 - Cannot save document to the any space for Microsoft Office
   11999: Merged V2.2 to V3.0
      11996: Fix for open Lucene ResultSet memory leaks
   12000: ETHREEOH-692 - It is impossible to login to Alfresco from Microsoft Office add-in using NTLM authentication. ETHREEOH-546 - Cannot save document to the any space for Microsoft Office.
   12001: Paging enabled by default in all Document Libraries

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

source/java/org/alfresco/web/bean/admin/AdminNodeBrowseBean.java

@@ -1009,6 +1009,7 @@ public class AdminNodeBrowseBean implements Serializable
             {
                 rows.setWrappedData(resultSet.getChildAssocRefs());
                 length = resultSet.length();
+                resultSet.close();
             }
         }
 

source/java/org/alfresco/web/bean/groups/AddUsersDialog.java

@@ -220,11 +220,19 @@ public class AddUsersDialog extends BaseDialogBean
                query.append("*\" @").append(NamespaceService.CONTENT_MODEL_PREFIX).append("\\:userName:");
                query.append(term);
                query.append("*");
+               List<NodeRef> nodes;
                ResultSet resultSet = Repository.getServiceRegistry(context).getSearchService().query(
                        Repository.getStoreRef(),
                        SearchService.LANGUAGE_LUCENE,
                        query.toString());
-               List<NodeRef> nodes = resultSet.getNodeRefs();
+               try
+               {
+                  nodes = resultSet.getNodeRefs();
+               }
+               finally
+               {
+                  resultSet.close();
+               }
                
                ArrayList<SelectItem> itemList = new ArrayList<SelectItem>(nodes.size());
                for (NodeRef personRef : nodes)

source/java/org/alfresco/web/bean/users/DeleteUserDialog.java

@@ -37,6 +37,7 @@ import javax.transaction.UserTransaction;
 import org.alfresco.repo.security.authentication.AuthenticationException;
 import org.alfresco.service.cmr.repository.InvalidNodeRefException;
 import org.alfresco.service.cmr.repository.NodeRef;
+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.cmr.security.AuthenticationService;
@@ -154,7 +155,16 @@ public class DeleteUserDialog extends BaseDialogBean
             params.addStore(Repository.getStoreRef());
             params.setQuery(query);
             
-            List<NodeRef> people = this.getSearchService().query(params).getNodeRefs();
+            ResultSet results = this.getSearchService().query(params);
+            List<NodeRef> people;
+            try
+            {
+               people = results.getNodeRefs();
+            }
+            finally
+            {
+               results.close();
+            }
             
             if (logger.isDebugEnabled())
                logger.debug("Found " + people.size() + " users");

source/java/org/alfresco/web/bean/users/UsersDialog.java

@@ -41,6 +41,7 @@ import org.alfresco.repo.search.impl.lucene.QueryParser;
 import org.alfresco.repo.security.authentication.AuthenticationException;
 import org.alfresco.service.cmr.repository.InvalidNodeRefException;
 import org.alfresco.service.cmr.repository.NodeRef;
+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;
@@ -343,7 +344,16 @@ public class UsersDialog extends BaseDialogBean implements IContextListener, Cha
             params.addStore(Repository.getStoreRef());
             params.setQuery(query.toString());
             
-            List<NodeRef> people = properties.getSearchService().query(params).getNodeRefs();
+            ResultSet results = properties.getSearchService().query(params);
+            List<NodeRef> people;
+            try
+            {
+               people = results.getNodeRefs();
+            }
+            finally
+            {
+               results.close();
+            }
             
             if (logger.isDebugEnabled())
                logger.debug("Found " + people.size() + " users");

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

@@ -272,6 +272,8 @@ public class EditFormWizard
        for (WebProject wp: webProjects)
        {
            ResultSet results = searchRenderingEngineTemplateInWebProject(wp, retd.getName());
+           try
+           {
               for (int i=0; i<results.length(); i++)
               {
                   NodeRef webformTemplateNodeRef = results.getNodeRef(i);
@@ -281,6 +283,11 @@ public class EditFormWizard
                      LOGGER.debug(webformNodeRef);
               }
            }
+           finally
+           {
+              results.close();
+           }
+       }
    }
    
    /**
@@ -324,6 +331,8 @@ public class EditFormWizard
 
                ResultSet webforms = getSearchService().query(wp.getNodeRef().getStoreRef(), SearchService.LANGUAGE_LUCENE, query);
                
+               try
+               {
                   props.clear();
                   props.put(WCMAppModel.PROP_BASE_RENDERING_ENGINE_TEMPLATE_NAME, 
                             retd.getName());
@@ -346,6 +355,11 @@ public class EditFormWizard
                       }
                   }
                }
+               finally
+               {
+                  webforms.close();
+               }
+           }
        }
    }
    

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

@@ -492,6 +492,8 @@ public class RegenerateRenditionsWizard
          LOGGER.debug("running query " + query);
       sp.setQuery(query.toString());
       final ResultSet rs = getSearchService().query(sp);
+      try
+      {
          final List<FormInstanceData> result = new ArrayList<FormInstanceData>(rs.length());
          for (final ResultSetRow row : rs)
          {
@@ -499,8 +501,14 @@ public class RegenerateRenditionsWizard
             final String previewAvmPath = AVMUtil.getCorrespondingPathInPreviewStore(avmPath);
             result.add(getFormsService().getFormInstanceData(-1, previewAvmPath));
          }
+         
          return result;
       }
+      finally
+      {
+         rs.close();
+      }
+   }
 
    private List<Rendition> getRelatedRenditions(final WebProject webProject, final RenderingEngineTemplate ret)
    {
@@ -516,6 +524,8 @@ public class RegenerateRenditionsWizard
          LOGGER.debug("running query " + query);
       sp.setQuery(query.toString());
       final ResultSet rs = getSearchService().query(sp);
+      try
+      {
          final List<Rendition> result = new ArrayList<Rendition>(rs.length()); 
          for (final ResultSetRow row : rs)
          {
@@ -525,6 +535,11 @@ public class RegenerateRenditionsWizard
          }
          return result;
       }
+      finally
+      {
+         rs.close();
+      }
+   }
 
    private List<Rendition> regenerateRenditions()
    {
@@ -596,6 +611,8 @@ public class RegenerateRenditionsWizard
          LOGGER.debug("running query " + query);
       sp.setQuery(query.toString());
       final ResultSet rs = getSearchService().query(sp);
+      try
+      {
          if (LOGGER.isDebugEnabled())
             LOGGER.debug("received " + rs.length() + " results");
 
@@ -607,7 +624,7 @@ public class RegenerateRenditionsWizard
             if (this.regenerateScope.equals(REGENERATE_SCOPE_ALL) ||
                   this.regenerateScope.equals(REGENERATE_SCOPE_FORM))
             {
-            final FormInstanceData fid = getFormsService().getFormInstanceData(-1, previewAvmPath);
+               final FormInstanceData fid = this.formsService.getFormInstanceData(-1, previewAvmPath);
                try
                {
                   final List<FormInstanceData.RegenerateResult> regenResults = fid.regenerateRenditions();
@@ -626,7 +643,7 @@ public class RegenerateRenditionsWizard
                      }
                      if (rr.getRendition() != null)
                      {
-                     getAvmLockingService().removeLock(AVMUtil.getStoreId(rr.getRendition().getPath()),
+                        this.avmLockingService.removeLock(AVMUtil.getStoreId(rr.getRendition().getPath()),
                               AVMUtil.getStoreRelativePath(rr.getRendition().getPath()));
                      }
                   }
@@ -640,7 +657,7 @@ public class RegenerateRenditionsWizard
             }
             else
             {
-            final Rendition r = getFormsService().getRendition(-1, previewAvmPath);
+               final Rendition r = this.formsService.getRendition(-1, previewAvmPath);
                try
                {
                   r.regenerate();
@@ -657,4 +674,9 @@ public class RegenerateRenditionsWizard
          }
          return result;
       }
+      finally
+      {
+         rs.close();
+      }
+   }
 }

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

@@ -259,7 +259,15 @@ public class SetPermissionsDialog extends UpdatePermissionsDialog
                 query.append(term);
                 query.append("*");
                 ResultSet resultSet = Repository.getServiceRegistry(context).getSearchService().query(Repository.getStoreRef(), SearchService.LANGUAGE_LUCENE, query.toString());
-                List<NodeRef> nodes = resultSet.getNodeRefs();
+                List<NodeRef> nodes;
+                try
+                {
+                   nodes = resultSet.getNodeRefs();
+                }
+                finally
+                {
+                    resultSet.close();
+                }
                 
                 for (int index = 0; index < nodes.size(); index++)
                 {

source/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java

@@ -392,7 +392,15 @@ public abstract class BaseInviteUsersWizard extends BaseWizardBean
             }
             
             ResultSet resultSet = Repository.getServiceRegistry(context).getSearchService().query(searchParams);
-            List<NodeRef> nodes = resultSet.getNodeRefs();
+            List<NodeRef> nodes;
+            try
+            {
+               nodes = resultSet.getNodeRefs();
+            }
+            finally
+            {
+                resultSet.close();
+            }
             
             // set the maximum users returned flag if appropriate
             if (nodes.size() == maxResults)

source/java/org/alfresco/web/bean/workflow/BaseReassignDialog.java

@@ -128,6 +128,7 @@ public abstract class BaseReassignDialog extends BaseDialogBean
       SelectItem[] items;
       
       UserTransaction tx = null;
+      ResultSet resultSet = null;
       try
       {
          tx = Repository.getUserTransaction(context, true);
@@ -143,7 +144,7 @@ public abstract class BaseReassignDialog extends BaseDialogBean
          query.append("*\" @").append(NamespaceService.CONTENT_MODEL_PREFIX).append("\\:userName:");
          query.append(term);
          query.append("*");
-         ResultSet resultSet = Repository.getServiceRegistry(context).getSearchService().query(
+         resultSet = Repository.getServiceRegistry(context).getSearchService().query(
                  Repository.getStoreRef(), SearchService.LANGUAGE_LUCENE, query.toString());
          List<NodeRef> nodes = resultSet.getNodeRefs();
          
@@ -175,6 +176,13 @@ public abstract class BaseReassignDialog extends BaseDialogBean
          
          items = new SelectItem[0];
       }
+      finally
+      {
+         if (resultSet != null)
+         {
+            resultSet.close();
+         }
+      }
       
       return items;
    }

source/java/org/alfresco/web/forms/FormsService.java

@@ -218,6 +218,8 @@ public final class FormsService
       final ResultSet rs = this.searchService.query(Repository.getStoreRef(),
                                                     SearchService.LANGUAGE_LUCENE,
                                                     query);
+      try
+      {
          if (LOGGER.isDebugEnabled())
             LOGGER.debug("found " + rs.length() + " form definitions");
          final Collection<Form> result = new ArrayList<Form>(rs.length());
@@ -230,6 +232,11 @@ public final class FormsService
          
          return result;
       }
+      finally
+      {
+         rs.close();
+      }
+   }
    
    /** 
     * return the form by name or <tt>null</tt> if not found 
@@ -400,6 +407,8 @@ public final class FormsService
       final ResultSet rs = this.searchService.query(Repository.getStoreRef(),
                                                     SearchService.LANGUAGE_LUCENE,
                                                     query);
+      try
+      {
          if (LOGGER.isDebugEnabled())
          {
             LOGGER.debug("query " + query + " returned " + rs.length() + " results");
@@ -411,4 +420,9 @@ public final class FormsService
          }
          return result;
       }
+      finally
+      {
+         rs.close();
+      }
+   }
 }

source/java/org/alfresco/web/forms/xforms/Schema2XFormsProperties.java

@@ -145,6 +145,8 @@ public class Schema2XFormsProperties
                      searchService.query(Repository.getStoreRef(),
                                          SearchService.LANGUAGE_LUCENE,
                                          "PATH:\"" + name + "\"");
+                  try
+                  {
                      LOGGER.debug("search returned " + results.length() + 
                                   " results");
                      if (results.length() == 1)
@@ -159,6 +161,11 @@ public class Schema2XFormsProperties
                         return super.getResourceAsStream(name);
                      }
                   }
+                  finally
+                  {
+                     results.close();
+                  }
+               }
             };
          }
          else if (location.startsWith("classpath:"))