mavnet-cvs Mailing List for Maverick.NET

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 290
          http://mavnet.svn.sourceforge.net/mavnet/?rev=290&view=rev
Author:   jmabey
Date:     2009-06-26 18:02:54 +0000 (Fri, 26 Jun 2009)

Log Message:
-----------
Add support for multiple controllers per command.  See code for documentation.

Modified Paths:
--------------
    trunk/Maverick.net/Maverick.csproj
    trunk/Maverick.net/examples/Friendbook/Friendbook.csproj
    trunk/Maverick.net/examples/Friendbook-aspx/default.aspx
    trunk/Maverick.net/examples/Friendbook-aspx/edit.aspx
    trunk/Maverick.net/examples/Friendbook-aspx/friends.aspx
    trunk/Maverick.net/examples/Friendbook-aspx/loginFailed.aspx
    trunk/Maverick.net/examples/Friendbook-aspx/loginForm.aspx
    trunk/Maverick.net/examples/Friendbook-aspx/loginRequired.aspx
    trunk/Maverick.net/examples/Friendbook-aspx/maverick.config
    trunk/Maverick.net/examples/Friendbook-aspx/signup.aspx
    trunk/Maverick.net/examples/Friendbook-aspx/trimInside.aspx
    trunk/Maverick.net/examples/Friendbook-aspx/trimOutside.aspx
    trunk/Maverick.net/examples/Friendbook-aspx/welcome.aspx
    trunk/Maverick.net/src/Maverick/Dispatcher.cs
    trunk/Maverick.net/src/Maverick/Flow/CommandBase.cs
    trunk/Maverick.net/src/Maverick/Flow/CommandFactory.cs
    trunk/Maverick.net/src/Maverick/Flow/ControllerFactory.cs
    trunk/Maverick.net/src/Maverick/Util/XML.cs
    trunk/Maverick.net/tests/Maverick-Tests.csproj
    trunk/Maverick.net/tests/src/Maverick/Util.Test/MockTest.cs

Added Paths:
-----------
    trunk/Maverick.net/examples/Friendbook/Friendbook/Ctl/GetLoggedInUser.cs
    trunk/Maverick.net/examples/Friendbook-aspx/trimWelcomeUser.aspx
    trunk/Maverick.net/src/Maverick/Flow/CommandMultipleControllers.cs
    trunk/Maverick.net/src/Maverick/Flow/ControllerWithModelKey.cs
    trunk/Maverick.net/src/Maverick/Flow/ControllerWithViewResults.cs
    trunk/Maverick.net/tests/src/Maverick/CommandFactoryTest.cs
    trunk/Maverick.net/tests/src/Maverick/CommandMultipleControllersTest.cs
    trunk/Maverick.net/tests/src/Maverick/TestUtility.cs

Modified: trunk/Maverick.net/Maverick.csproj
===================================================================
(Binary files differ)

Added: trunk/Maverick.net/examples/Friendbook/Friendbook/Ctl/GetLoggedInUser.cs
===================================================================

--- trunk/Maverick.net/examples/Friendbook/Friendbook/Ctl/GetLoggedInUser.cs	                        (rev 0)
+++ trunk/Maverick.net/examples/Friendbook/Friendbook/Ctl/GetLoggedInUser.cs	2009-06-26 18:02:54 UTC (rev 290)
@@ -0,0 +1,31 @@
+using System.Collections;
+using System;
+
+using Friendbook.Data;
+
+namespace Friendbook.Ctl {
+    /// <summary>
+    /// Summary description for GetLoggedInUser.
+    /// </summary>
+    public class GetLoggedInUser : ControllerProtected {
+	protected string firstName;
+	protected string lastName;
+
+	protected override string SecurePerform() {
+	    Friend me = FriendBook.Instance.FindByLogin(this.CurrentLoginName);
+
+	    this.firstName = me.FirstName;
+	    this.lastName = me.LastName;
+
+	    return SUCCESS;// "success2";
+	}
+
+	public string FirstName2 {
+	    get { return firstName; }
+	}
+
+	public string LastName2 {
+	    get { return lastName; }
+	}
+    }
+}

Modified: trunk/Maverick.net/examples/Friendbook/Friendbook.csproj
===================================================================
(Binary files differ)

Modified: trunk/Maverick.net/examples/Friendbook-aspx/default.aspx
===================================================================
--- trunk/Maverick.net/examples/Friendbook-aspx/default.aspx	2009-06-26 17:57:45 UTC (rev 289)
+++ trunk/Maverick.net/examples/Friendbook-aspx/default.aspx	2009-06-26 18:02:54 UTC (rev 290)
@@ -1,4 +1,4 @@
-<%@ Page %>
+<%@ Page Language="C#" %>
 <%
 	Context.Response.Redirect("welcome.m");
 %>

