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/IWizardBean.java

@@ -9,6 +9,20 @@ import org.alfresco.web.bean.dialog.IDialogBean;
  */
 public interface IWizardBean extends IDialogBean
 {
+   /**
+    * Called when the next button is pressed by the user
+    * 
+    * @return Reserved for future use
+    */
+   public String next();
+   
+   /**
+    * Called when the back button is pressed by the user
+    * 
+    * @return Reserved for future use
+    */
+   public String back();
+   
    /**
     * Returns the label to use for the next button
     *