Merged V2.2 to HEAD

7073: WCM Search UI
   7088: Fix to issue with similarly named bean getter with different return values causing issue with JSF component
   7239: Fix to minor refresh issue with new WCM Search UI
   Removed "final" SearchContent bean


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

config/alfresco/messages/webclient.properties

@@ -1089,7 +1089,9 @@ website_browse_files=Browse Files
 creator=Creator
 modified_items=Modified Items
 content_forms=Web Forms
-
+search_website=Search Website
+search_sandbox_warn=Search results shown may not be up-to-date with changes made in your local sandbox.
+search_form_content=Generated XML content for form: {0}
 store_created_on=Created On
 store_created_by=Created By
 store_working_users=There {0,choice,0#are no users|1#is one user|1<are {0,number} users} working on this web project.
@@ -1108,6 +1110,7 @@ folder_preview=Preview Folder
 file_preview=Preview File
 selected=Selected
 create_form_content=Create Content
+find_form_content=Browse Content
 recent_snapshots=Recent Snapshots
 snapshot_revert=Revert
 snapshot_preview=Preview

source/java/org/alfresco/web/bean/BrowseBean.java

@@ -269,10 +269,9 @@ public class BrowseBean implements IContextListener
    /**
     * @return Returns the minimum length of a valid search string.
     */
-   public int getMinimumSearchLength()
+   public static int getMinimumSearchLength()
    {
-      return Application.getClientConfig(FacesContext.getCurrentInstance()).
-            getSearchMinimum();
+      return Application.getClientConfig(FacesContext.getCurrentInstance()).getSearchMinimum();
    }
 
    /**
@@ -641,6 +640,7 @@ public class BrowseBean implements IContextListener
       // nothing to do
    }
 
+   
    // ------------------------------------------------------------------------------
    // NodeEventListener listeners
 
@@ -903,12 +903,13 @@ public class BrowseBean implements IContextListener
          tx = Repository.getUserTransaction(FacesContext.getCurrentInstance(), true);
          tx.begin();
 
-         // Limit search to the first 100 matches
+         // build up the search parameters
          SearchParameters sp = new SearchParameters();
          sp.setLanguage(SearchService.LANGUAGE_LUCENE);
          sp.setQuery(query);
          sp.addStore(Repository.getStoreRef());
 
+         // limit search results size as configured
          int searchLimit = Application.getClientConfig(FacesContext.getCurrentInstance()).getSearchMaxResults();
          if (searchLimit > 0)
          {
@@ -1972,6 +1973,8 @@ public class BrowseBean implements IContextListener
    // ------------------------------------------------------------------------------
    // Private data
 
+   private static Log logger = LogFactory.getLog(BrowseBean.class);
+   
    /** Browse screen view ID */
    public static final String BROWSE_VIEW_ID    = "/jsp/browse/browse.jsp";
    public static final String CATEGORY_VIEW_ID  = "/jsp/browse/category-browse.jsp";
@@ -1984,9 +1987,7 @@ public class BrowseBean implements IContextListener
 
    /** I18N messages */
    private static final String MSG_DELETE_COMPANYROOT = "delete_companyroot_confirm";
-   private static final String MSG_SEARCH_MINIMUM     = "search_minimum";
-
-   private static Log    logger = LogFactory.getLog(BrowseBean.class);
+   public static final String MSG_SEARCH_MINIMUM      = "search_minimum";
 
    /** The NodeService to be used by the bean */
    protected NodeService nodeService;

source/java/org/alfresco/web/bean/search/SearchContext.java

@@ -64,7 +64,7 @@ import org.dom4j.io.XMLWriter;
  * 
  * @author Kevin Roast
  */
-public final class SearchContext implements Serializable
+public class SearchContext implements Serializable
 {
    private static final long serialVersionUID = 6730844584074229969L;
    

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

@@ -61,6 +61,12 @@ import org.alfresco.service.cmr.avmsync.AVMSyncService;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.LimitBy;
+import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.ResultSetRow;
+import org.alfresco.service.cmr.search.SearchParameters;
+import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.cmr.workflow.WorkflowService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
@@ -75,6 +81,7 @@ import org.alfresco.web.bean.NavigationBean;
 import org.alfresco.web.bean.repository.Node;
 import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.bean.repository.User;
+import org.alfresco.web.bean.search.SearchContext;
 import org.alfresco.web.forms.FormInstanceData;
 import org.alfresco.web.forms.FormNotFoundException;
 import org.alfresco.web.forms.FormsService;
@@ -113,6 +120,7 @@ public class AVMBrowseBean implements IContextListener
    private static final String MSG_CREATED_ON = "store_created_on";
    private static final String MSG_CREATED_BY = "store_created_by";
    private static final String MSG_WORKING_USERS = "store_working_users";
+   private static final String MSG_SEARCH_FORM_CONTENT = "search_form_content";
 
    /** Component id the status messages are tied too */
    static final String COMPONENT_SANDBOXESPANEL = "sandboxes-panel";
@@ -184,6 +192,11 @@ public class AVMBrowseBean implements IContextListener
    private String pageSizeFoldersStr;
    private String pageSizeFilesStr;
    
+   /** search query string */
+   private String websiteQuery;
+   
+   private SearchContext searchContext = null;
+   
    /** The NodeService to be used by the bean */
    protected NodeService nodeService;
    
@@ -205,6 +218,10 @@ public class AVMBrowseBean implements IContextListener
    /** The FormsService reference */
    protected FormsService formsService;
    
+   /** The SearchService reference */
+   protected SearchService searchService;
+   
+   
    /**
     * Default Constructor
     */
@@ -252,6 +269,14 @@ public class AVMBrowseBean implements IContextListener
       workflowService = service;
    }
    
+   /**
+    * @param searchService The Searcher to set.
+    */
+   public void setSearchService(SearchService searchService)
+   {
+      this.searchService = searchService;
+   }
+   
    /**
     * Getter used by the Inline Edit XML JSP
     * 
@@ -642,6 +667,22 @@ public class AVMBrowseBean implements IContextListener
       this.snapshotDateFilter = snapshotDateFilter;
    }
    
+   /**
+    * @return the website search query string
+    */
+   public String getWebsiteQuery()
+   {
+       return this.websiteQuery;
+   }
+
+   /**
+    * @param websiteQuery   The website search query string
+    */
+   public void setWebsiteQuery(String websiteQuery)
+   {
+       this.websiteQuery = websiteQuery;
+   }
+
    /**
     * @return icon image for the appropriate sandbox type
     */
@@ -740,6 +781,9 @@ public class AVMBrowseBean implements IContextListener
          this.currentPathNode = null; 
       }
       
