You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by rm...@apache.org on 2013/03/24 18:44:59 UTC

[02/24] Restructuring Scimpi to remove dependencies and enable easier testing.

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Commit.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Commit.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Commit.java
index 4106fd9..b075bfc 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Commit.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Commit.java
@@ -20,8 +20,8 @@ package org.apache.isis.viewer.scimpi.dispatcher.view.simple;
 
 import org.apache.isis.core.runtime.system.context.IsisContext;
 import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
 
 public class Commit extends AbstractElementProcessor {
 
@@ -31,7 +31,7 @@ public class Commit extends AbstractElementProcessor {
     }
 
     @Override
-    public void process(final Request request) {
+    public void process(final TagProcessor tagProcessor) {
         // Note - the session will have changed since the earlier call if a user
         // has logged in or out in the action
         // processing above.

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/ContentTag.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/ContentTag.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/ContentTag.java
index ddda339..9374ebf 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/ContentTag.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/ContentTag.java
@@ -18,8 +18,8 @@
  */
 package org.apache.isis.viewer.scimpi.dispatcher.view.simple;
 
-import org.apache.isis.viewer.scimpi.dispatcher.ElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.ElementProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
 
 public class ContentTag implements ElementProcessor {
 
@@ -29,8 +29,8 @@ public class ContentTag implements ElementProcessor {
     }
 
     @Override
-    public void process(final Request request) {
-        request.appendHtml("<!--  apply content  -->");
+    public void process(final TagProcessor tagProcessor) {
+        tagProcessor.appendHtml("<!--  apply content  -->");
     }
 
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/CookieValue.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/CookieValue.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/CookieValue.java
index 09e56b0..0799993 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/CookieValue.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/CookieValue.java
@@ -19,24 +19,24 @@
 
 package org.apache.isis.viewer.scimpi.dispatcher.view.simple;
 
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext.Scope;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request.Scope;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
 
 public class CookieValue extends AbstractElementProcessor {
 
     @Override
-    public void process(final Request request) {
-        String name = request.getRequiredProperty(NAME);
-        String resultName = request.getOptionalProperty(RESULT_NAME, name);
-        final String scopeName = request.getOptionalProperty(SCOPE);
-        final Scope scope = RequestContext.scope(scopeName, Scope.REQUEST);
+    public void process(final TagProcessor tagProcessor) {
+        String name = tagProcessor.getRequiredProperty(NAME);
+        String resultName = tagProcessor.getOptionalProperty(RESULT_NAME, name);
+        final String scopeName = tagProcessor.getOptionalProperty(SCOPE);
+        final Scope scope = Request.scope(scopeName, Scope.REQUEST);
         
-        String cookieString = request.getContext().getCookie(name);
+        String cookieString = tagProcessor.getContext().getCookie(name);
         
-        request.appendDebug("    " + resultName + " (" + scope + ") set to " + cookieString + " from cookie " + name);
-        request.getContext().addVariable(resultName, cookieString, scope);
+        tagProcessor.appendDebug("    " + resultName + " (" + scope + ") set to " + cookieString + " from cookie " + name);
+        tagProcessor.getContext().addVariable(resultName, cookieString, scope);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/DefaultValue.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/DefaultValue.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/DefaultValue.java
index 2cd9593..1914385 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/DefaultValue.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/DefaultValue.java
@@ -19,28 +19,28 @@
 
 package org.apache.isis.viewer.scimpi.dispatcher.view.simple;
 
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext.Scope;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request.Scope;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
 
 public class DefaultValue extends AbstractElementProcessor {
 
     @Override
-    public void process(final Request request) {
+    public void process(final TagProcessor tagProcessor) {
         // String sourceObjectId = objectOrResult(request);
-        final String variableName = request.getRequiredProperty(NAME);
-        final String defaultValue = request.getOptionalProperty(VALUE);
-        final String scopeName = request.getOptionalProperty(SCOPE);
-        final Scope scope = RequestContext.scope(scopeName, Scope.REQUEST);
+        final String variableName = tagProcessor.getRequiredProperty(NAME);
+        final String defaultValue = tagProcessor.getOptionalProperty(VALUE);
+        final String scopeName = tagProcessor.getOptionalProperty(SCOPE);
+        final Scope scope = Request.scope(scopeName, Scope.REQUEST);
 
-        final RequestContext context = request.getContext();
+        final Request context = tagProcessor.getContext();
         final Object currentValue = context.getVariable(variableName);
         if (currentValue == null) {
-            request.appendDebug("     " + variableName + " set to " + defaultValue + " (" + scope + ")");
+            tagProcessor.appendDebug("     " + variableName + " set to " + defaultValue + " (" + scope + ")");
             context.addVariable(variableName, defaultValue, scope);
         } else {
-            request.appendDebug("     " + variableName + " alreadt set to " + currentValue);
+            tagProcessor.appendDebug("     " + variableName + " alreadt set to " + currentValue);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/EditLink.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/EditLink.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/EditLink.java
index 3a8f7b0..037d560 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/EditLink.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/EditLink.java
@@ -30,8 +30,8 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
 import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.viewer.scimpi.dispatcher.Dispatcher;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.Names;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
 
 public class EditLink extends AbstractLink {
 
@@ -43,7 +43,7 @@ public class EditLink extends AbstractLink {
     private final Where where = Where.ANYWHERE;
 
     @Override
-    protected boolean valid(final Request request, final ObjectAdapter adapter) {
+    protected boolean valid(final TagProcessor tagProcessor, final ObjectAdapter adapter) {
         final ObjectSpecification specification = adapter.getSpecification();
         final AuthenticationSession session = IsisContext.getAuthenticationSession();
         final List<ObjectAssociation> visibleFields = specification.getAssociations(ObjectAssociationFilters.dynamicallyVisible(session, adapter, where));
@@ -60,7 +60,7 @@ public class EditLink extends AbstractLink {
 
     @Override
     protected String defaultView() {
-        return Dispatcher.GENERIC + Dispatcher.EDIT + "." + Dispatcher.EXTENSION;
+        return Names.GENERIC + Names.EDIT + "." + Names.EXTENSION;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/EndSession.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/EndSession.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/EndSession.java
index 1a37f99..a5f15c8 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/EndSession.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/EndSession.java
@@ -19,14 +19,14 @@
 
 package org.apache.isis.viewer.scimpi.dispatcher.view.simple;
 
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
 
 public class EndSession extends AbstractElementProcessor {
 
     @Override
-    public void process(final Request request) {
-        request.getContext().endHttpSession();
+    public void process(final TagProcessor tagProcessor) {
+        tagProcessor.getContext().endHttpSession();
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Forward.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Forward.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Forward.java
index e63ec92..3e0150f 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Forward.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Forward.java
@@ -18,8 +18,8 @@
  */
 package org.apache.isis.viewer.scimpi.dispatcher.view.simple;
 
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
 
 public class Forward extends AbstractElementProcessor {
 
@@ -29,9 +29,9 @@ public class Forward extends AbstractElementProcessor {
     }
 
     @Override
-    public void process(final Request request) {
-        final String view = request.getRequiredProperty(VIEW);
-        request.getContext().forward(view);
+    public void process(final TagProcessor tagProcessor) {
+        final String view = tagProcessor.getRequiredProperty(VIEW);
+        tagProcessor.getContext().forward(view);
     }
 
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/GetCookie.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/GetCookie.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/GetCookie.java
index f58b13f..414436b 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/GetCookie.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/GetCookie.java
@@ -19,17 +19,17 @@
 
 package org.apache.isis.viewer.scimpi.dispatcher.view.simple;
 
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
 
 public class GetCookie extends AbstractElementProcessor {
 
     @Override
-    public void process(final Request request) {
-        final String name = request.getRequiredProperty("name");
-        final String cookie = request.getContext().getCookie(name);
+    public void process(final TagProcessor tagProcessor) {
+        final String name = tagProcessor.getRequiredProperty("name");
+        final String cookie = tagProcessor.getContext().getCookie(name);
 
-        request.appendHtml(cookie);
+        tagProcessor.appendHtml(cookie);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Import.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Import.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Import.java
index 1b66290..cbcaa55 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Import.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Import.java
@@ -19,14 +19,14 @@
 
 package org.apache.isis.viewer.scimpi.dispatcher.view.simple;
 
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
 
 public class Import extends AbstractElementProcessor {
 
     @Override
-    public void process(final Request request) {
-        request.appendHtml("<!-- " + " import " + request.getOptionalProperty("file") + " -->");
+    public void process(final TagProcessor tagProcessor) {
+        tagProcessor.appendHtml("<!-- " + " import " + tagProcessor.getOptionalProperty("file") + " -->");
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/InitializeFromCookie.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/InitializeFromCookie.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/InitializeFromCookie.java
index 1e3f47e..520af0c 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/InitializeFromCookie.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/InitializeFromCookie.java
@@ -21,26 +21,27 @@ package org.apache.isis.viewer.scimpi.dispatcher.view.simple;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext.Scope;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.Names;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request.Scope;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
 
 public class InitializeFromCookie extends AbstractElementProcessor {
     private static final String SEVEN_DAYS = Integer.toString(60 * 24 * 7);
 
     @Override
-    public void process(final Request request) {
-        final String name = request.getRequiredProperty(NAME);
+    public void process(final TagProcessor tagProcessor) {
+        final String name = tagProcessor.getRequiredProperty(NAME);
 
-        final RequestContext context = request.getContext();
+        final Request context = tagProcessor.getContext();
         if (context.getVariable(name) != null) {
-            request.skipUntilClose();
+            tagProcessor.skipUntilClose();
         } else {
-            final String scopeName = request.getOptionalProperty(SCOPE);
-            final Scope scope = RequestContext.scope(scopeName, Scope.SESSION);
+            final String scopeName = tagProcessor.getOptionalProperty(SCOPE);
+            final Scope scope = Request.scope(scopeName, Scope.SESSION);
 
-            final String cookieName = request.getOptionalProperty("cookie", name);
+            final String cookieName = tagProcessor.getOptionalProperty("cookie", name);
             final String cookieValue = context.getCookie(cookieName);
             boolean hasObject;
             if (cookieValue != null) {
@@ -55,14 +56,14 @@ public class InitializeFromCookie extends AbstractElementProcessor {
             }
 
             if (hasObject) {
-                request.skipUntilClose();
+                tagProcessor.skipUntilClose();
                 context.addVariable(name, cookieValue, scope);
             } else {
-                final String expiresString = request.getOptionalProperty("expires", SEVEN_DAYS);
-                request.pushNewBuffer();
-                request.processUtilCloseTag();
-                request.popBuffer();
-                final String id = (String) context.getVariable(RequestContext.RESULT);
+                final String expiresString = tagProcessor.getOptionalProperty("expires", SEVEN_DAYS);
+                tagProcessor.pushNewBuffer();
+                tagProcessor.processUtilCloseTag();
+                tagProcessor.popBuffer();
+                final String id = (String) context.getVariable(Names.RESULT);
                 final ObjectAdapter variable = context.getMappedObject(id);
                 if (variable != null) {
                     context.addCookie(cookieName, id, Integer.valueOf(expiresString));

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/InitializeFromResult.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/InitializeFromResult.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/InitializeFromResult.java
index 375fdd2..f3ba3bc 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/InitializeFromResult.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/InitializeFromResult.java
@@ -20,33 +20,34 @@
 package org.apache.isis.viewer.scimpi.dispatcher.view.simple;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.ScimpiException;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext.Scope;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.Names;
+import org.apache.isis.viewer.scimpi.ScimpiException;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request.Scope;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
 
 public class InitializeFromResult extends AbstractElementProcessor {
 
     @Override
-    public void process(final Request request) {
-        disallowSourceAndDefault(request);
-        final String sourceObjectId = objectOrResult(request);
-        final Class<?> cls = forClass(request);
-        final String variableName = request.getRequiredProperty(NAME);
-        final String defaultObjectId = request.getOptionalProperty(DEFAULT);
-        final String scopeName = request.getOptionalProperty(SCOPE);
-        final Scope scope = RequestContext.scope(scopeName, Scope.REQUEST);
+    public void process(final TagProcessor tagProcessor) {
+        disallowSourceAndDefault(tagProcessor);
+        final String sourceObjectId = objectOrResult(tagProcessor);
+        final Class<?> cls = forClass(tagProcessor);
+        final String variableName = tagProcessor.getRequiredProperty(NAME);
+        final String defaultObjectId = tagProcessor.getOptionalProperty(DEFAULT);
+        final String scopeName = tagProcessor.getOptionalProperty(SCOPE);
+        final Scope scope = Request.scope(scopeName, Scope.REQUEST);
 
-        final RequestContext context = request.getContext();
+        final Request context = tagProcessor.getContext();
         final ObjectAdapter sourceObject = context.getMappedObject(sourceObjectId);
         final boolean isSourceSet = sourceObject != null;
         final boolean isSourceAssignable = isSourceSet && (cls == null || cls.isAssignableFrom(sourceObject.getObject().getClass()));
         if (isSourceAssignable) {
-            request.appendDebug("     " + variableName + " set to " + sourceObjectId + " (" + scope + ")");
+            tagProcessor.appendDebug("     " + variableName + " set to " + sourceObjectId + " (" + scope + ")");
             context.addVariable(variableName, sourceObjectId, scope);
         } else {
-            request.appendDebug("     " + variableName + " set to " + sourceObjectId + " (" + scope + ")");
+            tagProcessor.appendDebug("     " + variableName + " set to " + sourceObjectId + " (" + scope + ")");
             if (defaultObjectId != null) {
                 context.addVariable(variableName, defaultObjectId, scope);
             }
@@ -54,17 +55,17 @@ public class InitializeFromResult extends AbstractElementProcessor {
         }
     }
 
-    private String objectOrResult(final Request request) {
-        final String sourceObjectId = request.getOptionalProperty(OBJECT);
+    private String objectOrResult(final TagProcessor tagProcessor) {
+        final String sourceObjectId = tagProcessor.getOptionalProperty(OBJECT);
         if (sourceObjectId == null) {
-            return (String) request.getContext().getVariable(RequestContext.RESULT);
+            return (String) tagProcessor.getContext().getVariable(Names.RESULT);
         } else {
             return sourceObjectId;
         }
     }
 
-    private void disallowSourceAndDefault(final Request request) {
-        if (request.getOptionalProperty(DEFAULT) != null && request.getOptionalProperty(OBJECT) != null) {
+    private void disallowSourceAndDefault(final TagProcessor tagProcessor) {
+        if (tagProcessor.getOptionalProperty(DEFAULT) != null && tagProcessor.getOptionalProperty(OBJECT) != null) {
             throw new ScimpiException("Cannot specify both " + OBJECT + " and " + DEFAULT + " for the " + getName() + " element");
         }
     }

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Localization.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Localization.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Localization.java
index fe1474b..fe69d9d 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Localization.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Localization.java
@@ -23,8 +23,8 @@ import java.util.Locale;
 import java.util.TimeZone;
 
 import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
 
 /**
  * Displays the localization data for the current user.
@@ -32,8 +32,8 @@ import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
 public class Localization extends AbstractElementProcessor {
 
     @Override
-    public void process(final Request request) {
-        request.closeEmpty();
+    public void process(final TagProcessor tagProcessor) {
+        tagProcessor.closeEmpty();
 
         org.apache.isis.applib.profiles.Localization localization = IsisContext.getLocalization();
         if (localization != null) {
@@ -42,9 +42,9 @@ public class Localization extends AbstractElementProcessor {
          //   country = locale.toString();
             String timeZone = localization.getTimeZone().getDisplayName();
             
-            request.appendAsHtmlEncoded(country + ", " + timeZone);
+            tagProcessor.appendAsHtmlEncoded(country + ", " + timeZone);
         } else {
-            request.appendAsHtmlEncoded("No localization data!");
+            tagProcessor.appendAsHtmlEncoded("No localization data!");
         }
         
         Locale locale = Locale.getDefault();
@@ -52,7 +52,7 @@ public class Localization extends AbstractElementProcessor {
       //  country = locale.toString();
         String timeZone = TimeZone.getDefault().getDisplayName();
         
-        request.appendAsHtmlEncoded("\n (Default " + country + ", " + timeZone +")");
+        tagProcessor.appendAsHtmlEncoded("\n (Default " + country + ", " + timeZone +")");
 
     }
 

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Mark.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Mark.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Mark.java
index febafb6..97660d2 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Mark.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Mark.java
@@ -19,19 +19,19 @@
 
 package org.apache.isis.viewer.scimpi.dispatcher.view.simple;
 
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext.Scope;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request.Scope;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
 
 public class Mark extends AbstractElementProcessor {
 
     // TODO the return points should be pushed on to a stack so that there is
     // traceable history.
     @Override
-    public void process(final Request request) {
+    public void process(final TagProcessor tagProcessor) {
         // String name = request.getOptionalProperty(NAME);
-        final RequestContext context = request.getContext();
+        final Request context = tagProcessor.getContext();
         context.addVariable("_return-to", context.getUri(), Scope.SESSION);
     }
 

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/NewActionLink.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/NewActionLink.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/NewActionLink.java
index 5929f81..edd0522 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/NewActionLink.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/NewActionLink.java
@@ -22,8 +22,8 @@ package org.apache.isis.viewer.scimpi.dispatcher.view.simple;
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.viewer.scimpi.dispatcher.Dispatcher;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.Names;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
 import org.apache.isis.viewer.scimpi.dispatcher.util.MethodsUtils;
 
 public class NewActionLink extends AbstractLink {
@@ -32,8 +32,8 @@ public class NewActionLink extends AbstractLink {
     private final Where where = Where.OBJECT_FORMS;
 
     @Override
-    protected boolean valid(final Request request, final ObjectAdapter object) {
-        final String method = request.getRequiredProperty(METHOD);
+    protected boolean valid(final TagProcessor tagProcessor, final ObjectAdapter object) {
+        final String method = tagProcessor.getRequiredProperty(METHOD);
         final ObjectAction action = MethodsUtils.findAction(object, method);
         return MethodsUtils.isVisibleAndUsable(object, action, where);
     }
@@ -45,12 +45,12 @@ public class NewActionLink extends AbstractLink {
 
     @Override
     protected String defaultView() {
-        return "_generic_action." + Dispatcher.EXTENSION;
+        return "_generic_action." + Names.EXTENSION;
     }
 
     @Override
-    protected String additionalParameters(final Request request) {
-        final String method = request.getRequiredProperty(METHOD);
+    protected String additionalParameters(final TagProcessor tagProcessor) {
+        final String method = tagProcessor.getRequiredProperty(METHOD);
         return "method=" + method;
     }
 

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/ObjectLink.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/ObjectLink.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/ObjectLink.java
index 8b18731..54e59ec 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/ObjectLink.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/ObjectLink.java
@@ -27,8 +27,8 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
 import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.viewer.scimpi.dispatcher.Dispatcher;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.Names;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
 
 public class ObjectLink extends AbstractLink {
 
@@ -40,7 +40,7 @@ public class ObjectLink extends AbstractLink {
     private final Where where = Where.ANYWHERE;
 
     @Override
-    protected boolean valid(final Request request, final ObjectAdapter object) {
+    protected boolean valid(final TagProcessor tagProcessor, final ObjectAdapter object) {
         final AuthenticationSession session = IsisContext.getAuthenticationSession();
         final List<ObjectAssociation> visibleFields = object.getSpecification().getAssociations(ObjectAssociationFilters.dynamicallyVisible(session, object, where));
         return visibleFields.size() > 0;
@@ -57,7 +57,7 @@ public class ObjectLink extends AbstractLink {
 
     @Override
     protected String defaultView() {
-        return Dispatcher.GENERIC + "." + Dispatcher.EXTENSION;
+        return Names.GENERIC + "." + Names.EXTENSION;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/PageTitle.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/PageTitle.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/PageTitle.java
index 10c3b13..65443a3 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/PageTitle.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/PageTitle.java
@@ -19,13 +19,13 @@
 
 package org.apache.isis.viewer.scimpi.dispatcher.view.simple;
 
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext.Scope;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request.Scope;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
 
 public class PageTitle extends Variable {
     @Override
-    public void process(final Request request) {
-        process(request, "title", null, null, false, Scope.REQUEST);
+    public void process(final TagProcessor tagProcessor) {
+        process(tagProcessor, "title", null, null, false, Scope.REQUEST);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Redirect.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Redirect.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Redirect.java
index 6f3b0d8..9b72f93 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Redirect.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Redirect.java
@@ -18,8 +18,8 @@
  */
 package org.apache.isis.viewer.scimpi.dispatcher.view.simple;
 
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
 
 public class Redirect extends AbstractElementProcessor {
 
@@ -29,9 +29,9 @@ public class Redirect extends AbstractElementProcessor {
     }
 
     @Override
-    public void process(final Request request) {
-        final String view = request.getRequiredProperty(VIEW);
-        request.getContext().redirectTo(view);
+    public void process(final TagProcessor tagProcessor) {
+        final String view = tagProcessor.getRequiredProperty(VIEW);
+        tagProcessor.getContext().redirectTo(view);
     }
 
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/RemoveElement.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/RemoveElement.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/RemoveElement.java
index 828e9b7..a9b9800 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/RemoveElement.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/RemoveElement.java
@@ -30,15 +30,15 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.Dispatcher;
-import org.apache.isis.viewer.scimpi.dispatcher.ForbiddenException;
-import org.apache.isis.viewer.scimpi.dispatcher.ScimpiException;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext.Scope;
-import org.apache.isis.viewer.scimpi.dispatcher.edit.RemoveAction;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.ForbiddenException;
+import org.apache.isis.viewer.scimpi.Names;
+import org.apache.isis.viewer.scimpi.ScimpiException;
+import org.apache.isis.viewer.scimpi.dispatcher.action.RemoveAction;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request.Scope;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
 import org.apache.isis.viewer.scimpi.dispatcher.util.MethodsUtils;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
 
 public class RemoveElement extends AbstractElementProcessor {
 
@@ -50,28 +50,28 @@ public class RemoveElement extends AbstractElementProcessor {
     private final static Where where = Where.ANYWHERE;
 
     @Override
-    public void process(final Request request) {
-        final String title = request.getOptionalProperty(BUTTON_TITLE, "Remove From List");
-        final String cls = request.getOptionalProperty(CLASS, "action in-line delete confirm");
-        final String object = request.getOptionalProperty(OBJECT);
-        final String resultOverride = request.getOptionalProperty(RESULT_OVERRIDE);
-        final RequestContext context = request.getContext();
-        final String objectId = object != null ? object : (String) context.getVariable(RequestContext.RESULT);
+    public void process(final TagProcessor tagProcessor) {
+        final String title = tagProcessor.getOptionalProperty(BUTTON_TITLE, "Remove From List");
+        final String cls = tagProcessor.getOptionalProperty(CLASS, "action in-line delete confirm");
+        final String object = tagProcessor.getOptionalProperty(OBJECT);
+        final String resultOverride = tagProcessor.getOptionalProperty(RESULT_OVERRIDE);
+        final Request context = tagProcessor.getContext();
+        final String objectId = object != null ? object : (String) context.getVariable(Names.RESULT);
         final ObjectAdapter adapter = MethodsUtils.findObject(context, objectId);
 
-        final String element = request.getOptionalProperty(ELEMENT, (String) context.getVariable(ELEMENT));
+        final String element = tagProcessor.getOptionalProperty(ELEMENT, (String) context.getVariable(ELEMENT));
         final ObjectAdapter elementId = MethodsUtils.findObject(context, element);
 
-        final String fieldName = request.getRequiredProperty(FIELD);
+        final String fieldName = tagProcessor.getRequiredProperty(FIELD);
 
-        String view = request.getOptionalProperty(VIEW);
+        String view = tagProcessor.getOptionalProperty(VIEW);
         view = context.fullFilePath(view == null ? context.getResourceFile() : view);
-        String error = request.getOptionalProperty(ERROR);
+        String error = tagProcessor.getOptionalProperty(ERROR);
         error = context.fullFilePath(error == null ? context.getResourceFile() : error);
 
-        request.processUtilCloseTag();
+        tagProcessor.processUtilCloseTag();
 
-        write(request, adapter, fieldName, elementId, resultOverride, view, error, title, cls);
+        write(tagProcessor, adapter, fieldName, elementId, resultOverride, view, error, title, cls);
     }
 
     @Override
@@ -79,7 +79,7 @@ public class RemoveElement extends AbstractElementProcessor {
         return "remove-element";
     }
 
-    public static void write(final Request request, final ObjectAdapter adapter, final String fieldName, final ObjectAdapter element, final String resultOverride, final String view, final String error, final String title, final String cssClass) {
+    public static void write(final TagProcessor tagProcessor, final ObjectAdapter adapter, final String fieldName, final ObjectAdapter element, final String resultOverride, final String view, final String error, final String title, final String cssClass) {
         final ObjectAssociation field = adapter.getSpecification().getAssociation(fieldName);
         if (field == null) {
             throw new ScimpiException("No field " + fieldName + " in " + adapter.getSpecification().getFullIdentifier());
@@ -98,36 +98,36 @@ public class RemoveElement extends AbstractElementProcessor {
         }
 
         if (usable.isVetoed()) {
-            request.appendHtml("<div class=\"" + cssClass + " disabled-form\">"); 
-            request.appendHtml("<div class=\"button disabled\" title=\""); 
-            request.appendAsHtmlEncoded(usable.getReason());
-            request.appendHtml("\" >" + title);
-            request.appendHtml("</div>");
-            request.appendHtml("</div>");
+            tagProcessor.appendHtml("<div class=\"" + cssClass + " disabled-form\">"); 
+            tagProcessor.appendHtml("<div class=\"button disabled\" title=\""); 
+            tagProcessor.appendAsHtmlEncoded(usable.getReason());
+            tagProcessor.appendHtml("\" >" + title);
+            tagProcessor.appendHtml("</div>");
+            tagProcessor.appendHtml("</div>");
         } else {
-            if (valid(request, adapter)) {
+            if (valid(tagProcessor, adapter)) {
                 final String classSegment = " class=\"" + cssClass + "\"";
 
-                final String objectId = request.getContext().mapObject(adapter, Scope.INTERACTION);
-                final String elementId = request.getContext().mapObject(element, Scope.INTERACTION);
-                final String action = RemoveAction.ACTION + Dispatcher.COMMAND_ROOT;
-                request.appendHtml("<form" + classSegment + " method=\"post\" action=\"" + action + "\" >");
-                request.appendHtml("<input type=\"hidden\" name=\"" + OBJECT + "\" value=\"" + objectId + "\" />");
-                request.appendHtml("<input type=\"hidden\" name=\"" + FIELD + "\" value=\"" + fieldName + "\" />");
-                request.appendHtml("<input type=\"hidden\" name=\"" + ELEMENT + "\" value=\"" + elementId + "\" />");
+                final String objectId = tagProcessor.getContext().mapObject(adapter, Scope.INTERACTION);
+                final String elementId = tagProcessor.getContext().mapObject(element, Scope.INTERACTION);
+                final String action = RemoveAction.ACTION + Names.COMMAND_ROOT;
+                tagProcessor.appendHtml("<form" + classSegment + " method=\"post\" action=\"" + action + "\" >");
+                tagProcessor.appendHtml("<input type=\"hidden\" name=\"" + OBJECT + "\" value=\"" + objectId + "\" />");
+                tagProcessor.appendHtml("<input type=\"hidden\" name=\"" + FIELD + "\" value=\"" + fieldName + "\" />");
+                tagProcessor.appendHtml("<input type=\"hidden\" name=\"" + ELEMENT + "\" value=\"" + elementId + "\" />");
                 if (resultOverride != null) {
-                    request.appendHtml("<input type=\"hidden\" name=\"" + RESULT_OVERRIDE + "\" value=\"" + resultOverride + "\" />");
+                    tagProcessor.appendHtml("<input type=\"hidden\" name=\"" + RESULT_OVERRIDE + "\" value=\"" + resultOverride + "\" />");
                 }
-                request.appendHtml("<input type=\"hidden\" name=\"" + VIEW + "\" value=\"" + view + "\" />");
-                request.appendHtml("<input type=\"hidden\" name=\"" + ERROR + "\" value=\"" + error + "\" />");
-                request.appendHtml(request.getContext().interactionFields());
-                request.appendHtml("<input class=\"button\" type=\"submit\" value=\"" + title + "\" />");
-                request.appendHtml("</form>");
+                tagProcessor.appendHtml("<input type=\"hidden\" name=\"" + VIEW + "\" value=\"" + view + "\" />");
+                tagProcessor.appendHtml("<input type=\"hidden\" name=\"" + ERROR + "\" value=\"" + error + "\" />");
+                tagProcessor.appendHtml(tagProcessor.getContext().interactionFields());
+                tagProcessor.appendHtml("<input class=\"button\" type=\"submit\" value=\"" + title + "\" />");
+                tagProcessor.appendHtml("</form>");
             }
         }
     }
 
-    private static boolean valid(final Request request, final ObjectAdapter adapter) {
+    private static boolean valid(final TagProcessor tagProcessor, final ObjectAdapter adapter) {
         // TODO is this check valid/necessary?
 
         // TODO check is valid to remove element

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/ScopeTag.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/ScopeTag.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/ScopeTag.java
index 2dced50..ece1d68 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/ScopeTag.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/ScopeTag.java
@@ -19,27 +19,27 @@
 
 package org.apache.isis.viewer.scimpi.dispatcher.view.simple;
 
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext.Scope;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request.Scope;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
 
 public class ScopeTag extends AbstractElementProcessor {
 
     @Override
-    public void process(final Request request) {
-        final String name = request.getRequiredProperty(NAME);
-        final String scopeName = request.getRequiredProperty(SCOPE);
-        final Scope scope = RequestContext.scope(scopeName);
-        request.processUtilCloseTag();
-        changeScope(request, name, scope);
+    public void process(final TagProcessor tagProcessor) {
+        final String name = tagProcessor.getRequiredProperty(NAME);
+        final String scopeName = tagProcessor.getRequiredProperty(SCOPE);
+        final Scope scope = Request.scope(scopeName);
+        tagProcessor.processUtilCloseTag();
+        changeScope(tagProcessor, name, scope);
     }
 
-    protected static void changeScope(final Request request, final String name, final Scope scope) {
-        request.getContext().changeScope(name, scope);
-        final Object value = request.getContext().getVariable(name);
+    protected static void changeScope(final TagProcessor tagProcessor, final String name, final Scope scope) {
+        tagProcessor.getContext().changeScope(name, scope);
+        final Object value = tagProcessor.getContext().getVariable(name);
         if (value != null) {
-            request.getContext().addVariable(name, value, scope);
+            tagProcessor.getContext().addVariable(name, value, scope);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SetCookie.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SetCookie.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SetCookie.java
index 1014280..2ecb0cf 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SetCookie.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SetCookie.java
@@ -19,29 +19,29 @@
 
 package org.apache.isis.viewer.scimpi.dispatcher.view.simple;
 
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.action.RequiredPropertyException;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.RequiredPropertyException;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
 
 public class SetCookie extends AbstractElementProcessor {
 
     @Override
-    public void process(final Request request) {
-        final String name = request.getRequiredProperty("name");
-        final String value = request.getOptionalProperty("value");
-        final boolean isClear = request.getOptionalProperty("action", "set").equals("clear");
-        final String expiresString = request.getOptionalProperty("expires", "-1");
+    public void process(final TagProcessor tagProcessor) {
+        final String name = tagProcessor.getRequiredProperty("name");
+        final String value = tagProcessor.getOptionalProperty("value");
+        final boolean isClear = tagProcessor.getOptionalProperty("action", "set").equals("clear");
+        final String expiresString = tagProcessor.getOptionalProperty("expires", "-1");
 
         if (!isClear && value == null) {
             throw new RequiredPropertyException("Property not set: " + value);
         }
         if (isClear) {
-            request.appendDebug("cookie: " + name + " (cleared)");
-            request.getContext().addCookie(name, null, 0);
+            tagProcessor.appendDebug("cookie: " + name + " (cleared)");
+            tagProcessor.getContext().addCookie(name, null, 0);
         } else {
             if (value.length() > 0) {
-                request.appendDebug("cookie: " + name + " set to"+ value);
-                request.getContext().addCookie(name, value, Integer.valueOf(expiresString));
+                tagProcessor.appendDebug("cookie: " + name + " set to"+ value);
+                tagProcessor.getContext().addCookie(name, value, Integer.valueOf(expiresString));
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SetCookieFromField.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SetCookieFromField.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SetCookieFromField.java
index b91261c..6e422d6 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SetCookieFromField.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SetCookieFromField.java
@@ -20,13 +20,13 @@
 package org.apache.isis.viewer.scimpi.dispatcher.view.simple;
 
 import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
 
 public class SetCookieFromField extends AbstractElementProcessor {
 
     @Override
-    public void process(final Request request) {
+    public void process(final TagProcessor tagProcessor) {
         throw new NotYetImplementedException("3.1");
         /*
          * String objectId = request.getOptionalProperty(OBJECT); String

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SetFieldFromCookie.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SetFieldFromCookie.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SetFieldFromCookie.java
index 89702fa..11c3861 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SetFieldFromCookie.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SetFieldFromCookie.java
@@ -20,13 +20,13 @@
 package org.apache.isis.viewer.scimpi.dispatcher.view.simple;
 
 import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
 
 public class SetFieldFromCookie extends AbstractElementProcessor {
 
     @Override
-    public void process(final Request request) {
+    public void process(final TagProcessor tagProcessor) {
         throw new NotYetImplementedException("3.1");
         /*
          * String name = request.getRequiredProperty(NAME); String cookieString

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SetLocalization.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SetLocalization.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SetLocalization.java
index 11e8664..f241e2e 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SetLocalization.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SetLocalization.java
@@ -24,8 +24,8 @@ import java.util.TimeZone;
 
 import org.apache.isis.core.runtime.system.context.IsisContext;
 import org.apache.isis.core.runtime.userprofile.UserLocalization;
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
 
 /**
  * Displays the localization data for the current user.
@@ -33,11 +33,11 @@ import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
 public class SetLocalization extends AbstractElementProcessor {
 
     @Override
-    public void process(final Request request) {
-        request.closeEmpty();
+    public void process(final TagProcessor tagProcessor) {
+        tagProcessor.closeEmpty();
         
-        final String localeCode = request.getRequiredProperty("locale");
-        final String timeZone = request.getRequiredProperty("time-zone");
+        final String localeCode = tagProcessor.getRequiredProperty("locale");
+        final String timeZone = tagProcessor.getRequiredProperty("time-zone");
         
         String country;
         String language;

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SimpleButton.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SimpleButton.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SimpleButton.java
index 1efd7bf..e6ab245 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SimpleButton.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SimpleButton.java
@@ -19,17 +19,17 @@
 
 package org.apache.isis.viewer.scimpi.dispatcher.view.simple;
 
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
 
 public class SimpleButton extends AbstractElementProcessor {
     @Override
-    public void process(final Request request) {
-        final String href = request.getRequiredProperty("href");
-        request.pushNewBuffer();
-        request.processUtilCloseTag();
-        final String text = request.popBuffer();
-        request.appendHtml("<div class=\"action\"><a class=\"button\" href=\"" + href + "\">" + text + "</a></div>");
+    public void process(final TagProcessor tagProcessor) {
+        final String href = tagProcessor.getRequiredProperty("href");
+        tagProcessor.pushNewBuffer();
+        tagProcessor.processUtilCloseTag();
+        final String text = tagProcessor.popBuffer();
+        tagProcessor.appendHtml("<div class=\"action\"><a class=\"button\" href=\"" + href + "\">" + text + "</a></div>");
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/StartSession.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/StartSession.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/StartSession.java
index 493c33a..82d0242 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/StartSession.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/StartSession.java
@@ -19,14 +19,14 @@
 
 package org.apache.isis.viewer.scimpi.dispatcher.view.simple;
 
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
 
 public class StartSession extends AbstractElementProcessor {
 
     @Override
-    public void process(final Request request) {
-        request.getContext().startHttpSession();
+    public void process(final TagProcessor tagProcessor) {
+        tagProcessor.getContext().startHttpSession();
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/TemplateTag.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/TemplateTag.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/TemplateTag.java
index 8860780..071814d 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/TemplateTag.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/TemplateTag.java
@@ -18,8 +18,8 @@
  */
 package org.apache.isis.viewer.scimpi.dispatcher.view.simple;
 
-import org.apache.isis.viewer.scimpi.dispatcher.ElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.ElementProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
 
 public class TemplateTag implements ElementProcessor {
 
@@ -29,7 +29,7 @@ public class TemplateTag implements ElementProcessor {
     }
 
     @Override
-    public void process(final Request request) {
+    public void process(final TagProcessor tagProcessor) {
         // REVIEW this make IE8 render poorly as the browser doesn't think a
         // DOCTYPE is provided, causing it to run in
         // quirk mode

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Unless.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Unless.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Unless.java
index 9dcf810..3de6348 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Unless.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Unless.java
@@ -19,17 +19,17 @@
 
 package org.apache.isis.viewer.scimpi.dispatcher.view.simple;
 
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
 
 public class Unless extends AbstractConditionalBlock {
 
     @Override
-    protected void processTags(final boolean isSet, final Request request) {
+    protected void processTags(final boolean isSet, final TagProcessor tagProcessor) {
         if (isSet) {
-            request.skipUntilClose();
-            request.appendDebug("    skipping segment");
+            tagProcessor.skipUntilClose();
+            tagProcessor.appendDebug("    skipping segment");
         } else {
-            request.processUtilCloseTag();
+            tagProcessor.processUtilCloseTag();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Variable.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Variable.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Variable.java
index 960fc6b..559e0e1 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Variable.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Variable.java
@@ -19,31 +19,31 @@
 
 package org.apache.isis.viewer.scimpi.dispatcher.view.simple;
 
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext.Scope;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request.Scope;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
 
 public class Variable extends AbstractElementProcessor {
 
     @Override
-    public void process(final Request request) {
-        final String name = request.getOptionalProperty(NAME);
-        final String value = request.getOptionalProperty(VALUE);
-        final String defaultTo = request.getOptionalProperty(DEFAULT);
-        final String scopeName = request.getOptionalProperty(SCOPE);
-        final boolean isClear = request.getOptionalProperty("action", "set").equals("clear");
-        final Scope scope = RequestContext.scope(scopeName, isClear ? Scope.SESSION : Scope.REQUEST);
-        process(request, name, value, defaultTo, isClear, scope);
+    public void process(final TagProcessor tagProcessor) {
+        final String name = tagProcessor.getOptionalProperty(NAME);
+        final String value = tagProcessor.getOptionalProperty(VALUE);
+        final String defaultTo = tagProcessor.getOptionalProperty(DEFAULT);
+        final String scopeName = tagProcessor.getOptionalProperty(SCOPE);
+        final boolean isClear = tagProcessor.getOptionalProperty("action", "set").equals("clear");
+        final Scope scope = Request.scope(scopeName, isClear ? Scope.SESSION : Scope.REQUEST);
+        process(tagProcessor, name, value, defaultTo, isClear, scope);
     }
 
-    protected void process(final Request request, final String name, final String value, final String defaultTo, final boolean isClear, final Scope scope) {
-        request.pushNewBuffer();
-        request.processUtilCloseTag();
-        String source = request.popBuffer();
+    protected void process(final TagProcessor tagProcessor, final String name, final String value, final String defaultTo, final boolean isClear, final Scope scope) {
+        tagProcessor.pushNewBuffer();
+        tagProcessor.processUtilCloseTag();
+        String source = tagProcessor.popBuffer();
         if (isClear) {
-            request.appendDebug("variable: " + name + " (cleared)");
-            request.getContext().clearVariable(name, scope);
+            tagProcessor.appendDebug("variable: " + name + " (cleared)");
+            tagProcessor.getContext().clearVariable(name, scope);
         } else {
             if (source.length() == 0 && value != null) {
                 source = value;
@@ -51,8 +51,8 @@ public class Variable extends AbstractElementProcessor {
             if (source.length() == 0) {
                 source = defaultTo;
             }
-            request.appendDebug("    " + name + " (" + scope + ") set to " + source);
-            request.getContext().addVariable(name, source, scope);
+            tagProcessor.appendDebug("    " + name + " (" + scope + ") set to " + source);
+            tagProcessor.getContext().addVariable(name, source, scope);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/When.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/When.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/When.java
index cc1fd09..459faaa 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/When.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/When.java
@@ -19,17 +19,17 @@
 
 package org.apache.isis.viewer.scimpi.dispatcher.view.simple;
 
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
 
 public class When extends AbstractConditionalBlock {
 
     @Override
-    protected void processTags(final boolean isSet, final Request request) {
+    protected void processTags(final boolean isSet, final TagProcessor tagProcessor) {
         if (isSet) {
-            request.processUtilCloseTag();
+            tagProcessor.processUtilCloseTag();
         } else {
-            request.appendDebug("    skipping segment");
-            request.skipUntilClose();
+            tagProcessor.appendDebug("    skipping segment");
+            tagProcessor.skipUntilClose();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/ActionName.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/ActionName.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/ActionName.java
index 119a453..43264ad 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/ActionName.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/ActionName.java
@@ -21,22 +21,22 @@ package org.apache.isis.viewer.scimpi.dispatcher.view.value;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
 import org.apache.isis.viewer.scimpi.dispatcher.util.MethodsUtils;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
 
 // TODO do the same for description and help, and for fields
 public class ActionName extends AbstractElementProcessor {
 
     @Override
-    public void process(final Request request) {
-        final String objectId = request.getOptionalProperty(OBJECT);
-        final String methodName = request.getRequiredProperty(METHOD);
+    public void process(final TagProcessor tagProcessor) {
+        final String objectId = tagProcessor.getOptionalProperty(OBJECT);
+        final String methodName = tagProcessor.getRequiredProperty(METHOD);
 
-        final ObjectAdapter object = MethodsUtils.findObject(request.getContext(), objectId);
+        final ObjectAdapter object = MethodsUtils.findObject(tagProcessor.getContext(), objectId);
         final ObjectAction action = MethodsUtils.findAction(object, methodName);
 
-        request.appendAsHtmlEncoded(action.getName());
+        tagProcessor.appendAsHtmlEncoded(action.getName());
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/CountElements.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/CountElements.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/CountElements.java
index debaa49..d22fc44 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/CountElements.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/CountElements.java
@@ -22,22 +22,22 @@ package org.apache.isis.viewer.scimpi.dispatcher.view.value;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractObjectProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractObjectProcessor;
 
 public class CountElements extends AbstractObjectProcessor {
 
     @Override
-    protected void process(final Request request, final ObjectAdapter collection) {
+    protected void process(final TagProcessor tagProcessor, final ObjectAdapter collection) {
         final CollectionFacet facet = collection.getSpecification().getFacet(CollectionFacet.class);
         final int size = facet.size(collection);
         if (size == 0) {
-            request.appendHtml(request.getOptionalProperty("none", "0"));
+            tagProcessor.appendHtml(tagProcessor.getOptionalProperty("none", "0"));
         } else if (size == 1) {
-            request.appendHtml(request.getOptionalProperty("one", "1"));
+            tagProcessor.appendHtml(tagProcessor.getOptionalProperty("one", "1"));
         } else {
-            final String text = request.getOptionalProperty("many", "" + size);
-            request.appendHtml(String.format(text, size));
+            final String text = tagProcessor.getOptionalProperty("many", "" + size);
+            tagProcessor.appendHtml(String.format(text, size));
         }
     }
 

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/ElementType.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/ElementType.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/ElementType.java
index c7284a0..b15c107 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/ElementType.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/ElementType.java
@@ -22,20 +22,20 @@ package org.apache.isis.viewer.scimpi.dispatcher.view.value;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.ScimpiException;
-import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.ScimpiException;
+import org.apache.isis.viewer.scimpi.dispatcher.context.Request;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
 
 public class ElementType extends AbstractElementProcessor {
 
     @Override
-    public void process(final Request request) {
+    public void process(final TagProcessor tagProcessor) {
         ObjectAdapter collection;
-        final String field = request.getOptionalProperty(FIELD);
-        final RequestContext context = request.getContext();
+        final String field = tagProcessor.getOptionalProperty(FIELD);
+        final Request context = tagProcessor.getContext();
         if (field != null) {
-            final String id = request.getRequiredProperty(OBJECT);
+            final String id = tagProcessor.getRequiredProperty(OBJECT);
             final ObjectAdapter object = context.getMappedObjectOrResult(id);
             final ObjectAssociation objectField = object.getSpecification().getAssociation(field);
             if (!objectField.isOneToManyAssociation()) {
@@ -43,14 +43,14 @@ public class ElementType extends AbstractElementProcessor {
             }
             collection = objectField.get(object);
         } else {
-            final String id = request.getOptionalProperty(COLLECTION);
+            final String id = tagProcessor.getOptionalProperty(COLLECTION);
             collection = context.getMappedObjectOrResult(id);
         }
 
         final ObjectSpecification elementSpecification = collection.getElementSpecification();
         final String name = elementSpecification.getSingularName();
 
-        request.appendAsHtmlEncoded(name);
+        tagProcessor.appendAsHtmlEncoded(name);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/FieldName.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/FieldName.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/FieldName.java
index ed054a1..1fefdf3 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/FieldName.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/FieldName.java
@@ -23,10 +23,10 @@ import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.ForbiddenException;
-import org.apache.isis.viewer.scimpi.dispatcher.ScimpiException;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.ForbiddenException;
+import org.apache.isis.viewer.scimpi.ScimpiException;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
 
 public class FieldName extends AbstractElementProcessor {
 
@@ -38,10 +38,10 @@ public class FieldName extends AbstractElementProcessor {
     private final Where where = Where.ANYWHERE;
 
     @Override
-    public void process(final Request request) {
-        final String id = request.getOptionalProperty(OBJECT);
-        final String fieldName = request.getRequiredProperty(FIELD);
-        final ObjectAdapter object = request.getContext().getMappedObjectOrResult(id);
+    public void process(final TagProcessor tagProcessor) {
+        final String id = tagProcessor.getOptionalProperty(OBJECT);
+        final String fieldName = tagProcessor.getRequiredProperty(FIELD);
+        final ObjectAdapter object = tagProcessor.getContext().getMappedObjectOrResult(id);
         final ObjectAssociation field = object.getSpecification().getAssociation(fieldName);
         if (field == null) {
             throw new ScimpiException("No field " + fieldName + " in " + object.getSpecification().getFullIdentifier());
@@ -49,7 +49,7 @@ public class FieldName extends AbstractElementProcessor {
         if (field.isVisible(IsisContext.getAuthenticationSession(), object, where).isVetoed()) {
             throw new ForbiddenException(field, ForbiddenException.VISIBLE);
         }
-        request.appendAsHtmlEncoded(field.getName());
+        tagProcessor.appendAsHtmlEncoded(field.getName());
     }
 
     @Override
@@ -57,7 +57,7 @@ public class FieldName extends AbstractElementProcessor {
         return "field-name";
     }
 
-    public static void write(final Request content, final ObjectAssociation field) {
+    public static void write(final TagProcessor content, final ObjectAssociation field) {
         content.appendHtml("<span class=\"label\" title=\"" + field.getDescription() + "\">");
         content.appendHtml("</span>");
     }

http://git-wip-us.apache.org/repos/asf/isis/blob/49518c89/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/ParameterName.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/ParameterName.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/ParameterName.java
index 84e2204..029b819 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/ParameterName.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/ParameterName.java
@@ -24,20 +24,20 @@ import java.util.List;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.ScimpiException;
-import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
+import org.apache.isis.viewer.scimpi.ScimpiException;
+import org.apache.isis.viewer.scimpi.dispatcher.processor.TagProcessor;
 import org.apache.isis.viewer.scimpi.dispatcher.util.MethodsUtils;
+import org.apache.isis.viewer.scimpi.dispatcher.view.AbstractElementProcessor;
 
 public class ParameterName extends AbstractElementProcessor {
 
     @Override
-    public void process(final Request request) {
-        final String objectId = request.getOptionalProperty(OBJECT);
-        final String methodName = request.getRequiredProperty(METHOD);
-        final String field = request.getOptionalProperty(PARAMETER_NUMBER);
+    public void process(final TagProcessor tagProcessor) {
+        final String objectId = tagProcessor.getOptionalProperty(OBJECT);
+        final String methodName = tagProcessor.getRequiredProperty(METHOD);
+        final String field = tagProcessor.getOptionalProperty(PARAMETER_NUMBER);
 
-        final ObjectAdapter object = MethodsUtils.findObject(request.getContext(), objectId);
+        final ObjectAdapter object = MethodsUtils.findObject(tagProcessor.getContext(), objectId);
         final ObjectAction action = MethodsUtils.findAction(object, methodName);
         final List<ObjectActionParameter> parameters = action.getParameters();
 
@@ -51,7 +51,7 @@ public class ParameterName extends AbstractElementProcessor {
             throw new ScimpiException("Parameter numbers should be between 1 and " + parameters.size() + ": " + index);
         }
 
-        request.appendAsHtmlEncoded(parameters.get(index).getName());
+        tagProcessor.appendAsHtmlEncoded(parameters.get(index).getName());
     }
 
     @Override