Merge from HEAD into WCM-DEV2. Also fixes build breakage in

jndi-client and catalina-virtual that I introduced earlier. 


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

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

@@ -15,6 +15,16 @@ public abstract class BaseWizardBean extends BaseDialogBean implements IWizardBe
 {
    private static final String MSG_NOT_SET = "value_not_set";
    
+   public String next()
+   {
+      return null;
+   }
+   
+   public String back()
+   {
+      return null;
+   }
+   
    public boolean getNextButtonDisabled()
    {
       return false;