Merge V1.2.0 BRANCH to HEAD

svn merge -r 2566:2569 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root


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

source/java/org/alfresco/repo/importer/ImporterBootstrap.java

@@ -85,6 +85,10 @@ public class ImporterBootstrap implements ApplicationListener
     private Locale locale = null;
     private AuthenticationComponent authenticationComponent;
     
+    // Bootstrap performed?
+    private boolean bootstrapPerformed = false;
+    
+    
     /**
      * Set whether we write or not
      * 
@@ -263,6 +267,16 @@ public class ImporterBootstrap implements ApplicationListener
     {
         this.logEnabled = logEnabled;
     }
+
+    /**
+     * Determine if bootstrap was performed?
+     * 
+     * @return  true => bootstrap was performed
+     */
+    public boolean hasPerformedBootstrap()
+    {
+        return bootstrapPerformed;
+    }
     
     /**
      * Boostrap the Repository
@@ -394,6 +408,9 @@ public class ImporterBootstrap implements ApplicationListener
                         }
                     }
                 }
+                
+                // a bootstrap was performed
+                bootstrapPerformed = !useExistingStore;
             }
             userTransaction.commit();
         }