Merged V2.1 to HEAD

6361: Word 2007 Add-In and Installer - First version, untested
   6362: Adds a scaling test that a number of customers could [use]
   6363: Build fix
   6365: Submit workflow to always clean up virtualized workflow, etc
   6367: Support for wild cards within queries AR-615
            Conflicts with newer Tenant code
            Resolved conflicted state of 'root\projects\repository\source\java\org\alfresco\repo\search\impl\lucene\ADMLuceneSearcherImpl.java'
            Resolved conflicted state of 'root\projects\repository\source\java\org\alfresco\repo\search\impl\lucene\ADMLuceneTest.java'
            Resolved conflicted state of 'root\projects\repository\source\java\org\alfresco\repo\search\impl\lucene\LuceneQueryParser.java'


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

source/java/org/alfresco/repo/avm/AVMScaleTestP.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing
+ */
+
+package org.alfresco.repo.avm;
+
+import org.alfresco.repo.avm.util.BulkLoader;
+import org.alfresco.repo.avm.util.BulkReader;
+
+/**
+ * Test of scaling out to large numbers of files.
+ * @author britt
+ */
+public class AVMScaleTestP extends AVMServiceTestBase
+{
+    public void testScaling()
+    {
+        int n = 4; // The number of BulkLoads to do.
+        int futzCount = 10; // The number of post snapshot modifications to make after each load.
+        String load = "/Users/britt/hibernate-3.1"; // The tree of stuff to load.
+        BulkLoader loader = new BulkLoader();
+        loader.setAvmService(fService);
+        loader.setPropertyCount(5);
+        BulkReader reader = new BulkReader();
+        reader.setAvmService(fService);
+        long lastTime = System.currentTimeMillis();
+        for (int i = 0; i < n; i++)
+        {
+            System.out.println("Round " + (i + 1));
+            fService.createStore("store" + i);
+            loader.recursiveLoad(load, "store" + i + ":/");
+            fService.createSnapshot("store" + i, null, null);
+            long now = System.currentTimeMillis();
+            System.out.println("Load Time: " + (now - lastTime) + "ms");
+            lastTime = now;
+            reader.recursiveFutz("store" + i, "store" + i + ":/", futzCount);
+            now = System.currentTimeMillis();
+            System.out.println("Read Time: " + (now - lastTime) + "ms");
+            System.out.flush();
+            lastTime = now;
+        }
+    }
+}

source/java/org/alfresco/repo/avm/util/BulkLoader.java

@@ -28,9 +28,13 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.HashMap;
+import java.util.Map;
 
+import org.alfresco.repo.domain.PropertyValue;
 import org.alfresco.service.cmr.avm.AVMException;
 import org.alfresco.service.cmr.avm.AVMService;
+import org.alfresco.service.namespace.QName;
 
 /**
  * This takes a filesystem directory path and a repository path and name
@@ -41,6 +45,8 @@ public class BulkLoader
 {
     private AVMService fService;
     
+    private int fPropertyCount = 0;
+    
     /**
      * Create a new one.
      */
@@ -57,6 +63,11 @@ public class BulkLoader
         fService = service;
     }
     