+      // clear the search context as we have navigated to a folder path
+      this.searchContext = null;
+      
       // update UI state ready for screen refresh
       UIContextService.getInstance(FacesContext.getCurrentInstance()).notifyBeans();
    }
@@ -822,6 +866,14 @@ public class AVMBrowseBean implements IContextListener
       return (deployReportRefs != null && deployReportRefs.size() > 0);
    }
    
+   /**
+    * @return the Search Context object for the current website project
+    */
+   public SearchContext getSearchContext()
+   {
+      return this.searchContext;
+   }
+
    /**
     * @return Map of avm node objects representing the folders with the current website space
     */
@@ -829,7 +881,14 @@ public class AVMBrowseBean implements IContextListener
    {
       if (this.folders == null)
       {
-         getNodes();
+         if (this.searchContext == null)
+         {
+            buildDirectoryNodes();
+         }
+         else
+         {
+            buildSearchNodes();
+         }
       }
       return this.folders;
    }
@@ -841,7 +900,14 @@ public class AVMBrowseBean implements IContextListener
    {
       if (this.files == null)
       {
-         getNodes();
+         if (this.searchContext == null)
+         {
+            buildDirectoryNodes();
+         }
+         else
+         {
+            buildSearchNodes();
+         }
       }
       return this.files;
    }
@@ -849,7 +915,7 @@ public class AVMBrowseBean implements IContextListener
    /**
     * Build the lists of files and folders within the current browsing path in a website space
     */
-   private void getNodes()
+   private void buildDirectoryNodes()
    {
       UserTransaction tx = null;
       try
@@ -865,26 +931,8 @@ public class AVMBrowseBean implements IContextListener
          {
             AVMNodeDescriptor avmRef = nodes.get(name);
             
-            // build the client representation of the AVM node
-            AVMNode node = new AVMNode(avmRef);
-            String path = avmRef.getPath();
-            
-            // properties specific to folders or files
-            if (avmRef.isDirectory())
-            {
-               node.getProperties().put("smallIcon", BrowseBean.SPACE_SMALL_DEFAULT);
-               this.folders.add(node);
-            }
-            else
-            {
-               node.getProperties().put("fileType16", Utils.getFileTypeImage(name, true));
-               node.getProperties().put("url", DownloadContentServlet.generateBrowserURL(
-                     AVMNodeConverter.ToNodeRef(-1, path), name));
-               this.files.add(node);
-            }
-            
-            // common properties
-            node.addPropertyResolver("previewUrl", AVMNode.RESOLVER_PREVIEW_URL);
+            // build and add the client representation of the AVM node
+            addAVMNodeResult(avmRef);
          }
          
          // commit the transaction
@@ -900,6 +948,133 @@ public class AVMBrowseBean implements IContextListener
       }
    }
    
