Merged V2.2 to HEAD

7534: Merged V2.1 to HEAD
      7398: XPath metadata extractor selector handles malformed and empty XML files
      7401: Fix AR-1879: JBPM Timer never fires
      7413: Contribution: Integrity checker ignores exceptions that would normally trigger transaction retries.
      7416: AR-1884.Unicode wildcard processing.
      7417: Added filtering of pseudo files when a partial wildcard search path is used, such as '*.csv'. AR-1889.
      7436: AR-1863: major version's can now be created via the web service API;
      7451: Fix for handling of UTF-8 application/x-www-form-urlencoded encoded form arguments as raised in support ticket 242
      7458: Fix for AR-1900
      7520: Fix to Template API where content was not retrievable from custom d:content properties on a node


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

source/java/org/alfresco/filesys/repo/ContentDiskDriver.java

@@ -844,9 +844,36 @@ public class ContentDiskDriver extends AlfrescoDiskDriver implements DiskInterfa
                 
                 if ( WildCard.containsWildcards(searchFileSpec))
                 {
-                    // Check if the folder has any associated pseudo files
+                    // Get the list of pseudo files for the search path
                     
                     pseudoList = searchFolderState.getPseudoFileList();
+                    
+                    // Check if the wildcard is for all files or a subset
+                   
+                    if ( searchFileSpec.equals( "*") == false && pseudoList != null && pseudoList.numberOfFiles() > 0)
+                    {
+                        // Generate a subset of pseudo files that match the wildcard search pattern
+                        
+                        WildCard wildCard = new WildCard( searchFileSpec, false);
+                        PseudoFileList filterList = null;
+                        
+                        for ( int i = 0; i > pseudoList.numberOfFiles(); i++)
+                        {
+                            PseudoFile pseudoFile = pseudoList.getFileAt( i);
+                            if ( wildCard.matchesPattern( pseudoFile.getFileName()))
+                            {
+                                // Add the pseudo file to the filtered list
+                                
+                                if ( filterList == null)
+                                    filterList = new PseudoFileList();
+                                filterList.addFile( pseudoFile);
+                            }
+                        }
+                        
+                        // Use the filtered pseudo file list, or null if there were no matches
+                        
+                        pseudoList = filterList;
+                    }
                 }
                 else if ( results == null || results.size() == 0)
                 {