+    public void setPropertyCount(int propCount)
+    {
+        fPropertyCount = propCount;
+    }
+    
     /**
      * Recursively load content.
      * @param fsPath The path in the filesystem.
@@ -64,6 +75,11 @@ public class BulkLoader
      */
     public void recursiveLoad(String fsPath, String repPath)
     {
+        Map<QName, PropertyValue> props = new HashMap<QName, PropertyValue>();
+        for (int i = 0; i < fPropertyCount; i++)
+        {
+            props.put(QName.createQName("silly", "prop" + i), new PropertyValue(null, "I am property " + i));
+        }
         File file = new File(fsPath);
         String name = file.getName();
         if (file.isDirectory())
@@ -71,6 +87,7 @@ public class BulkLoader
             fService.createDirectory(repPath, name);
             String[] children = file.list();
             String baseName = repPath.endsWith("/") ? repPath + name : repPath + "/" + name;
+            fService.setNodeProperties(baseName, props);
             for (String child : children)
             {
                 recursiveLoad(fsPath + "/" + child, baseName);
@@ -82,6 +99,7 @@ public class BulkLoader
             {
                 InputStream in = new FileInputStream(file);
                 OutputStream out = fService.createFile(repPath, name);
+                fService.setNodeProperties(repPath + "/" + name, props);
                 byte[] buff = new byte[8192];
                 int read = 0;
                 while ((read = in.read(buff)) != -1)

source/java/org/alfresco/repo/avm/util/BulkReader.java

@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing
+ */
+
+package org.alfresco.repo.avm.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+import org.alfresco.service.cmr.avm.AVMService;
+
+/**
+ * Testing utility class. Reads a tree recursively.
+ * @author britt
+ */
+public class BulkReader
+{
+    private AVMService fService;
+    
+    public BulkReader()
+    {
+    }
+    
+    public void setAvmService(AVMService service)
+    {
+        fService = service;
+    }
+    
+    public void recursiveFutz(String store, String path, int futz)
+    {
+        List<String> paths = new ArrayList<String>();
+        recursiveRead(path, paths);
+        Random random = new Random(System.currentTimeMillis());
+        int futzed = 0;
+        while (futzed < futz)
+        {
+            String futzPath = paths.get(random.nextInt(paths.size()));
+            AVMNodeDescriptor desc = fService.lookup(-1, futzPath);
+            if (desc.isFile())
+            {
+                try
+                {
+                    fService.getFileOutputStream(futzPath).close();
+                }
+                catch (IOException e)
+                {
+                    // Do nothing.
+                }
+                futzed++;
+            }
+        }
+        fService.createSnapshot(store, null, null);
+    }
+    
+    public void recursiveRead(String path, List<String> paths)
+    {
+        AVMNodeDescriptor desc = fService.lookup(-1, path);
+        paths.add(desc.getPath());
+        if (desc.isFile())
+        {
+            InputStream in = fService.getFileInputStream(desc);
+            try
+            {
+                byte[] buff = new byte[8192];
+                while (in.read(buff) != -1);
+                in.close();
+            }
+            catch (IOException e)
+            {
+                e.printStackTrace();
+            }
+            return;
+        }
+        Map<String, AVMNodeDescriptor> listing = fService.getDirectoryListing(desc);
+        for (Map.Entry<String, AVMNodeDescriptor> entry : listing.entrySet())
+        {
+            recursiveRead(entry.getValue().getPath(), paths);
+        }
+    }
+}

source/java/org/alfresco/repo/avm/wf/AVMRemoveAllWebappsHandler.java

@@ -0,0 +1,112 @@
+/*-----------------------------------------------------------------------------
+*  Copyright 2007 Alfresco Inc.
+*  
+*  This program is free software; you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation; either version 2 of the License, or
+*  (at your option) any later version.
+*  
+*  This program 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 General Public License
+*  for more details.
+*  
+*  You should have received a copy of the GNU General Public License along
+*  with this program; if not, write to the Free Software Foundation, Inc.,
+*  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  As a special
+*  exception to the terms and conditions of version 2.0 of the GPL, you may
+*  redistribute this Program in connection with Free/Libre and Open Source
+*  Software ("FLOSS") applications as described in Alfresco's FLOSS exception.
+*  You should have received a copy of the text describing the FLOSS exception,
+*  and it is also available here:   http://www.alfresco.com/legal/licensing
+*  
+*  
+*  Author  Jon Cox  <jcox@alfresco.com>
+*  File    AVMRemoveAllWebappsHandler.java
+*----------------------------------------------------------------------------*/
+
+package org.alfresco.repo.avm.wf;
+
+import java.util.Map;
+import org.alfresco.config.JNDIConstants;
+import org.alfresco.mbeans.VirtServerRegistry;
+import org.alfresco.repo.avm.AVMNodeConverter;
+import org.alfresco.repo.avm.util.RawServices;
+import org.alfresco.repo.domain.PropertyValue;
+import org.alfresco.repo.workflow.jbpm.JBPMNode;
+import org.alfresco.repo.workflow.jbpm.JBPMSpringActionHandler;
+import org.alfresco.service.cmr.avm.AVMService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.Pair;
+import org.apache.log4j.Logger;
+import org.jbpm.graph.exe.ExecutionContext;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.context.ApplicationContext;
+
+/**
+ * Remove all webapps in a sandbox
+ * 
+ * @author Jon Cox
+ */
+public class AVMRemoveAllWebappsHandler extends JBPMSpringActionHandler 
+{
+    static final long serialVersionUID = 3004374776252613278L;
+
+    private static Logger log = 
+        Logger.getLogger(AVMRemoveAllWebappsHandler.class);
+
+    /**
+     * The AVMService instance.
+     */
+    private AVMService fAVMService;    
+
+    
+    /**
+     * Initialize service references.
+     * @param factory The BeanFactory to get references from.
+     */
+    @Override
+    protected void initialiseHandler(BeanFactory factory) 
+    {
+        fAVMService = (AVMService)factory.getBean("AVMService");
+    }
+
+    /**
+     * Do the actual work.
+     * @param executionContext The context to get stuff from.
+     */
+    public void execute(ExecutionContext executionContext) throws Exception 
+    {
+        if (log.isDebugEnabled())
+            log.debug("AVMRemoveAllWebappsHandler.execute()");
+
+        // retrieve submitted package
+        NodeRef pkg = ((JBPMNode)executionContext.getContextInstance().
+                                 getVariable("bpm_package")).getNodeRef();
+
+        Pair<Integer, String> pkgPath = AVMNodeConverter.ToAVMVersionPath(pkg);
+
+        Integer version     =  pkgPath.getFirst();
+        String  www_dir     =  pkgPath.getSecond();
+        String  appbase_dir =  www_dir + "/" + JNDIConstants.DIR_DEFAULT_APPBASE;
+
+        if (log.isDebugEnabled())
+        {
+            log.debug("version:     " +  version );
+            log.debug("appbase_dir: " +  appbase_dir );
+        }
+
+        ApplicationContext springContext   = RawServices.Instance().getContext();
+        VirtServerRegistry vServerRegistry = (VirtServerRegistry) 
+                                             springContext.getBean("VirtServerRegistry");
+
+        if (log.isDebugEnabled())
+            log.debug("Sending JMX message to shut down workflow webapps");
+
+        vServerRegistry.removeAllWebapps( version,  appbase_dir, true );
+
+        if (log.isDebugEnabled())
+            log.debug("Sent JMX message to shut down workflow webapps");
+    }
+}

source/java/org/alfresco/repo/avm/wf/AVMSubmitTransactionListener.java

@@ -36,6 +36,7 @@ import org.alfresco.repo.transaction.TransactionListenerAdapter;
 import org.alfresco.service.cmr.avmsync.AVMDifference;
 import org.alfresco.util.VirtServerUtils;
 import org.springframework.context.ApplicationContext;
+import org.apache.log4j.Logger;
 
 /**
 *  Gets callbacks at critical moments within a transaction
@@ -44,8 +45,10 @@ import org.springframework.context.ApplicationContext;
 */
 public class AVMSubmitTransactionListener extends TransactionListenerAdapter
 {
+    private static Logger log = 
+        Logger.getLogger(AVMSubmitTransactionListener.class);
+
     public AVMSubmitTransactionListener() { }
-   
 
     /**
     *  Notify virtualization server that webapps in workflow sandbox
@@ -104,22 +107,31 @@ public class AVMSubmitTransactionListener extends TransactionListenerAdapter
                                               requiresUpdate.getDestinationPath(),
                                               true
                                              );
+            if (log.isDebugEnabled())
+                log.debug("JMX update to virt server called after commit");
         }
 
-        // Remove virtual weapps from workflow sandbox
-
-        if ( ! stagingDiffs.isEmpty() )
-        {
-            // All the files are from the same workflow sandbox;
-            // so to remove all the webapps, you just need to
-            // look at the 1st difference
-
-            AVMDifference d = stagingDiffs.iterator().next();
-            vServerRegistry.removeAllWebapps( d.getSourceVersion(), d.getSourcePath(), true );
-        }
-
+        // Remove virtual webapps from workflow sandbox prior to 
+        // AVMRemoveWFStoreHandler in the "process-end" clause.
+        // This way, even if the workflow is aborted, the JMX message
+        // to the virt server is still sent.  Therefore, no longer 
+        // doing this here:
+        //
+        //  if ( ! stagingDiffs.isEmpty() )
+        //  {
+        //      // All the files are from the same workflow sandbox;
+        //      // so to remove all the webapps, you just need to
+        //      // look at the 1st difference
+        //
+        //      AVMDifference d = stagingDiffs.iterator().next();
+        //      vServerRegistry.removeAllWebapps( d.getSourceVersion(), 
+        //                                        d.getSourcePath(), true );
+        //  }
 
         AlfrescoTransactionSupport.unbindResource("staging_diffs");
+
+        if (log.isDebugEnabled())
+            log.debug("staging_diff resource unbound after commit");
     }
 
 
@@ -130,5 +142,8 @@ public class AVMSubmitTransactionListener extends TransactionListenerAdapter
     public void afterRollback()
     {
         AlfrescoTransactionSupport.unbindResource("staging_diffs");
+
+        if (log.isDebugEnabled())
+            log.debug("staging_diff resource unbound after rollback");
     }
 }