Odds and ends. Started infrastructure for AVM command line utilities.

Loosened cache invalidation for write operations so that layered/write 
lookups are not discarded.  Changed direct buffer copies to use 
System.arraycopy.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4447 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

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

@@ -86,10 +86,7 @@ public class AVMRemoteInputStream extends InputStream
             {
                 return -1;
             }
-            for (int i = 0; i < buff.length; i++)
+            System.arraycopy(buff, 0, b, off, buff.length);
-            {
-                b[off + i] = buff[i];
-            }
             return buff.length;
         }
         catch (Exception e)

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

@@ -85,10 +85,7 @@ public class AVMRemoteOutputStream extends OutputStream
             else
             {
                 byte [] buff = new byte[len];
-                for (int i = 0; i < len; i++)
+                System.arraycopy(b, off, buff, 0, len);
-                {
-                    buff[i] = b[i + off];
-                }
                 fAVMRemote.writeOutput(fHandle, buff, len);
             }
         }

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

@@ -2185,7 +2185,7 @@ public class AVMRepository
             {
                 throw new AVMNotFoundException("Store not found.");
             }
-            fLookupCache.onWrite(pathParts[0]);
+            fLookupCache.onDelete(pathParts[0]);
             Lookup lPath = store.lookup(-1, pathParts[1], true, false);
             AVMNode node = lPath.getCurrentNode();
             if (node == null)

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

@@ -268,7 +268,8 @@ public class LookupCache
         for (Map.Entry<LookupKey, Lookup> entry : fCache.entrySet())
         {
             if ((entry.getKey().getStoreName().equals(storeName) &&
-                !entry.getKey().isWrite()) || entry.getValue().isLayered())
+                !entry.getKey().isWrite()) || 
+                (!entry.getKey().isWrite() && entry.getValue().isLayered()))
             {
                 toDelete.add(entry.getKey());
             }

source/java/org/alfresco/repo/avm/clt/AVMCltBase.java

@@ -0,0 +1,133 @@
+/**
+ * 
+ */
+package org.alfresco.repo.avm.clt;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.avm.AVMRemote;
+import org.alfresco.service.cmr.avmsync.AVMSyncService;
+import org.alfresco.util.Pair;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ * This is the base class for AVM clts.
+ * @author britt
+ */
+public abstract class AVMCltBase 
+{
+    /**
+     * The instance of the remote interface.
+     */
+    protected AVMRemote fAVMRemote;
+    
+    /**
+     * The instance of the remote sync service interface.
+     */
+    protected AVMSyncService fAVMSyncService;
+    
+    /**
+     * The ApplicationContext.
+     */
+    protected ConfigurableApplicationContext fContext;
+    
+    /**
+     * Construct a new one. This takes care of instantiating
+     * the application context and grabs references to the
+     * services. 
+     * @param args The program arguments.
+     */
+    protected AVMCltBase()
+    {
+        fContext = new ClassPathXmlApplicationContext("avm-clt-context.xml");
+        fAVMRemote = (AVMRemote)fContext.getBean("avmRemote");
+        fAVMSyncService = (AVMSyncService)fContext.getBean("avmSyncService");
+    }
+    
+    /**
+     * All clts go through this call. This parses the arguments, exits if 
+     * there are any errors and then passes the broken flags and arguments
+     * to the run method of the derived clt.
+     * @param args The raw command line arguments.
+     * @param flagDefs The definition of what flags to accept and their
+     * arities.
+     * @param minArgs The minimum number of actual arguments expected.
+     * @param usageMessage The message that should be printed if there is a 
+     * syntax error.
+     */
+    public void exec(String [] args, 
+                     Object [] flagDefs,
+                     int minArgs,
+                     String usageMessage)
+    {
+        Map<String, Integer> flagArgs = new HashMap<String, Integer>();
+        Map<String, List<String>> flagValues = new HashMap<String, List<String>>();
+        List<String> actualArgs = new ArrayList<String>();
+        // Convert the flag definitions into a convenient form.
+        for (int i = 0; i < flagDefs.length / 2; i++)
+        {
+            flagArgs.put((String)flagDefs[i * 2], (Integer)flagDefs[i * 2 + 1]);
+        }
+        // Walk through the raw command line arguments.
+        int pos = 0;
+        while (pos < args.length)
+        {
+            // If the argument begins with "-" then this could be a
+            // flag.
+            if (args[pos].startsWith("-"))
+            {
+                // If the argument is one of the accepted flags then it's
+                // a flag.
+                if (flagArgs.containsKey(args[pos]))
+                {
+                    String flag = args[pos];
+                    pos++;
+                    int count = flagArgs.get(flag);
+                    // Check for too few arguments
+                    if (args.length - pos < count)
+                    {
+                        usage(usageMessage);
+                    }
+                    // Stuff the parsed flag away.
+                    List<String> flArgs = new ArrayList<String>();
+                    for (int i = 0; i < count; i++)
+                    {
+                        flArgs.add(args[pos + i]);
+                    }
+                    flagValues.put(flag, flArgs);
+                    pos += count;
+                    continue;
+                }
+            }
+            // Otherwise its just a plain old arg.
+            actualArgs.add(args[pos]);
+            pos++;
+        }
+        // Check for too few arguments.
+        if (actualArgs.size() < minArgs)
+        {
+            usage(usageMessage);
+        }
+        // Do the work.
+        run(flagValues, actualArgs);
+        // Cleanup.
+        fContext.close();
+    }
+    
+    /**
+     * Handle syntax error by exiting.
+     * @param usageMessage The message to print.
+     */
+    protected void usage(String usageMessage)
+    {
+        System.err.println(usageMessage);
+        fContext.close();
+        System.exit(1);
+    }
+    
+    protected abstract void run(Map<String, List<String>> flags, List<String> args);
+}