+   /**
+    * Build the lists of files and folders from the current search context in a website space
+    */
+   private void buildSearchNodes()
+   {
+      String query = this.searchContext.buildQuery(getMinimumSearchLength());
+      if (query == null)
+      {
+         // failed to build a valid query, the user probably did not enter the
+         // minimum text required to construct a valid search
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(FacesContext.getCurrentInstance(),
+               BrowseBean.MSG_SEARCH_MINIMUM), new Object[] {getMinimumSearchLength()}));
+         this.folders = Collections.<Map>emptyList();
+         this.files = Collections.<Map>emptyList();
+         return;
+      }
+
+      UserTransaction tx = null;
+      ResultSet results = null;
+      try
+      {
+         FacesContext context = FacesContext.getCurrentInstance();
+         tx = Repository.getUserTransaction(context, true);
+         tx.begin();
+         
+         // build up the search parameters
+         SearchParameters sp = new SearchParameters();
+         sp.setLanguage(SearchService.LANGUAGE_LUCENE);
+         sp.setQuery(query);
+         // add the Staging Store for this website - it is the only searchable store for now
+         sp.addStore(new StoreRef(StoreRef.PROTOCOL_AVM, getStagingStore()));
+         
+         // limit search results size as configured
+         int searchLimit = Application.getClientConfig(context).getSearchMaxResults();
+         if (searchLimit > 0)
+         {
+            sp.setLimitBy(LimitBy.FINAL_SIZE);
+            sp.setLimit(searchLimit);
+         }
+         
+         results = this.searchService.query(sp);
+         
+         if (logger.isDebugEnabled())
+            logger.debug("Search results returned: " + results.length());
+         
+         // filter hidden folders above the web app
+         boolean isStagingStore = getIsStagingStore();
+         int sandboxPathLength = AVMUtil.getSandboxPath(getCurrentPath()).length();
+         
+         this.files = new ArrayList<Map>(results.length());
+         this.folders = new ArrayList<Map>(results.length());
+         for (ResultSetRow row : results)
+         {
+            NodeRef nodeRef = row.getNodeRef();
+            
+            // Modify the path to point to the current user sandbox - this change is performed so
+            // that any action permission evaluators will correctly resolve for the current user.
+            // Therefore deleted node will be filtered out by the lookup() call, but some text based
+            // results may be incorrect - however a note is provided in the search UI to indicate this.
+            String path = AVMNodeConverter.ToAVMVersionPath(nodeRef).getSecond();
+            if (isStagingStore == false)
+            {
+               path = getSandbox() + ':' + AVMUtil.getStoreRelativePath(path);
+            }
+            if (path.length() > sandboxPathLength)
+            {
+               AVMNodeDescriptor avmRef = this.avmService.lookup(-1, path);
+               if (avmRef != null)
+               {
+                  AVMNode node = addAVMNodeResult(avmRef);
+                  
+                  // add extra properties for search results lists
+                  node.addPropertyResolver("displayPath", AVMNode.RESOLVER_DISPLAY_PATH);
+                  node.addPropertyResolver("parentPath", AVMNode.RESOLVER_PARENT_PATH);
+               }
+            }
+         }
+         
+         // commit the transaction
+         tx.commit();
+      }
+      catch (Throwable err)
+      {
+         Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), err.getMessage()), err);
+         this.folders = Collections.<Map>emptyList();
+         this.files = Collections.<Map>emptyList();
+         try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
+      }
+      finally
+      {
+         if (results != null)
+         {
+            results.close();
+         }
+      }
+   }
+   
+   /**
+    * Add an AVM node result to the list of files/folders to display. Applies various
+    * client pseudo properties resolver objects used for list display columns.
+    */
+   private AVMNode addAVMNodeResult(AVMNodeDescriptor avmRef)
+   {
+      // build the client representation of the AVM node
+      AVMNode node = new AVMNode(avmRef);
+      
+      // properties specific to folders or files
+      if (avmRef.isDirectory())
+      {
+         node.getProperties().put("smallIcon", BrowseBean.SPACE_SMALL_DEFAULT);
+         this.folders.add(node);
+      }
+      else
+      {
+         node.getProperties().put("fileType16", Utils.getFileTypeImage(avmRef.getName(), true));
+         node.getProperties().put("url", DownloadContentServlet.generateBrowserURL(
+               AVMNodeConverter.ToNodeRef(-1, avmRef.getPath()), avmRef.getName()));
+         this.files.add(node);
+      }
+      
+      // common properties
+      node.addPropertyResolver("previewUrl", AVMNode.RESOLVER_PREVIEW_URL);
+      
+      return node;
+   }
+   
    /**
     * Return the list of selected items for the current user sandbox view
     * 
@@ -918,6 +1093,14 @@ public class AVMBrowseBean implements IContextListener
       return this.allItemsAction;
    }
    
+   /**
+    * @return true if the current sandbox is a Staging store, false otherwise
+    */
+   public boolean getIsStagingStore()
+   {
+      return (this.sandbox != null && this.sandbox.indexOf(AVMUtil.STORE_SEPARATOR) == -1);
+   }
+   
    
    // ------------------------------------------------------------------------------
    // Action event handlers
