Merged V2.0 to HEAD

5297: PostgreSQL upgrade support
   5347: (From 1.4) EHCache configuration fixes and sample
   5380, 5381: AWC-1143
   5398: AWC-966


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

source/java/org/alfresco/web/bean/wizard/WizardManager.java

@@ -113,15 +113,15 @@ public final class WizardManager
                "' does not implement the required IWizardBean interface");
       }
       
+      // create the WizardState object
+      this.currentWizardState = new WizardState(config, wizard);
+      
       // initialise the managed bean
       wizard.init(this.paramsToApply);
       
       // reset the current parameters so subsequent wizards don't get them
       this.paramsToApply = null;
       
-      // create the WizardState object
-      this.currentWizardState = new WizardState(config, wizard);
-      
       // setup the first step
       determineCurrentPage();
    }

source/java/org/alfresco/web/ui/repo/component/UIActions.java

@@ -649,6 +649,19 @@ public class UIActions extends SelfRenderingComponent
       this.verticalSpacing = verticalSpacing;
    }
    
+   // ------------------------------------------------------------------------------
+   // Helper methods
+   
+   /**
+    * Resets the component to force a re-initialisation.
+    */
+   public void reset()
+   {
+      // clear any child components and reset the list of groups
+      this.getChildren().clear();
+      this.groups.clear();
+   }
+
    /**
     * @return a unique ID for a JSF component
     */
@@ -657,7 +670,6 @@ public class UIActions extends SelfRenderingComponent
       return "_id_" + Short.toString(++id);
    }
    
-   
    // ------------------------------------------------------------------------------
    // Private data
    

source/java/org/alfresco/web/ui/repo/component/UISidebar.java

@@ -152,7 +152,7 @@ public class UISidebar extends SelfRenderingComponent
          // update the child UIActions component with the correct 
          // action group id and clear it's current children
          UIActions actions = (UIActions)this.getChildren().get(1);
-         actions.getChildren().clear();
+         actions.reset();
          setupActionGroupId(context, actions);
       }
    }