Modified: trunk/Maverick.net/examples/Friendbook-aspx/edit.aspx
===================================================================
--- trunk/Maverick.net/examples/Friendbook-aspx/edit.aspx	2009-06-26 17:57:45 UTC (rev 289)
+++ trunk/Maverick.net/examples/Friendbook-aspx/edit.aspx	2009-06-26 18:02:54 UTC (rev 290)
@@ -1,4 +1,4 @@
-<%@ Page %>
+<%@ Page Language="C#" %>
 <%
 	Context.Items.Add("title","Edit Your Info");
 	Friendbook.Ctl.Edit model = (Friendbook.Ctl.Edit)Context.Items["model"];

Modified: trunk/Maverick.net/examples/Friendbook-aspx/friends.aspx
===================================================================
--- trunk/Maverick.net/examples/Friendbook-aspx/friends.aspx	2009-06-26 17:57:45 UTC (rev 289)
+++ trunk/Maverick.net/examples/Friendbook-aspx/friends.aspx	2009-06-26 18:02:54 UTC (rev 290)
@@ -1,7 +1,8 @@
-<%@ Page %>
+<%@ Page Language="C#" %>
 <%
 	Context.Items.Add("title","Friends");
 	Friendbook.Ctl.Friends model = (Friendbook.Ctl.Friends)Context.Items["model"];
+	Friendbook.Ctl.Friends model2 = (Friendbook.Ctl.Friends)Context.Items["ForTesting"];
 %>
 <p>
 	Here is a list of all of your friends:
@@ -19,7 +20,7 @@
 	</tr>
 	<% foreach (Friendbook.Data.Friend friend in model.AllFriends) {
 			string styleAttrs = "";
-			if (friend.Login.Equals(model.MyLogin))
+			if (friend.Login.Equals(model2.MyLogin))
 				styleAttrs = "background-color: yellow";
 	%>
 	<tr>

Modified: trunk/Maverick.net/examples/Friendbook-aspx/loginFailed.aspx
===================================================================
--- trunk/Maverick.net/examples/Friendbook-aspx/loginFailed.aspx	2009-06-26 17:57:45 UTC (rev 289)
+++ trunk/Maverick.net/examples/Friendbook-aspx/loginFailed.aspx	2009-06-26 18:02:54 UTC (rev 290)
@@ -1,4 +1,4 @@
-<%@ Page %>
+<%@ Page Language="C#" %>
 <%
 	Context.Items.Add("title","Login Failed");
 	Friendbook.Ctl.ControllerProtected.LoginModel model = (Friendbook.Ctl.ControllerProtected.LoginModel)Context.Items["model"];

Modified: trunk/Maverick.net/examples/Friendbook-aspx/loginForm.aspx
===================================================================
--- trunk/Maverick.net/examples/Friendbook-aspx/loginForm.aspx	2009-06-26 17:57:45 UTC (rev 289)
+++ trunk/Maverick.net/examples/Friendbook-aspx/loginForm.aspx	2009-06-26 18:02:54 UTC (rev 290)
@@ -1,4 +1,4 @@
-<%@ Page %>
+<%@ Page Language="C#" %>
 <form action="<%=Context.Items["dest"]%>" method="post">
 	<table border="0">
 		<tr>

Modified: trunk/Maverick.net/examples/Friendbook-aspx/loginRequired.aspx
===================================================================
--- trunk/Maverick.net/examples/Friendbook-aspx/loginRequired.aspx	2009-06-26 17:57:45 UTC (rev 289)
+++ trunk/Maverick.net/examples/Friendbook-aspx/loginRequired.aspx	2009-06-26 18:02:54 UTC (rev 290)
@@ -1,4 +1,4 @@
-<%@ Page %>
+<%@ Page Language="C#" %>
 <%
 	Context.Items.Add("title","Login Required");
 	Friendbook.Ctl.ControllerProtected.LoginModel model = (Friendbook.Ctl.ControllerProtected.LoginModel)Context.Items["model"];

Modified: trunk/Maverick.net/examples/Friendbook-aspx/maverick.config
===================================================================
--- trunk/Maverick.net/examples/Friendbook-aspx/maverick.config	2009-06-26 17:57:45 UTC (rev 289)
+++ trunk/Maverick.net/examples/Friendbook-aspx/maverick.config	2009-06-26 18:02:54 UTC (rev 290)
@@ -37,11 +37,15 @@
 
 		<command name="edit">
 			<controller class="Friendbook.Ctl.Edit, Friendbook"/>
+			<controller class="Friendbook.Ctl.GetLoggedInUser, Friendbook" modelKey="ForTrim" >
+			    <viewResult name="success2" abort="True" override="False" />
+			</controller>
 
 			<view name="loginRequired" ref="loginRequired"/>
 			<view name="loginFailed" ref="loginFailed"/>
 
 			<view name="success" path="edit.aspx">
+				<transform path="trimWelcomeUser.aspx"/>
 				<transform path="trimInside.aspx"/>
 			</view>
 		</command>
@@ -89,7 +93,7 @@
 		</command>
 
 		<command name="friends">
-			<controller class="Friendbook.Ctl.Friends, Friendbook"/>
+			<controller class="Friendbook.Ctl.Friends, Friendbook" modelKey="ForTesting"/>
 			
 			<view name="loginRequired" ref="loginRequired"/>
 			<view name="loginFailed" ref="loginFailed"/>

Modified: trunk/Maverick.net/examples/Friendbook-aspx/signup.aspx
===================================================================
--- trunk/Maverick.net/examples/Friendbook-aspx/signup.aspx	2009-06-26 17:57:45 UTC (rev 289)
+++ trunk/Maverick.net/examples/Friendbook-aspx/signup.aspx	2009-06-26 18:02:54 UTC (rev 290)
@@ -1,4 +1,4 @@
-<%@ Page %>
+<%@ Page Language="C#" %>
 <%
 	Context.Items.Add("title","Sign Up");
 	Friendbook.Ctl.SignupSubmit model = (Friendbook.Ctl.SignupSubmit)Context.Items["model"];

Modified: trunk/Maverick.net/examples/Friendbook-aspx/trimInside.aspx
===================================================================
--- trunk/Maverick.net/examples/Friendbook-aspx/trimInside.aspx	2009-06-26 17:57:45 UTC (rev 289)
+++ trunk/Maverick.net/examples/Friendbook-aspx/trimInside.aspx	2009-06-26 18:02:54 UTC (rev 290)
@@ -1,4 +1,4 @@
-<%@ Page %>
+<%@ Page Language="C#" %>
 <html>
 	<head>
 		<title> <%=Context.Items["title"]%> </title>

Modified: trunk/Maverick.net/examples/Friendbook-aspx/trimOutside.aspx
===================================================================
--- trunk/Maverick.net/examples/Friendbook-aspx/trimOutside.aspx	2009-06-26 17:57:45 UTC (rev 289)
+++ trunk/Maverick.net/examples/Friendbook-aspx/trimOutside.aspx	2009-06-26 18:02:54 UTC (rev 290)
@@ -1,4 +1,4 @@
-<%@ Page %>
+<%@ Page Language="C#" %>
 <html>
 	<head>
 		<title> <%=Context.Items["title"]%> </title>

Added: trunk/Maverick.net/examples/Friendbook-aspx/trimWelcomeUser.aspx
===================================================================
--- trunk/Maverick.net/examples/Friendbook-aspx/trimWelcomeUser.aspx	                        (rev 0)
+++ trunk/Maverick.net/examples/Friendbook-aspx/trimWelcomeUser.aspx	2009-06-26 18:02:54 UTC (rev 290)
@@ -0,0 +1,8 @@
+<%@ Page Language="C#" %>
+<%
+    Friendbook.Ctl.GetLoggedInUser model = (Friendbook.Ctl.GetLoggedInUser)Context.Items["ForTrim"];
+%>
+
+<div>Nice to see you again <%=model.FirstName2%> <%=model.LastName2%></div>
+
+<%=Context.Items["wrapped"]%>

Modified: trunk/Maverick.net/examples/Friendbook-aspx/welcome.aspx
===================================================================
--- trunk/Maverick.net/examples/Friendbook-aspx/welcome.aspx	2009-06-26 17:57:45 UTC (rev 289)
+++ trunk/Maverick.net/examples/Friendbook-aspx/welcome.aspx	2009-06-26 18:02:54 UTC (rev 290)
@@ -1,4 +1,4 @@
-<%@ Page %>
+<%@ Page Language="C#" %>
 <%
 	Context.Items.Add("title","Welcome");
 %>

Modified: trunk/Maverick.net/src/Maverick/Dispatcher.cs
===================================================================
--- trunk/Maverick.net/src/Maverick/Dispatcher.cs	2009-06-26 17:57:45 UTC (rev 289)
+++ trunk/Maverick.net/src/Maverick/Dispatcher.cs	2009-06-26 18:02:54 UTC (rev 290)
@@ -273,8 +273,14 @@
 			}
 		    }
 		} else {
+		    IDictionary views;
 		    CommandMultipleViews mvCommand = cmd as CommandMultipleViews;
-		    IDictionary views = mvCommand.Views;
+		    if(mvCommand != null) {
+			views = mvCommand.Views;
+		    } else {
+			CommandMultipleControllers mcCommand = cmd as CommandMultipleControllers;
+			views = mcCommand.Views;
+		    }
 		    foreach (String viewKey in views.Keys) {
 			ForwardView view = views[viewKey] as ForwardView;
 			if (view != null) {

Modified: trunk/Maverick.net/src/Maverick/Flow/CommandBase.cs
===================================================================
--- trunk/Maverick.net/src/Maverick/Flow/CommandBase.cs	2009-06-26 17:57:45 UTC (rev 289)
+++ trunk/Maverick.net/src/Maverick/Flow/CommandBase.cs	2009-06-26 18:02:54 UTC (rev 290)
@@ -14,7 +14,7 @@
 	/// Execute the command and render the results!
 	/// </summary>
 	/// <param name="mctx"></param>
-	public void Go(MaverickContext mctx) {
+	public virtual void Go(MaverickContext mctx) {
 	    try {
 		string viewName = this.controller.Go(mctx);
 		RunView(viewName, mctx);

Modified: trunk/Maverick.net/src/Maverick/Flow/CommandFactory.cs
===================================================================
--- trunk/Maverick.net/src/Maverick/Flow/CommandFactory.cs	2009-06-26 17:57:45 UTC (rev 289)
+++ trunk/Maverick.net/src/Maverick/Flow/CommandFactory.cs	2009-06-26 18:02:54 UTC (rev 290)
@@ -1,4 +1,5 @@
 using System.Collections;
+using System.Collections.Generic;
 using System.Xml;
 using System;
 
@@ -14,6 +15,8 @@
 
 	protected const string TAG_CONTROLLER = "controller";
 
+	protected const String ATTR_MODELKEY = "modelKey";
+
 	protected ViewRegistry viewReg;
 
 	protected ControllerFactory controllerFact = new ControllerFactory();
@@ -26,7 +29,19 @@
 	public ICommand CreateCommand(XmlElement commandNode) {
 	    XmlNodeList controllerNodes = commandNode.GetElementsByTagName(TAG_CONTROLLER);
 	    if (controllerNodes.Count > 1) {
-		throw new ConfigException("Command must have exactly 1 controller node defined: " + XML.ToString(commandNode));
+		List<IController> ctls = new List<IController>();
+		Int32 counter = 0;
+		foreach(XmlElement ctlNode in controllerNodes) {
+		    if(ctlNode.GetAttribute(ATTR_MODELKEY).Length == 0) {
+			counter++;
+		    }
+		    if(counter > 1) {
+			throw new ConfigException("Command can only have 1 controller without a 'modelKey' defined: " + XML.ToString(commandNode));
+		    }
+		    IController controller = this.controllerFact.CreateController(ctlNode);
+		    ctls.Add(controller);
+		}
+		return new CommandMultipleControllers(ctls, this.viewReg.CreateViewsMap(commandNode.GetElementsByTagName(TAG_VIEW)));
 	    }
 
 	    XmlElement controllerNode = (XmlElement)controllerNodes.Item(0);

Added: trunk/Maverick.net/src/Maverick/Flow/CommandMultipleControllers.cs
===================================================================
--- trunk/Maverick.net/src/Maverick/Flow/CommandMultipleControllers.cs	                        (rev 0)
+++ trunk/Maverick.net/src/Maverick/Flow/CommandMultipleControllers.cs	2009-06-26 18:02:54 UTC (rev 290)
@@ -0,0 +1,92 @@
+using System.Collections;
+using System;
+using System.Collections.Generic;
+
+namespace Maverick.Flow {
+    /// <summary>
+    /// Command implementation which allows one of several views to
+    /// be determined by one of several controller results.
+    /// </summary>
+    public class CommandMultipleControllers : CommandBase {
+	/// <summary>
+	/// Stores mapping of String view name to IView object.
+	/// </summary>
+	private IDictionary views;
+	private List<IController> ctls;
+
+	public CommandMultipleControllers(List<IController> ctls, IDictionary views) : base(ctls[0]) {
+	    this.views = views;
+	    this.ctls = ctls;
+	}
+
+	protected internal override IView GetView(string name) {
+	    return (IView)views[name];
+	}
+
+	public IDictionary Views {
+	    get {
+		return views;
+	    }
+	}
+
+	public List<IController> Ctls {
+	    get {
+		return ctls;
+	    }
+	}
+
+	/// <summary>
+	/// Execute the command and render the results!
+	/// </summary>
+	/// <param name="mctx"></param>
+	public override void Go(MaverickContext mctx) {
+	    try {
+		String viewName = "";
+		Object tempModel = null;
+		for(Int32 i = 0; i < ctls.Count; i++) {
+		    IController controller = ctls[i];
+		    String tempViewName = controller.Go(mctx);
+		    if(i == 0) {
+			viewName = tempViewName;
+		    }
+
+		    ControllerWithModelKey ctlWithKey = null;
+		    ControllerWithViewResults ctlWithResults = controller as ControllerWithViewResults;
+
+		    if(ctlWithResults != null) {
+			ctlWithKey = ctlWithResults.decorated as ControllerWithModelKey;
+		    } else {
+			ctlWithKey = controller as ControllerWithModelKey;
+		    }
+
+		    if(ctlWithKey == null) {
+			tempModel = mctx.Model;
+		    }
+
+		    if(ctlWithResults != null) {
+			try {
+			    ViewResult viewResult = ctlWithResults.ViewResults[tempViewName];
+			    if(viewResult.Override) {
+				viewName = tempViewName;
+			    }
+			    if(viewResult.Abort) {
+				break;
+			    }
+			} catch(KeyNotFoundException) {
+			    // Do Nothing
+			}
+		    }
+		}
+
+		mctx.Model = tempModel;
+		RunView(viewName, mctx);
+	    } finally {
+		// guarantee that this will run even if exception is thrown
+		// Allow the model to manage resources
+		// need this here even though it is also in RunView
+		// in case exception is throw in this.controller.Go(mctx)
+		DiscardModel(mctx);
+	    }
+	}
+    }
+}

Modified: trunk/Maverick.net/src/Maverick/Flow/ControllerFactory.cs
===================================================================
--- trunk/Maverick.net/src/Maverick/Flow/ControllerFactory.cs	2009-06-26 17:57:45 UTC (rev 289)
+++ trunk/Maverick.net/src/Maverick/Flow/ControllerFactory.cs	2009-06-26 18:02:54 UTC (rev 290)
@@ -1,4 +1,5 @@
 using System.Collections;
+using System.Collections.Generic;
 using System.Reflection;
 using System.Xml;
 using System;
@@ -11,6 +12,7 @@
     /// </summary>
     public class ControllerFactory {
 	protected const string ATTR_CONTROLLER_CLASS = "class";
+	protected const String ATTR_MODELKEY = "modelKey";
 
 	protected readonly static IController nullController = new NullController();
 
@@ -55,13 +57,25 @@
 
 	    result.Init(controllerNode);
 
+	    ctrl = result;
+
 	    IDictionary controllerParams = XML.getParams(controllerNode);
 
 	    if (controllerParams != null) {
-		return new ControllerWithParams(result, controllerParams);
-	    } else{
-		return result;
+		ctrl = new ControllerWithParams(ctrl, controllerParams);
 	    }
+
+	    if(controllerNode.GetAttribute(ATTR_MODELKEY).Length > 0) {
+		ctrl = new ControllerWithModelKey(ctrl, controllerNode.GetAttribute(ATTR_MODELKEY));
+	    }
+
+	    //keep last due to processing of multiple controllers, see CommandMultipleControllers.Go
+	    Dictionary<String, ViewResult> viewResults = XML.getViewResults(controllerNode);
+	    if(viewResults.Count > 0) {
+		ctrl = new ControllerWithViewResults(ctrl, viewResults);
+	    }
+
+	    return ctrl;
 	}
 
 	class NullController : IControllerSingleton {

Added: trunk/Maverick.net/src/Maverick/Flow/ControllerWithModelKey.cs
===================================================================
--- trunk/Maverick.net/src/Maverick/Flow/ControllerWithModelKey.cs	                        (rev 0)
+++ trunk/Maverick.net/src/Maverick/Flow/ControllerWithModelKey.cs	2009-06-26 18:02:54 UTC (rev 290)
@@ -0,0 +1,31 @@
+using System.Collections;
+using System;
+
+namespace Maverick.Flow {
+    /// <summary>
+    /// This is a Decorator pattern, adding modelKey defined for a controller.
+    /// </summary>
+    public class ControllerWithModelKey : IController {
+	protected IController decorated;
+	private String modelKey;
+
+	public ControllerWithModelKey(IController decorate, String modelKey) {
+	    if (modelKey == null || modelKey.Length < 1) {
+		throw new ArgumentException("Don't use this decorator without a modelKey.");
+	    }
+
+	    this.decorated = decorate;
+	    this.modelKey = modelKey;
+	}
+
+	public String ModelKey {
+	    get { return modelKey; }
+	}
+
+	public string Go(IControllerContext cctx) {
+	    String returnString = this.decorated.Go(cctx);
+	    cctx.HttpContext.Items[this.ModelKey] = cctx.Model;
+	    return returnString;
+	}
+    }
+}

Added: trunk/Maverick.net/src/Maverick/Flow/ControllerWithViewResults.cs
===================================================================
--- trunk/Maverick.net/src/Maverick/Flow/ControllerWithViewResults.cs	                        (rev 0)
+++ trunk/Maverick.net/src/Maverick/Flow/ControllerWithViewResults.cs	2009-06-26 18:02:54 UTC (rev 290)
@@ -0,0 +1,36 @@
+using System.Collections;
+using System.Collections.Generic;
+using System;
+using System.Xml;
+
+namespace Maverick.Flow {
+    /// <summary>
+    /// This is a Decorator pattern, adding ViewResults defined for a controller.
+    /// </summary>
+    public class ControllerWithViewResults : IController {
+	internal IController decorated;
+	private Dictionary<String, ViewResult> viewResults;
+
+	public ControllerWithViewResults(IController decorate, Dictionary<String, ViewResult> viewResults) {
+	    if (viewResults.Count == 0) {
+		throw new ArgumentException("Don't use this decorator without viewResults.");
+	    }
+
+	    this.decorated = decorate;
+	    this.viewResults = viewResults;
+	}
+
+	public Dictionary<String, ViewResult> ViewResults {
+	    get { return viewResults; }
+	}
+
+	public string Go(IControllerContext cctx) {
+	    return this.decorated.Go(cctx);
+	}
+    }
+
+    public struct ViewResult {
+	public Boolean Abort;
+	public Boolean Override;
+    }
+}

Modified: trunk/Maverick.net/src/Maverick/Util/XML.cs
===================================================================
--- trunk/Maverick.net/src/Maverick/Util/XML.cs	2009-06-26 17:57:45 UTC (rev 289)
+++ trunk/Maverick.net/src/Maverick/Util/XML.cs	2009-06-26 18:02:54 UTC (rev 290)
@@ -1,7 +1,10 @@
 using System.Collections;
+using System.Collections.Generic;
 using System.Xml;
 using System;
 
+using Maverick.Flow;
+
 namespace Maverick.Util {
     /// <summary>
     /// Summary description for XML.
@@ -13,6 +16,19 @@
 	public const string TAG_PARAM = "param";
 
 	/// <summary>
+	/// The tag for a viewResult node
+	/// </summary>
+	public const string TAG_VIEWRESULT = "viewResult";
+	/// <summary>
+	/// The attribute which represents the "abort" parameter of a viewResult node
+	/// </summary>
+	public const string ATTR_ABORT = "abort";
+	/// <summary>
+	/// The attribute which represents the "override" parameter of a viewResult node
+	/// </summary>
+	public const string ATTR_OVERRIDE = "override";
+
+	/// <summary>
 	/// The attribute which represents the "value" of an element.
 	/// </summary>
 	public const string ATTR_VALUE = "value";
@@ -55,6 +71,29 @@
 	}
 
 	/// <summary>
+	/// Extracts a set of viewResult child nodes from the specified node.
+	/// Expects that param nodes will look like:
+	/// &lt;viewResult name="theName" abort="True" override="True" /&gt;
+	/// </summary>
+	/// <param name="node">Parent element.</param>
+	/// <returns>dictionary of viewResult, if nothing found the dictionary will be empty.</returns>
+	public static Dictionary<String, ViewResult> getViewResults(XmlElement node) {
+	    Dictionary<String, ViewResult> result = new Dictionary<string, ViewResult>();
+	    IEnumerator ienum = node.GetElementsByTagName(TAG_VIEWRESULT).GetEnumerator();
+	    while(ienum.MoveNext()) {
+		XmlElement paramNode = (XmlElement)ienum.Current;
+		String name = XML.GetAttribute(paramNode, ATTR_NAME);
+		String abort = XML.GetAttribute(paramNode, ATTR_ABORT);
+		String overrideView = XML.GetAttribute(paramNode, ATTR_OVERRIDE);
+		ViewResult viewResult = new ViewResult();
+		viewResult.Abort = (abort != null && abort.ToLower().Equals("true"));
+		viewResult.Override = (overrideView != null && overrideView.ToLower().Equals("true"));
+		result.Add(name, viewResult);
+	    }
+	    return result;
+	}
+
+	/// <summary>
 	/// Extracts the named value from the element, by checking (in order):
 	/// A system property whose name is constructed like this:
 	/// "maverick." + node.getName() + "." + name

Modified: trunk/Maverick.net/tests/Maverick-Tests.csproj
===================================================================
--- trunk/Maverick.net/tests/Maverick-Tests.csproj	2009-06-26 17:57:45 UTC (rev 289)
+++ trunk/Maverick.net/tests/Maverick-Tests.csproj	2009-06-26 18:02:54 UTC (rev 290)
@@ -1,117 +1,120 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{D425DFCE-5416-45B1-902E-DB6AD568A669}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Maverick.Test</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Maverick</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\build\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>
-    </DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>
-    </DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>1</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Maverick.csproj">
-      <Name>Maverick</Name>
-      <Project>{1445EF95-217F-41DB-8E1C-581E1C11085E}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-    </ProjectReference>
-    <Reference Include="nunit.framework">
-      <Name>nunit.framework</Name>
-      <HintPath>..\lib\net-1.1\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.Web">
-      <Name>System.Web</Name>
-    </Reference>
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="src\Maverick\Util.Test\MockTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="src\Maverick\Util.Test\PropertyPopulatorTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{D425DFCE-5416-45B1-902E-DB6AD568A669}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Maverick.Test</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Maverick</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\build\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>
+    </DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>
+    </DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>1</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Maverick.csproj">
+      <Name>Maverick</Name>
+      <Project>{1445EF95-217F-41DB-8E1C-581E1C11085E}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+    </ProjectReference>
+    <Reference Include="nunit.framework">
+      <Name>nunit.framework</Name>
+      <HintPath>..\lib\net-1.1\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Web">
+      <Name>System.Web</Name>
+    </Reference>
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="src\Maverick\CommandFactoryTest.cs" />
+    <Compile Include="src\Maverick\CommandMultipleControllersTest.cs" />
+    <Compile Include="src\Maverick\TestUtility.cs" />
+    <Compile Include="src\Maverick\Util.Test\MockTest.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="src\Maverick\Util.Test\PropertyPopulatorTest.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
 </Project>
\ No newline at end of file

Added: trunk/Maverick.net/tests/src/Maverick/CommandFactoryTest.cs
===================================================================
--- trunk/Maverick.net/tests/src/Maverick/CommandFactoryTest.cs	                        (rev 0)
+++ trunk/Maverick.net/tests/src/Maverick/CommandFactoryTest.cs	2009-06-26 18:02:54 UTC (rev 290)
@@ -0,0 +1,30 @@
+using System.Collections.Specialized;
+using System.Collections;
+using System;
+
+using NUnit.Framework;
+
+namespace Maverick.Test {
+    /// <summary>
+    /// Summary description for CommandFactoryTest.
+    /// </summary>
+    ///
+    [TestFixture]
+    public class CommandFactoryTest {
+
+	[Test, Ignore("Not implemented")]
+	public void ShouldBeAbleToCreateCommandSingleView() {
+	    Assert.Fail();
+	}
+
+	[Test, Ignore("Not implemented")]
+	public void ShouldBeAbleToCreateCommandMultipleViews() {
+	    Assert.Fail();
+	}
+
+	[Test, Ignore("Not implemented")]
+	public void ShouldBeAbleToCreateCommandMultipleControllers() {
+	    Assert.Fail();
+	}
+    }
+}

Added: trunk/Maverick.net/tests/src/Maverick/CommandMultipleControllersTest.cs
===================================================================
--- trunk/Maverick.net/tests/src/Maverick/CommandMultipleControllersTest.cs	                        (rev 0)
+++ trunk/Maverick.net/tests/src/Maverick/CommandMultipleControllersTest.cs	2009-06-26 18:02:54 UTC (rev 290)
@@ -0,0 +1,54 @@
+using System.Collections.Specialized;
+using System.Collections;
+using System.Collections.Generic;
+using System;
+using Maverick.Flow;
+using Maverick.src.Maverick.Util.Test;
+
+using NUnit.Framework;
+using System.Xml;
+
+namespace Maverick.Test {
+    /// <summary>
+    /// Summary description for CommandMultipleControllersTest.
+    /// </summary>
+    ///
+    [TestFixture]
+    public class CommandMultipleControllersTest {
+
+	[Test]
+	public void ShouldBeAbleToCreateCommandMultipleControllers() {
+	    List<IController> ctrls = new List<IController>();
+	    ctrls.Add(new TestEchoController());
+	    ctrls.Add(new TestEcho2Controller());
+
+	    ICommand command = new CommandMultipleControllers(ctrls, new Hashtable());
+
+	    Assert.IsTrue(command is CommandMultipleControllers);
+	}
+
+	[Test, Ignore("Not implemented")]
+	public void ShouldBeAbleToRunWithOnlyOneController() {
+	    //List<IController> ctrls = new List<IController>();
+	    //ctrls.Add(new TestEchoController());
+
+	    //List<String> views = new List<string>();
+	    //views.Add("TestView");
+	    //TestUtility.GetTrivialViews(views);
+
+	    //ICommand command = new CommandMultipleControllers(ctrls, new Hashtable());
+
+	    //Assert.IsTrue(command is CommandMultipleControllers);
+	}
+
+	[Test, Ignore("Not implemented")]
+	public void ShouldBeAbleToRunWithMultipleControllers() {
+	    Assert.Fail();
+	}
+
+	[Test, Ignore("Not implemented")]
+	public void ShouldBeAbleToGetViewSetByOverride() {
+	    Assert.Fail();
+	}
+    }
+}

Added: trunk/Maverick.net/tests/src/Maverick/TestUtility.cs
===================================================================
--- trunk/Maverick.net/tests/src/Maverick/TestUtility.cs	                        (rev 0)
+++ trunk/Maverick.net/tests/src/Maverick/TestUtility.cs	2009-06-26 18:02:54 UTC (rev 290)
@@ -0,0 +1,22 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using System.Xml;
+
+namespace Maverick.Test {
+    public class TestUtility {
+	
+	public static XmlNodeList GetTrivialViews(List<String> names) {
+	    XmlDocument xDoc = new XmlDocument();
+	    foreach(String name in names) {
+		XmlElement view = xDoc.CreateElement("view");
+		view.SetAttribute("type", "trivial");
+		view.SetAttribute("name", name);
+		xDoc.AppendChild(view);
+	    }
+	    return xDoc.ChildNodes;
+	}
+
+    }
+}

Modified: trunk/Maverick.net/tests/src/Maverick/Util.Test/MockTest.cs
===================================================================
--- trunk/Maverick.net/tests/src/Maverick/Util.Test/MockTest.cs	2009-06-26 17:57:45 UTC (rev 289)
+++ trunk/Maverick.net/tests/src/Maverick/Util.Test/MockTest.cs	2009-06-26 18:02:54 UTC (rev 290)
@@ -58,6 +58,45 @@
 	}
     }
 
+    public class TestEchoController : MockController {
+	private String echoValue = null;
+
+	public String EchoValue {
+	    get { return echoValue; }
+	    set { this.echoValue = value; }
+	}
+
+	public override string Perform() {
+	    return this.echoValue;
+	}
+    }
+
+    public class TestEcho2Controller : MockController {
+	private String echo2Value = null;
+
+	public String Echo2Value {
+	    get { return echo2Value; }
+	    set { this.echo2Value = value; }
+	}
+
+	public override string Perform() {
+	    return this.echo2Value;
+	}
+    }
+
+    public class TestEcho3Controller : MockController {
+	private String echo3Value = null;
+
+	public String Echo3Value {
+	    get { return echo3Value; }
+	    set { this.echo3Value = value; }
+	}
+
+	public override string Perform() {
+	    return this.echo3Value;
+	}
+    }
+
     public class MockController : Throwaway {
 	private ArrayList properties = new ArrayList();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2002	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (17)
2003	Jan (89)	Feb (4)	Mar	Apr	May (3)	Jun	Jul	Aug	Sep	Oct	Nov (1)	Dec
2004	Jan	Feb (7)	Mar (2)	Apr	May (1)	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2005	Jan (10)	Feb (36)	Mar	Apr	May	Jun (1)	Jul	Aug	Sep (1)	Oct	Nov	Dec
2006	Jan (21)	Feb	Mar	Apr	May (20)	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2008	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (15)	Dec
2009	Jan	Feb	Mar (2)	Apr (12)	May (1)	Jun (2)	Jul	Aug	Sep	Oct	Nov	Dec