@@ -996,6 +1179,8 @@ public class AVMBrowseBean implements IContextListener
          setAvmActionNode(null);
          this.allItemsAction = false;
       }
+      
+      this.websiteQuery = null;
    }
    
    /**
@@ -1005,14 +1190,14 @@ public class AVMBrowseBean implements IContextListener
     * 
     * @param event   ActionEvent
     */
-   public void setupContentAction(final ActionEvent event)
+   public void setupContentAction(ActionEvent event)
    {
-      final UIActionLink link = (UIActionLink)event.getComponent();
-      final Map<String, String> params = link.getParameterMap();
+      UIActionLink link = (UIActionLink)event.getComponent();
+      Map<String, String> params = link.getParameterMap();
       this.setupContentAction(params.get("id"), true);
    }
    
-   /*package*/ void setupContentAction(final String path, final boolean refresh)
+   /*package*/ void setupContentAction(String path, boolean refresh)
    {
       if (logger.isDebugEnabled())
          logger.debug("Setup content action for path: " + path);
@@ -1025,9 +1210,9 @@ public class AVMBrowseBean implements IContextListener
       {
          // calculate username and store name from specified path
          String storeName = AVMUtil.getStoreName(path);
-         final String storeId = AVMUtil.getStoreId(storeName);
-         final String webapp = AVMUtil.getWebapp(path);
-         final String username = AVMUtil.getUserName(storeName);
+         String storeId = AVMUtil.getStoreId(storeName);
+         String webapp = AVMUtil.getWebapp(path);
+         String username = AVMUtil.getUserName(storeName);
          if (username == null)
          {
             storeName = (AVMUtil.isPreviewStore(storeName)
@@ -1063,10 +1248,10 @@ public class AVMBrowseBean implements IContextListener
     * Action handler called to calculate which editing screen to display based on the mimetype
     * of a document. If appropriate, the in-line editing screen will be shown.
     */
-   public void setupEditAction(final ActionEvent event)
+   public void setupEditAction(ActionEvent event)
    {
-      final UIActionLink link = (UIActionLink)event.getComponent();
-      final Map<String, String> params = link.getParameterMap();
+      UIActionLink link = (UIActionLink)event.getComponent();
+      Map<String, String> params = link.getParameterMap();
       this.setupEditAction(params.get("id"));
    }
    
@@ -1074,7 +1259,7 @@ public class AVMBrowseBean implements IContextListener
     * Action handler called to calculate which editing screen to display based on the mimetype
     * of a document. If appropriate, the in-line editing screen will be shown.
     */
-   public void setupEditAction(final String path)
+   public void setupEditAction(String path)
    {
       this.setupContentAction(path, true);
       
@@ -1137,7 +1322,7 @@ public class AVMBrowseBean implements IContextListener
          
       logger.debug("outcome " + outcome + " for path " + path);
          
-      final FacesContext fc = FacesContext.getCurrentInstance();
+      FacesContext fc = FacesContext.getCurrentInstance();
       fc.getApplication().getNavigationHandler().handleNavigation(fc, null, outcome);
    }
    
@@ -1306,7 +1491,7 @@ public class AVMBrowseBean implements IContextListener
    /**
     * Create web content from a specific Form via the User Sandbox 'Available Forms' panel
     */
-   public void createFormContent(final ActionEvent event)
+   public void createFormContent(ActionEvent event)
    {
       // setup the correct sandbox for the create action
       this.setupSandboxAction(event);
@@ -1317,6 +1502,31 @@ public class AVMBrowseBean implements IContextListener
       fc.getApplication().getNavigationHandler().handleNavigation(fc, null, "wizard:createWebContent");
    }
    
+   /**
+    * Perform a canned search for previously generated Form content 
+    */
+   public void searchFormContent(ActionEvent event)
+   {
+      // setup the correct sandbox for the canned search
+      this.setupSandboxAction(event);
+      
+      UIActionLink link = (UIActionLink)event.getComponent();
+      Map<String, String> params = link.getParameterMap();
+      String formName = params.get(UIUserSandboxes.PARAM_FORM_NAME);
+      
+      StringBuilder query = new StringBuilder(256);
+      query.append("+ASPECT:\"").append(WCMAppModel.ASPECT_FORM_INSTANCE_DATA).append("\"");
+      query.append(" -ASPECT:\"").append(WCMAppModel.ASPECT_RENDITION).append("\"");
+      query.append(" +@").append(Repository.escapeQName(WCMAppModel.PROP_PARENT_FORM_NAME))
+           .append(":\"").append(formName).append("\"");
+      FormSearchContext searchContext = new FormSearchContext();
+      searchContext.setCannedQuery(query.toString(), formName);
+      
+      // set the search context - when the view is refreshed, this will be detected and
+      // the search results mode of the AVM Browse screen will be displayed 
+      this.searchContext = searchContext;
+   }
+   
    /**
     * Event handler that transitions a 'submitpending' task to effectively
     * bypass the lauch date and immediately submit the items.
@@ -1432,6 +1642,34 @@ public class AVMBrowseBean implements IContextListener
       }
    }
    
+   /**
+    * Perform a lucene search of the website
+    */
+   public void searchWebsite(ActionEvent event)
+   {
+      if (this.websiteQuery != null && this.websiteQuery.length() != 0)
+      {
+         SearchContext searchContext = new SearchContext();
+         
+         searchContext.setText(this.websiteQuery);
+         
+         // set the search context - when the view is refreshed, this will be detected and
+         // the search results mode of the AVM Browse screen will be displayed 
+         this.searchContext = searchContext;
+         
+         resetFileFolderLists();
+      }
+   }
+   
+   /**
+    * Action called to Close the search dialog by returning to the last viewed path
+    */
+   public void closeSearch(ActionEvent event)
+   {
+      this.searchContext = null;
+      resetFileFolderLists();
+   }
+   
    
    // ------------------------------------------------------------------------------
    // Private helpers
@@ -1481,11 +1719,22 @@ public class AVMBrowseBean implements IContextListener
    }
    
    /**
-    * Update the breadcrumb with the clicked Group location
+    * Update the breadcrumb with the clicked Folder path location
     */
    private void updateUILocation(String path)
    {
-      this.location.add(new AVMBreadcrumbHandler(path));
+      // fully update the entire breadcrumb path - i.e. do not append as may
+      // have navigated from deeper sub-folder (search results)
+      int sandboxPathLength = AVMUtil.getSandboxPath(path).length();
+      String currentPath = path;
+      this.location.clear();
+      while (currentPath.length() != sandboxPathLength)
+      {
+         this.location.add(new AVMBreadcrumbHandler(currentPath));
+         currentPath = AVMNodeConverter.SplitBase(currentPath)[0];
+      }
+      Collections.reverse(this.location);
+      
       setCurrentPath(path);
    }
    
@@ -1499,6 +1748,14 @@ public class AVMBrowseBean implements IContextListener
       return params.get("id");
    }
    
+   /**
+    * @return Returns the minimum length of a valid search string.
+    */
+   public static int getMinimumSearchLength()
+   {
+      return Application.getClientConfig(FacesContext.getCurrentInstance()).getSearchMinimum();
+   }
+   
    
    // ------------------------------------------------------------------------------
    // IContextListener implementation 
@@ -1507,6 +1764,14 @@ public class AVMBrowseBean implements IContextListener
     * @see org.alfresco.web.app.context.IContextListener#contextUpdated()
     */
    public void contextUpdated()
+   {
+      resetFileFolderLists();
+      
+      // clear webapp listing as we may have returned from the Create Webapp dialog
+      this.webapps = null;
+   }
+
+   private void resetFileFolderLists()
    {
       if (this.foldersRichList != null)
       {
@@ -1519,9 +1784,6 @@ public class AVMBrowseBean implements IContextListener
       
       this.files = null;
       this.folders = null;
-      
-      // clear webapp listing as we may have returned from the Create Webapp dialog
-      this.webapps = null;
    }
    
    /**
@@ -1585,4 +1847,35 @@ public class AVMBrowseBean implements IContextListener
          }
       }
    }
+   
+   /**
+    * Wrap SearchContext to allow prebuilt canned Form query to be apply as search context
+    */
+   public class FormSearchContext extends SearchContext
+   {
+      private String cannedQuery = null;
+      private String formName;
+      
+      public void setCannedQuery(String q, String formName)
+      {
+         this.cannedQuery = q;
+         this.formName = formName;
+      }
+      
+      @Override
+      public String buildQuery(int minimum)
+      {
+         return (this.cannedQuery == null ? super.buildQuery(minimum) : this.cannedQuery);
+      }
+
+      @Override
+      public String getText()
+      {
+         return (this.cannedQuery == null ?
+                     super.getText() :
+                     MessageFormat.format(
+                           Application.getMessage(FacesContext.getCurrentInstance(), MSG_SEARCH_FORM_CONTENT),
+                           this.formName));
+      }
+   }
 }

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

@@ -57,7 +57,6 @@ import org.alfresco.web.ui.common.Utils;
  */
 public class AVMNode extends Node implements Map<String, Object>
 {
-
    public final static NodePropertyResolver RESOLVER_PREVIEW_URL =
       new NodePropertyResolver()
       {
@@ -126,6 +125,36 @@ public class AVMNode extends Node implements Map<String, Object>
          }
       };
    
+   public final static NodePropertyResolver RESOLVER_DISPLAY_PATH =
+      new NodePropertyResolver()
+      {
+         public Object get(final Node node)
+         {
+            if (! (node instanceof AVMNode))
+            {
+               return null;
+            }
+            
+            // the display path is the parent path to the node
+            String parentPath = AVMNodeConverter.SplitBase(node.getPath())[0];
+            return AVMUtil.getSandboxRelativePath(parentPath);
+         }
+      };
+
+   public final static NodePropertyResolver RESOLVER_PARENT_PATH =
+      new NodePropertyResolver()
+      {
+         public Object get(final Node node)
+         {
+            if (! (node instanceof AVMNode))
+            {
+               return null;
+            }
+            
+            return AVMNodeConverter.SplitBase(node.getPath())[0];
+         }
+      };
+   
    private final AVMNodeDescriptor avmRef;
    private LayeringDescriptor layeringDesc;
    private final int version;

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

@@ -99,6 +99,7 @@ public class UIUserSandboxes extends SelfRenderingComponent
 {
    private static Log logger = LogFactory.getLog(UIUserSandboxes.class);
    
+   private static final String ACT_FIND_FORM_CONTENT = "find_form_content";
    private static final String ACT_CREATE_FORM_CONTENT = "create_form_content";
    private static final String ACT_SANDBOX_REVERTSELECTED = "sandbox_revertselected";
    private static final String ACT_SANDBOX_SUBMITSELECTED = "sandbox_submitselected";
@@ -869,13 +870,17 @@ public class UIUserSandboxes extends SelfRenderingComponent
             out.write("</td><td>");
             String desc = (String)f.getDescription();
             out.write(desc != null ? desc : "");
-            out.write("</td><td><nobr>");
+            out.write("</td><td>");
+            
+            // set the form-id into the request scope for actions data binding
+            requestMap.put(REQUEST_FORM_REF, f);
+            
             // actions
             UIActionLink action = findAction(ACT_CREATE_FORM_CONTENT, userStorePrefix);
             if (action == null)
             {
                // create content action passes the ID of the Form to uses
-               Map<String, String> params = new HashMap<String, String>(3, 1.0f);
+               Map<String, String> params = new HashMap<String, String>(4, 1.0f);
                // setup a data-binding param for the Form ID
                params.put(PARAM_FORM_NAME, "#{" + REQUEST_FORM_REF + ".name}");
                params.put("username", username);
@@ -890,11 +895,34 @@ public class UIUserSandboxes extends SelfRenderingComponent
                                      null,
                                      params);
             }
-            // set the form-id into the request scope for data binding
-            requestMap.put(REQUEST_FORM_REF, f);
             Utils.encodeRecursive(fc, action);
+            
+            out.write("&nbsp;&nbsp;");
+            
+            action = findAction(ACT_FIND_FORM_CONTENT, userStorePrefix);
+            if (action == null)
+            {
+               // create content action passes the ID of the Form to uses
+               Map<String, String> params = new HashMap<String, String>(4, 1.0f);
+               // setup a data-binding param for the Form ID
+               params.put(PARAM_FORM_NAME, "#{" + REQUEST_FORM_REF + ".name}");
+               params.put("username", username);
+               params.put("store", userStorePrefix);
+               action = createAction(fc,
+                                     userStorePrefix,
+                                     username,
+                                     ACT_FIND_FORM_CONTENT,
+                                     "/images/icons/search_icon.gif",
+                                     "#{AVMBrowseBean.searchFormContent}",
+                                     "browseSandbox",
+                                     null,
+                                     params);
+            }
+            Utils.encodeRecursive(fc, action);
+            
             requestMap.remove(REQUEST_FORM_REF);
-            out.write("</nobr></td></tr>");
+            
+            out.write("</td></tr>");
          }
          
          out.write("</table>");

source/web/WEB-INF/faces-config-beans.xml

@@ -3403,6 +3403,10 @@
          <property-name>formsService</property-name>
          <value>#{FormsService}</value>
       </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
    </managed-bean>
 
    <managed-bean>

source/web/jsp/wcm/browse-sandbox.jsp

@@ -38,15 +38,20 @@
 <script type="text/javascript">
    function applySizeFolders(e)
    {
-      return applySize(e, 'folders-apply');
+      return submitAction(e, 'folders-apply');
    }
    
    function applySizeFiles(e)
    {
-      return applySize(e, 'files-apply');
+      return submitAction(e, 'files-apply');
    }
    
-   function applySize(e, field)
+   function searchWebsite(e)
+   {
+      return submitAction(e, 'search-apply');
+   }
+   
+   function submitAction(e, field)
    {
       var keycode;
       if (window.event) keycode = window.event.keyCode;
@@ -99,8 +104,11 @@
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing=4 cellpadding=0 width=100%>
                         <tr>
+                           
+                           <%-- actions for browse mode --%>
+                           <a:panel id="browse-actions" rendered="#{AVMBrowseBean.searchContext == null}">
                               <td width=32>
-                              <h:graphicImage id="space-logo" url="#{AVMBrowseBean.icon}" width="32" height="32" />
+                                 <h:graphicImage id="website-logo" url="#{AVMBrowseBean.icon}" width="32" height="32" />
                               </td>
                               <td>
                                  <%-- Summary --%>
@@ -109,7 +117,7 @@
                                  <div class="mainSubText"><h:outputText value="#{NavigationBean.nodeProperties.description}" id="msg4" /></div>
                               </td>
                               <td style="white-space:nowrap">
-                              <a:actionLink value="#{msg.sandbox_preview}" image="/images/icons/preview_website.gif" href="#{AVMBrowseBean.sandboxPreviewUrl}" target="new" />
+                                 <a:actionLink value="#{msg.sandbox_preview}" image="/images/icons/preview_website.gif" href="#{AVMBrowseBean.sandboxPreviewUrl}" target="new" id="act-prev" />
                               </td>
                               <r:permissionEvaluator value="#{AVMBrowseBean.currentPathNode}" allow="CreateChildren" id="eval1">
                               <td style="padding-left:4px;white-space:nowrap" width=120>
@@ -119,12 +127,29 @@
                                  </a:menu>
                               </td>
                               </r:permissionEvaluator>
-                           <%-- More actions menu --%>
-                           <%-- <td style="padding-left:4px" width=80>
-                              <a:menu id="actionsMenu" itemSpacing="4" label="#{msg.more_actions}" image="/images/icons/menu.gif" menuStyleClass="moreActionsMenu" style="white-space:nowrap">
-                                 <r:actions id="acts_more" value="avm_more_menu" context="#{AVMBrowseBean.currentPathNode}" />
-                              </a:menu>
-                           </td>--%>
+                           </a:panel>
+                           
+                           <%-- actions for search results mode --%>
+                           <a:panel id="search-actions" rendered="#{AVMBrowseBean.searchContext != null}">
+                              <td width=32>
+                                 <img src="<%=request.getContextPath()%>/images/icons/search_results_large.gif" width=32 height=32>
+                              </td>
+                              <td>
+                                 <%-- Summary --%>
+                                 <div class="mainTitle"><h:outputText value="#{msg.search_results}" id="msg5" /></div>
+                                 <div class="mainSubText"><h:outputFormat value="#{msg.search_detail}" id="msg6"><f:param value="#{AVMBrowseBean.searchContext.text}" id="param1" /></h:outputFormat></div>
+                                 <h:panelGroup id="sandbox-info" rendered="#{!AVMBrowseBean.isStagingStore}">
+                                    <div class="mainSubText">
+                                       <h:graphicImage url="/images/icons/info_icon.gif" id="img-info" width="16" height="16" style="padding-right:3px;vertical-align:middle" />
+                                       <h:outputText value="#{msg.search_sandbox_warn}" id="msg7" style="font-weight:bold" />
+                                    </div>
+                                 </h:panelGroup>
+                              </td>
+                              <td style="padding-right:4px" align=right>
+                                 <%-- Close Search action --%>
+                                 <a:actionLink value="#{msg.close_search}" image="/images/icons/action.gif" style="white-space:nowrap" actionListener="#{AVMBrowseBean.closeSearch}" id="act-close" />
+                              </td>
+                           </a:panel>
                         </tr>
                      </table>
                      
@@ -153,7 +178,12 @@
                <tr>
                   <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td>
                   <td style="padding-left:8px;padding-top:4px;padding-bottom:4px">
-                     <a:breadcrumb value="#{AVMBrowseBean.location}" styleClass="title" />
+                     <div style="float:left"><a:breadcrumb value="#{AVMBrowseBean.location}" styleClass="title" /></div>
+                     <div style="float:right;padding-right:4px">
+                        <h:outputText value="#{msg.search_website}:" id="txt-search" />
+                        <h:inputText id="web-search" value="#{AVMBrowseBean.websiteQuery}" style="margin-left:4px;margin-right:4px;width:120px" maxlength="1024" onkeyup="return searchWebsite(event);" />
+                        <a:actionLink id="search-apply" value="#{msg.go}" image="/images/icons/search_icon.gif" showLink="false" actionListener="#{AVMBrowseBean.searchWebsite}" />
+                     </div>
                   </td>
                   <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width=4></td>
                </tr>
@@ -180,9 +210,9 @@
                               value="#{AVMBrowseBean.folders}" var="r">
                            
                            <%-- Primary column with folder name --%>
-                           <a:column 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 label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
+                                 <a:sortLink id="col1-sort" label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
                               </f:facet>
                               <f:facet name="small-icon">
                                  <a:actionLink id="col1-act1" value="#{r.name}" image="/images/icons/#{r.smallIcon}.gif" actionListener="#{AVMBrowseBean.clickFolder}" showLink="false">
@@ -192,7 +222,17 @@
                               <a:actionLink id="col1-act2" value="#{r.name}" actionListener="#{AVMBrowseBean.clickFolder}">
                                  <f:param name="id" value="#{r.id}" />
                               </a:actionLink>
-                              <w:avmLockIcon id="col10-lock" value="#{r.nodeRef}" align="absmiddle" />
+                              <w:avmLockIcon id="col1-lock" value="#{r.nodeRef}" align="absmiddle" />
+                           </a:column>
+                           
+                           <%-- Path column for search results mode --%>
+                           <a:column id="col2" style="text-align:left" rendered="#{AVMBrowseBean.searchContext != null}">
+                              <f:facet name="header">
+                                 <a:sortLink id="col2-sort" label="#{msg.path}" value="id" styleClass="header"/>
+                              </f:facet>
+                              <a:actionLink id="col2-act1" value="#{r.displayPath}" actionListener="#{AVMBrowseBean.clickFolder}">
+                                 <f:param name="id" value="#{r.parentPath}" />
+                              </a:actionLink>
                            </a:column>
                            
                            <%-- Creator column --%>
@@ -283,6 +323,16 @@
                               <w:avmLockIcon id="col10-lock" value="#{r.nodeRef}" align="absmiddle" />
                            </a:column>
                            
+                           <%-- Path column for search results mode --%>
+                           <a:column id="col11" style="text-align:left" rendered="#{AVMBrowseBean.searchContext != null}">
+                              <f:facet name="header">
+                                 <a:sortLink id="col11-sort" label="#{msg.path}" value="id" styleClass="header"/>
+                              </f:facet>
+                              <a:actionLink id="col11-act1" value="#{r.displayPath}" actionListener="#{AVMBrowseBean.clickFolder}">
+                                 <f:param name="id" value="#{r.parentPath}" />
+                              </a:actionLink>
+                           </a:column>
+                           
                            <%-- Size column --%>
                            <a:column id="col15" style="text-align:left">
                               <f:facet name="header">