Merge from HEAD to WCM-DEV2.

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

source/java/org/alfresco/repo/admin/patch/impl/SchemaUpgradeScriptPatch.java

@@ -20,7 +20,7 @@ import org.alfresco.repo.admin.patch.AbstractPatch;
 import org.alfresco.service.cmr.admin.PatchException;
 
 /**
- * This patch ensures that an upgrade script has been executed.  Upgrade scripts
+ * This patch ensures that an upgrade scriptUrl has been executed.  Upgrade scripts
  * should create an entry for the patch with the required ID and execution status
  * so that the code in this class is never called.  If called, an exception message
  * is always generated.
@@ -31,26 +31,37 @@ public class SchemaUpgradeScriptPatch extends AbstractPatch
 {
     private static final String MSG_NOT_EXECUTED = "patch.schemaUpgradeScript.err.not_executed";
     
-    private String scriptName;
+    private String scriptUrl;
     
     public SchemaUpgradeScriptPatch()
     {
     }
+
+    /**
+     * @return Returns the URL of the scriptUrl that has to have been run
+     */
+    public String getScriptUrl()
+    {
+        return scriptUrl;
+    }
     
     /**
-     * Set the name of the upgrade script to execute.
+     * Set the URL of the upgrade scriptUrl to execute.  This is the full URL of the
+     * file, e.g. <b>classpath:alfresco/patch/scripts/upgrade-1.4/${hibernate.dialect.class}/patchAlfrescoSchemaUpdate-1.4-2.sql</b>
+     * where the <b>${hibernate.dialect.class}</b> placeholder will be substituted with the Hibernate
+     * <code>Dialect</code> as configured for the system.
      * 
-     * @param scriptName the script filename
+     * @param scriptUrl the scriptUrl filename
      */
-    public void setScriptName(String scriptName)
+    public void setScriptUrl(String script)
     {
-        this.scriptName = scriptName;
+        this.scriptUrl = script;
     }
 
     protected void checkProperties()
     {
         super.checkProperties();
-        checkPropertyNotNull(scriptName, "scriptName");
+        checkPropertyNotNull(scriptUrl, "scriptUrl");
     }
 
     /**
@@ -59,6 +70,6 @@ public class SchemaUpgradeScriptPatch extends AbstractPatch
     @Override
     protected String applyInternal() throws Exception
     {
-        throw new PatchException(MSG_NOT_EXECUTED, scriptName);
+        throw new PatchException(MSG_NOT_EXECUTED, scriptUrl);
     }
 }

source/java/org/alfresco/repo/admin/patch/impl/UniqueChildNamePatch.java

@@ -216,6 +216,9 @@ public class UniqueChildNamePatch extends AbstractPatch
                             writeLine("     Replaced with:  " + usedChildName);
                         }
                     }
+                    // clear the session to preserve memory
+                    getSession().flush();
+                    getSession().clear();
                 }
             }